dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed ports for Atmega8, Atmega168, and Xmega to compile.

Browse Source
This commit is contained in:
skarg
2016-10-25 13:42:13 +00:00
parent b2938bb68a
commit c7147f3805
7 changed files with 284 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/s_rp.c
+2 -1
View File
@@ -110,11 +110,12 @@ uint8_t Send_Read_Property_Request_Address(
bytes_sent =
datalink_send_pdu(dest, &npdu_data,
&Handler_Transmit_Buffer[0], pdu_len);
if (bytes_sent <= 0) {
#if PRINT_ENABLED
if (bytes_sent <= 0)
fprintf(stderr, "Failed to Send ReadProperty Request (%s)!\n",
strerror(errno));
#endif
}
} else {
tsm_free_invoke_id(invoke_id);
invoke_id = 0;
bacnet-stack/ports/atmega168/h_whois.c
+1 -1
View File
@@ -58,7 +58,7 @@ void handler_who_is(
} else if (len != BACNET_STATUS_ERROR) {
/* is my device id within the limits? */
target_device = Device_Object_Instance_Number();
if (((target_device >= low_limit) && (target_device <= high_limit)) {
if ((target_device >= low_limit) && (target_device <= high_limit)) {
Send_I_Am_Flag = true;
}
}
bacnet-stack/ports/atmega8/Makefile
+3 -2
View File
@@ -16,6 +16,7 @@ SIZE = avr-size
# Source locations
BACNET_CORE = ../../src
BACNET_INCLUDE = ../../include
BACNET_OBJECT_INCLUDE = ../../demo/object
BACNET_DEMO = ../../demo
# local files for this project
@@ -27,7 +28,7 @@ CSRC = apdu.c \
timer.c
# common demo files needed
DEMOSRC =
DEMOSRC = \
$(BACNET_DEMO)/handler/h_rp.c \
$(BACNET_DEMO)/handler/txbuf.c \
$(BACNET_DEMO)/handler/h_npdu.c \
@@ -73,7 +74,7 @@ CORESRC = \
# $(BACNET_CORE)/address.c \
## Include Directories
INCLUDES = -I. -I$(BACNET_INCLUDE)
INCLUDES = -I. -I$(BACNET_INCLUDE) -I$(BACNET_OBJECT_INCLUDE)
# Source to Object conversion
COBJ = $(CSRC:.c=.o)
bacnet-stack/ports/atmega8/hardware.h
+10 -11
View File
@@ -31,20 +31,19 @@
#endif
#if defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ASM__)
#include <iom168.h>
#define WATCHDOG_INIT() {BIT_CLEAR(MCUSR, WDRF); WDTCSR = 0;}
#include <iom168.h>
#define WATCHDOG_INIT() {BIT_CLEAR(MCUSR, WDRF); WDTCSR = 0;}
#else
#if !defined(__AVR_ATmega168__)
#error Firmware is configured for ATmega168 only (-mmcu=atmega168)
#if defined(__AVR_ATmega168__)
#define WATCHDOG_INIT() {BIT_CLEAR(MCUSR, WDRF); WDTCSR = 0;}
#else
#define WATCHDOG_INIT() {BIT_CLEAR(MCUCSR, WDRF); WDTCR = 0;}
#if !defined(__AVR_ATmega168__)
#error Firmware is configured for ATmega168 only (-mmcu=atmega168)
#endif
#if defined(__AVR_ATmega168__)
#define WATCHDOG_INIT() {BIT_CLEAR(MCUSR, WDRF); WDTCSR = 0;}
#else
#define WATCHDOG_INIT() {BIT_CLEAR(MCUCSR, WDRF); WDTCR = 0;}
#endif
#endif
#endif
#endif
#include "iar2gcc.h"
#include "avr035.h"
bacnet-stack/ports/xplained/bacnet.c
+1 -1
View File
@@ -118,7 +118,7 @@ void bacnet_task_timed(
memcpy(pkt->buffer, PDUBuffer, MAX_MPDU);
bacnet_address_copy(&pkt->src, &src);
pkt->length = pdu_len;
Ringbuf_Data_Put(&Receive_Queue, pkt);
Ringbuf_Data_Put(&Receive_Queue, (volatile uint8_t *)pkt);
}
}
}
bacnet-stack/ports/xplained/bacnet.cproj
+266 -51
View File
@@ -2,7 +2,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
<ProjectVersion>6.2</ProjectVersion>
<ProjectVersion>7.0</ProjectVersion>
<ToolchainName>com.Atmel.AVRGCC8.C</ToolchainName>
<ProjectGuid>{ea031b72-ce11-41cc-bfdc-00625d02a537}</ProjectGuid>
<avrdevice>ATxmega256A3BU</avrdevice>
@@ -160,7 +160,7 @@
<documentation help="http://asf.atmel.com/docs/3.8.1/xmega.applications.xmega_a3bu_xplained_demo.xmega_a3bu_xplained/html/index.html" />
<offline-documentation help="" />
<dependencies>
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.10.1" />
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.21.0" />
</dependencies>
<project id="xmega.applications.xmega_a3bu_xplained_demo.xmega_a3bu_xplained" value="Add" config="" content-id="Atmel.ASF" />
<board id="board.xmega_a3bu_xplained" value="Add" config="" content-id="Atmel.ASF" />
@@ -213,69 +213,213 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<ToolchainSettings>
<AvrGcc>
<avrgcc.common.Device>-mmcu=atxmega256a3bu -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\gcc\dev\atxmega256a3bu"</avrgcc.common.Device>
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
<avrgcc.compiler.symbols.DefSymbols><ListValues>
<Value>IOPORT_XMEGA_COMPAT</Value>
<Value>BACDL_MSTP</Value>
<Value>MAX_APDU=128</Value>
<Value>MAX_TSM_TRANSACTIONS=1</Value>
<Value>MSTP_PDU_PACKET_COUNT=2</Value>
<Value>BACNET_VENDOR_ID=293</Value>
<Value>MAX_ADDRESS_CACHE=32</Value>
<Value>MAX_ANALOG_INPUTS=8</Value>
<Value>BOARD=XMEGA_A3BU_XPLAINED</Value>
<Value>NDEBUG</Value>
</ListValues></avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.directories.IncludePaths><ListValues><Value>..</Value><Value>../config</Value><Value>../ASF/xmega/drivers/rtc32</Value><Value>../ASF/xmega/drivers/pmic</Value><Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value><Value>../ASF/xmega/utils/preprocessor</Value><Value>../ASF/common/utils</Value><Value>../ASF/common/services/sleepmgr</Value><Value>../ASF/xmega/drivers/sleep</Value><Value>../ASF/common/services/gpio</Value><Value>../ASF/xmega/drivers/tc</Value><Value>../ASF/xmega/drivers/adc</Value><Value>../ASF/xmega/drivers/cpu</Value><Value>../ASF/common/boards</Value><Value>../ASF/common/services/ioport</Value><Value>../ASF/xmega/drivers/nvm</Value><Value>../ASF/xmega/boards</Value><Value>../ASF/xmega/utils</Value><Value>../ASF/xmega/drivers/wdt</Value><Value>../ASF/common/services/clock</Value><Value>../ASF/common/services/delay</Value><Value>../ASF/xmega/drivers/usart</Value><Value>../ASF/xmega/services/pwm</Value><Value>../ASF/common/drivers/nvm</Value><Value>../ASF/common/services/serial/xmega_usart</Value><Value>../ASF/common/services/serial</Value><Value>../ASF/common/utils/stdio/stdio_serial</Value><Value>../ASF/xmega/services/timeout</Value><Value>../../../include</Value><Value>../../../demo/object</Value></ListValues></avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>IOPORT_XMEGA_COMPAT</Value>
<Value>BACDL_MSTP</Value>
<Value>MAX_APDU=128</Value>
<Value>MAX_TSM_TRANSACTIONS=1</Value>
<Value>MSTP_PDU_PACKET_COUNT=2</Value>
<Value>BACNET_VENDOR_ID=293</Value>
<Value>MAX_ADDRESS_CACHE=32</Value>
<Value>MAX_ANALOG_INPUTS=8</Value>
<Value>BOARD=XMEGA_A3BU_XPLAINED</Value>
<Value>NDEBUG</Value>
</ListValues>
</avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.directories.IncludePaths>
<ListValues>
<Value>..</Value>
<Value>../config</Value>
<Value>../ASF/xmega/drivers/rtc32</Value>
<Value>../ASF/xmega/drivers/pmic</Value>
<Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value>
<Value>../ASF/xmega/utils/preprocessor</Value>
<Value>../ASF/common/utils</Value>
<Value>../ASF/common/services/sleepmgr</Value>
<Value>../ASF/xmega/drivers/sleep</Value>
<Value>../ASF/common/services/gpio</Value>
<Value>../ASF/xmega/drivers/tc</Value>
<Value>../ASF/xmega/drivers/adc</Value>
<Value>../ASF/xmega/drivers/cpu</Value>
<Value>../ASF/common/boards</Value>
<Value>../ASF/common/services/ioport</Value>
<Value>../ASF/xmega/drivers/nvm</Value>
<Value>../ASF/xmega/boards</Value>
<Value>../ASF/xmega/utils</Value>
<Value>../ASF/xmega/drivers/wdt</Value>
<Value>../ASF/common/services/clock</Value>
<Value>../ASF/common/services/delay</Value>
<Value>../ASF/xmega/drivers/usart</Value>
<Value>../ASF/xmega/services/pwm</Value>
<Value>../ASF/common/drivers/nvm</Value>
<Value>../ASF/common/services/serial/xmega_usart</Value>
<Value>../ASF/common/services/serial</Value>
<Value>../ASF/common/utils/stdio/stdio_serial</Value>
<Value>../ASF/xmega/services/timeout</Value>
<Value>../../../include</Value>
<Value>../../../demo/object</Value>
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\include</Value>
</ListValues>
</avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
<avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
<avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
<avrgcc.linker.libraries.Libraries><ListValues><Value>libm</Value></ListValues></avrgcc.linker.libraries.Libraries>
<avrgcc.linker.libraries.Libraries>
<ListValues>
<Value>libm</Value>
</ListValues>
</avrgcc.linker.libraries.Libraries>
<avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax -Wl,--section-start=.BOOT=0x40000</avrgcc.linker.miscellaneous.LinkerFlags>
<avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=XMEGA_A3BU_XPLAINED -DIOPORT_XMEGA_COMPAT</avrgcc.assembler.general.AssemblerFlags>
<avrgcc.assembler.general.IncludePaths><ListValues><Value>../ASF/xmega/drivers/rtc32</Value><Value>../ASF/xmega/drivers/pmic</Value><Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value><Value>../ASF/xmega/drivers/nvm</Value><Value>../ASF/xmega/utils/preprocessor</Value><Value>../ASF/common/utils</Value><Value>../ASF/common/services/sleepmgr</Value><Value>../ASF/xmega/drivers/sleep</Value><Value>../ASF/common/services/gpio</Value><Value>../ASF/xmega/drivers/tc</Value><Value>../ASF/xmega/drivers/adc</Value><Value>../ASF/xmega/drivers/cpu</Value><Value>../ASF/common/boards</Value><Value>../ASF/common/services/ioport</Value><Value>../ASF/xmega/boards</Value><Value>../ASF/xmega/utils</Value><Value>../ASF/common/services/clock</Value><Value>../ASF/common/services/delay</Value><Value>../ASF/xmega/drivers/wdt</Value><Value>../ASF/xmega/drivers/usart</Value><Value>../config</Value><Value>.</Value><Value>../ASF/xmega/services/pwm</Value><Value>../ASF/common/drivers/nvm</Value><Value>../ASF/common/services/serial/xmega_usart</Value><Value>../ASF/common/services/serial</Value><Value>../ASF/common/utils/stdio/stdio_serial</Value><Value>../ASF/xmega/services/timeout</Value></ListValues></avrgcc.assembler.general.IncludePaths>
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
<avrgcc.assembler.general.IncludePaths>
<ListValues>
<Value>../ASF/xmega/drivers/rtc32</Value>
<Value>../ASF/xmega/drivers/pmic</Value>
<Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value>
<Value>../ASF/xmega/drivers/nvm</Value>
<Value>../ASF/xmega/utils/preprocessor</Value>
<Value>../ASF/common/utils</Value>
<Value>../ASF/common/services/sleepmgr</Value>
<Value>../ASF/xmega/drivers/sleep</Value>
<Value>../ASF/common/services/gpio</Value>
<Value>../ASF/xmega/drivers/tc</Value>
<Value>../ASF/xmega/drivers/adc</Value>
<Value>../ASF/xmega/drivers/cpu</Value>
<Value>../ASF/common/boards</Value>
<Value>../ASF/common/services/ioport</Value>
<Value>../ASF/xmega/boards</Value>
<Value>../ASF/xmega/utils</Value>
<Value>../ASF/common/services/clock</Value>
<Value>../ASF/common/services/delay</Value>
<Value>../ASF/xmega/drivers/wdt</Value>
<Value>../ASF/xmega/drivers/usart</Value>
<Value>../config</Value>
<Value>.</Value>
<Value>../ASF/xmega/services/pwm</Value>
<Value>../ASF/common/drivers/nvm</Value>
<Value>../ASF/common/services/serial/xmega_usart</Value>
<Value>../ASF/common/services/serial</Value>
<Value>../ASF/common/utils/stdio/stdio_serial</Value>
<Value>../ASF/xmega/services/timeout</Value>
</ListValues>
</avrgcc.assembler.general.IncludePaths>
</AvrGcc>
</ToolchainSettings>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<ToolchainSettings>
<AvrGcc>
<avrgcc.common.Device>-mmcu=atxmega256a3bu -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\gcc\dev\atxmega256a3bu"</avrgcc.common.Device>
<avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
<avrgcc.compiler.symbols.DefSymbols><ListValues>
<Value>IOPORT_XMEGA_COMPAT</Value>
<Value>BACDL_MSTP</Value>
<Value>MAX_APDU=128</Value>
<Value>MAX_TSM_TRANSACTIONS=1</Value>
<Value>MSTP_PDU_PACKET_COUNT=2</Value>
<Value>BACNET_VENDOR_ID=293</Value>
<Value>MAX_ADDRESS_CACHE=32</Value>
<Value>MAX_ANALOG_INPUTS=8</Value>
<Value>DEBUG</Value>
</ListValues></avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.directories.IncludePaths><ListValues><Value>..</Value><Value>../config</Value><Value>../ASF/xmega/drivers/rtc32</Value><Value>../ASF/xmega/drivers/pmic</Value><Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value><Value>../ASF/xmega/utils/preprocessor</Value><Value>../ASF/common/utils</Value><Value>../ASF/common/services/sleepmgr</Value><Value>../ASF/xmega/drivers/sleep</Value><Value>../ASF/common/services/gpio</Value><Value>../ASF/xmega/drivers/tc</Value><Value>../ASF/xmega/drivers/adc</Value><Value>../ASF/xmega/drivers/cpu</Value><Value>../ASF/common/boards</Value><Value>../ASF/common/services/ioport</Value><Value>../ASF/xmega/drivers/nvm</Value><Value>../ASF/xmega/boards</Value><Value>../ASF/xmega/utils</Value><Value>../ASF/xmega/drivers/wdt</Value><Value>../ASF/common/services/clock</Value><Value>../ASF/common/services/delay</Value><Value>../ASF/xmega/drivers/usart</Value><Value>../ASF/xmega/services/pwm</Value><Value>../ASF/common/drivers/nvm</Value><Value>../ASF/common/services/serial/xmega_usart</Value><Value>../ASF/common/services/serial</Value><Value>../ASF/common/utils/stdio/stdio_serial</Value><Value>../ASF/xmega/services/timeout</Value><Value>../../../include</Value><Value>../../../demo/object</Value></ListValues></avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>IOPORT_XMEGA_COMPAT</Value>
<Value>BACDL_MSTP</Value>
<Value>MAX_APDU=128</Value>
<Value>MAX_TSM_TRANSACTIONS=1</Value>
<Value>MSTP_PDU_PACKET_COUNT=2</Value>
<Value>BACNET_VENDOR_ID=293</Value>
<Value>MAX_ADDRESS_CACHE=32</Value>
<Value>MAX_ANALOG_INPUTS=8</Value>
<Value>DEBUG</Value>
</ListValues>
</avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.directories.IncludePaths>
<ListValues>
<Value>..</Value>
<Value>../config</Value>
<Value>../ASF/xmega/drivers/rtc32</Value>
<Value>../ASF/xmega/drivers/pmic</Value>
<Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value>
<Value>../ASF/xmega/utils/preprocessor</Value>
<Value>../ASF/common/utils</Value>
<Value>../ASF/common/services/sleepmgr</Value>
<Value>../ASF/xmega/drivers/sleep</Value>
<Value>../ASF/common/services/gpio</Value>
<Value>../ASF/xmega/drivers/tc</Value>
<Value>../ASF/xmega/drivers/adc</Value>
<Value>../ASF/xmega/drivers/cpu</Value>
<Value>../ASF/common/boards</Value>
<Value>../ASF/common/services/ioport</Value>
<Value>../ASF/xmega/drivers/nvm</Value>
<Value>../ASF/xmega/boards</Value>
<Value>../ASF/xmega/utils</Value>
<Value>../ASF/xmega/drivers/wdt</Value>
<Value>../ASF/common/services/clock</Value>
<Value>../ASF/common/services/delay</Value>
<Value>../ASF/xmega/drivers/usart</Value>
<Value>../ASF/xmega/services/pwm</Value>
<Value>../ASF/common/drivers/nvm</Value>
<Value>../ASF/common/services/serial/xmega_usart</Value>
<Value>../ASF/common/services/serial</Value>
<Value>../ASF/common/utils/stdio/stdio_serial</Value>
<Value>../ASF/xmega/services/timeout</Value>
<Value>../../../include</Value>
<Value>../../../demo/object</Value>
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\include</Value>
</ListValues>
</avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
<avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
<avrgcc.linker.libraries.Libraries><ListValues><Value>libm</Value></ListValues></avrgcc.linker.libraries.Libraries>
<avrgcc.linker.libraries.Libraries>
<ListValues>
<Value>libm</Value>
</ListValues>
</avrgcc.linker.libraries.Libraries>
<avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax -Wl,--section-start=.BOOT=0x40000</avrgcc.linker.miscellaneous.LinkerFlags>
<avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=XMEGA_A3BU_XPLAINED -DIOPORT_XMEGA_COMPAT</avrgcc.assembler.general.AssemblerFlags>
<avrgcc.assembler.general.IncludePaths><ListValues><Value>../ASF/xmega/drivers/rtc32</Value><Value>../ASF/xmega/drivers/pmic</Value><Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value><Value>../ASF/xmega/drivers/nvm</Value><Value>../ASF/xmega/utils/preprocessor</Value><Value>../ASF/common/utils</Value><Value>../ASF/common/services/sleepmgr</Value><Value>../ASF/xmega/drivers/sleep</Value><Value>../ASF/common/services/gpio</Value><Value>../ASF/xmega/drivers/tc</Value><Value>../ASF/xmega/drivers/adc</Value><Value>../ASF/xmega/drivers/cpu</Value><Value>../ASF/common/boards</Value><Value>../ASF/common/services/ioport</Value><Value>../ASF/xmega/boards</Value><Value>../ASF/xmega/utils</Value><Value>../ASF/common/services/clock</Value><Value>../ASF/common/services/delay</Value><Value>../ASF/xmega/drivers/wdt</Value><Value>../ASF/xmega/drivers/usart</Value><Value>../config</Value><Value>.</Value><Value>../ASF/xmega/services/pwm</Value><Value>../ASF/common/drivers/nvm</Value><Value>../ASF/common/services/serial/xmega_usart</Value><Value>../ASF/common/services/serial</Value><Value>../ASF/common/utils/stdio/stdio_serial</Value><Value>../ASF/xmega/services/timeout</Value></ListValues></avrgcc.assembler.general.IncludePaths>
<avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
<avrgcc.assembler.general.IncludePaths>
<ListValues>
<Value>../ASF/xmega/drivers/rtc32</Value>
<Value>../ASF/xmega/drivers/pmic</Value>
<Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value>
<Value>../ASF/xmega/drivers/nvm</Value>
<Value>../ASF/xmega/utils/preprocessor</Value>
<Value>../ASF/common/utils</Value>
<Value>../ASF/common/services/sleepmgr</Value>
<Value>../ASF/xmega/drivers/sleep</Value>
<Value>../ASF/common/services/gpio</Value>
<Value>../ASF/xmega/drivers/tc</Value>
<Value>../ASF/xmega/drivers/adc</Value>
<Value>../ASF/xmega/drivers/cpu</Value>
<Value>../ASF/common/boards</Value>
<Value>../ASF/common/services/ioport</Value>
<Value>../ASF/xmega/boards</Value>
<Value>../ASF/xmega/utils</Value>
<Value>../ASF/common/services/clock</Value>
<Value>../ASF/common/services/delay</Value>
<Value>../ASF/xmega/drivers/wdt</Value>
<Value>../ASF/xmega/drivers/usart</Value>
<Value>../config</Value>
<Value>.</Value>
<Value>../ASF/xmega/services/pwm</Value>
<Value>../ASF/common/drivers/nvm</Value>
<Value>../ASF/common/services/serial/xmega_usart</Value>
<Value>../ASF/common/services/serial</Value>
<Value>../ASF/common/utils/stdio/stdio_serial</Value>
<Value>../ASF/xmega/services/timeout</Value>
</ListValues>
</avrgcc.assembler.general.IncludePaths>
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
</AvrGcc>
</ToolchainSettings>
@@ -284,36 +428,107 @@
<OutputPath>bin\Debug-XPLAINED\</OutputPath>
<ToolchainSettings>
<AvrGcc>
<avrgcc.common.optimization.RelaxBranches>False</avrgcc.common.optimization.RelaxBranches>
<avrgcc.common.Device>-mmcu=atxmega256a3bu -B "%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\gcc\dev\atxmega256a3bu"</avrgcc.common.Device>
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
<avrgcc.compiler.symbols.DefSymbols><ListValues>
<Value>IOPORT_XMEGA_COMPAT</Value>
<Value>BACDL_MSTP</Value>
<Value>MAX_APDU=128</Value>
<Value>MAX_TSM_TRANSACTIONS=1</Value>
<Value>MSTP_PDU_PACKET_COUNT=2</Value>
<Value>BACNET_VENDOR_ID=293</Value>
<Value>MAX_ADDRESS_CACHE=32</Value>
<Value>MAX_ANALOG_INPUTS=8</Value>
<Value>BOARD=XMEGA_A3BU_XPLAINED</Value>
<Value>CONF_BOARD_ENABLE_RS485_XPLAINED</Value>
<Value>DEBUG</Value>
</ListValues></avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.directories.IncludePaths><ListValues><Value>..</Value><Value>../config</Value><Value>../ASF/xmega/drivers/rtc32</Value><Value>../ASF/xmega/drivers/pmic</Value><Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value><Value>../ASF/xmega/utils/preprocessor</Value><Value>../ASF/common/utils</Value><Value>../ASF/common/services/sleepmgr</Value><Value>../ASF/xmega/drivers/sleep</Value><Value>../ASF/common/services/gpio</Value><Value>../ASF/xmega/drivers/tc</Value><Value>../ASF/xmega/drivers/adc</Value><Value>../ASF/xmega/drivers/cpu</Value><Value>../ASF/common/boards</Value><Value>../ASF/common/services/ioport</Value><Value>../ASF/xmega/drivers/nvm</Value><Value>../ASF/xmega/boards</Value><Value>../ASF/xmega/utils</Value><Value>../ASF/xmega/drivers/wdt</Value><Value>../ASF/common/services/clock</Value><Value>../ASF/common/services/delay</Value><Value>../ASF/xmega/drivers/usart</Value><Value>../ASF/xmega/services/pwm</Value><Value>../ASF/common/drivers/nvm</Value><Value>../ASF/common/services/serial/xmega_usart</Value><Value>../ASF/common/services/serial</Value><Value>../ASF/common/utils/stdio/stdio_serial</Value><Value>../ASF/xmega/services/timeout</Value><Value>../../../include</Value><Value>../../../demo/object</Value></ListValues></avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>IOPORT_XMEGA_COMPAT</Value>
<Value>BACDL_MSTP</Value>
<Value>MAX_APDU=128</Value>
<Value>MAX_TSM_TRANSACTIONS=1</Value>
<Value>MSTP_PDU_PACKET_COUNT=2</Value>
<Value>BACNET_VENDOR_ID=293</Value>
<Value>MAX_ADDRESS_CACHE=32</Value>
<Value>MAX_ANALOG_INPUTS=8</Value>
<Value>BOARD=XMEGA_A3BU_XPLAINED</Value>
<Value>CONF_BOARD_ENABLE_RS485_XPLAINED</Value>
<Value>DEBUG</Value>
</ListValues>
</avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.directories.IncludePaths>
<ListValues>
<Value>..</Value>
<Value>../config</Value>
<Value>../ASF/xmega/drivers/rtc32</Value>
<Value>../ASF/xmega/drivers/pmic</Value>
<Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value>
<Value>../ASF/xmega/utils/preprocessor</Value>
<Value>../ASF/common/utils</Value>
<Value>../ASF/common/services/sleepmgr</Value>
<Value>../ASF/xmega/drivers/sleep</Value>
<Value>../ASF/common/services/gpio</Value>
<Value>../ASF/xmega/drivers/tc</Value>
<Value>../ASF/xmega/drivers/adc</Value>
<Value>../ASF/xmega/drivers/cpu</Value>
<Value>../ASF/common/boards</Value>
<Value>../ASF/common/services/ioport</Value>
<Value>../ASF/xmega/drivers/nvm</Value>
<Value>../ASF/xmega/boards</Value>
<Value>../ASF/xmega/utils</Value>
<Value>../ASF/xmega/drivers/wdt</Value>
<Value>../ASF/common/services/clock</Value>
<Value>../ASF/common/services/delay</Value>
<Value>../ASF/xmega/drivers/usart</Value>
<Value>../ASF/xmega/services/pwm</Value>
<Value>../ASF/common/drivers/nvm</Value>
<Value>../ASF/common/services/serial/xmega_usart</Value>
<Value>../ASF/common/services/serial</Value>
<Value>../ASF/common/utils/stdio/stdio_serial</Value>
<Value>../ASF/xmega/services/timeout</Value>
<Value>../../../include</Value>
<Value>../../../demo/object</Value>
<Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\include</Value>
</ListValues>
</avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
<avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
<avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
<avrgcc.linker.libraries.Libraries><ListValues><Value>libm</Value></ListValues></avrgcc.linker.libraries.Libraries>
<avrgcc.linker.libraries.Libraries>
<ListValues>
<Value>libm</Value>
</ListValues>
</avrgcc.linker.libraries.Libraries>
<avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax -Wl,--section-start=.BOOT=0x40000</avrgcc.linker.miscellaneous.LinkerFlags>
<avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=XMEGA_A3BU_XPLAINED -DIOPORT_XMEGA_COMPAT</avrgcc.assembler.general.AssemblerFlags>
<avrgcc.assembler.general.IncludePaths><ListValues><Value>../ASF/xmega/drivers/rtc32</Value><Value>../ASF/xmega/drivers/pmic</Value><Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value><Value>../ASF/xmega/drivers/nvm</Value><Value>../ASF/xmega/utils/preprocessor</Value><Value>../ASF/common/utils</Value><Value>../ASF/common/services/sleepmgr</Value><Value>../ASF/xmega/drivers/sleep</Value><Value>../ASF/common/services/gpio</Value><Value>../ASF/xmega/drivers/tc</Value><Value>../ASF/xmega/drivers/adc</Value><Value>../ASF/xmega/drivers/cpu</Value><Value>../ASF/common/boards</Value><Value>../ASF/common/services/ioport</Value><Value>../ASF/xmega/boards</Value><Value>../ASF/xmega/utils</Value><Value>../ASF/common/services/clock</Value><Value>../ASF/common/services/delay</Value><Value>../ASF/xmega/drivers/wdt</Value><Value>../ASF/xmega/drivers/usart</Value><Value>../config</Value><Value>.</Value><Value>../ASF/xmega/services/pwm</Value><Value>../ASF/common/drivers/nvm</Value><Value>../ASF/common/services/serial/xmega_usart</Value><Value>../ASF/common/services/serial</Value><Value>../ASF/common/utils/stdio/stdio_serial</Value><Value>../ASF/xmega/services/timeout</Value></ListValues></avrgcc.assembler.general.IncludePaths>
<avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
<avrgcc.assembler.general.IncludePaths>
<ListValues>
<Value>../ASF/xmega/drivers/rtc32</Value>
<Value>../ASF/xmega/drivers/pmic</Value>
<Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value>
<Value>../ASF/xmega/drivers/nvm</Value>
<Value>../ASF/xmega/utils/preprocessor</Value>
<Value>../ASF/common/utils</Value>
<Value>../ASF/common/services/sleepmgr</Value>
<Value>../ASF/xmega/drivers/sleep</Value>
<Value>../ASF/common/services/gpio</Value>
<Value>../ASF/xmega/drivers/tc</Value>
<Value>../ASF/xmega/drivers/adc</Value>
<Value>../ASF/xmega/drivers/cpu</Value>
<Value>../ASF/common/boards</Value>
<Value>../ASF/common/services/ioport</Value>
<Value>../ASF/xmega/boards</Value>
<Value>../ASF/xmega/utils</Value>
<Value>../ASF/common/services/clock</Value>
<Value>../ASF/common/services/delay</Value>
<Value>../ASF/xmega/drivers/wdt</Value>
<Value>../ASF/xmega/drivers/usart</Value>
<Value>../config</Value>
<Value>.</Value>
<Value>../ASF/xmega/services/pwm</Value>
<Value>../ASF/common/drivers/nvm</Value>
<Value>../ASF/common/services/serial/xmega_usart</Value>
<Value>../ASF/common/services/serial</Value>
<Value>../ASF/common/utils/stdio/stdio_serial</Value>
<Value>../ASF/xmega/services/timeout</Value>
</ListValues>
</avrgcc.assembler.general.IncludePaths>
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
</AvrGcc>
</ToolchainSettings>
bacnet-stack/ports/xplained/dlmstp.c
+1 -1
View File
@@ -1283,7 +1283,7 @@ int dlmstp_send_pdu(BACNET_ADDRESS * dest, /* destination address */
} else {
pkt->destination_mac = dest->mac[0];
}
if (Ringbuf_Data_Put(&PDU_Queue, pkt)) {
if (Ringbuf_Data_Put(&PDU_Queue, (volatile uint8_t *)pkt)) {
bytes_sent = pdu_len;
}
}