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

Fixed AVR ports IDE project builds (#111)

Browse Source 
Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2020-08-19 10:05:01 -05:00
committed by GitHub
parent c1429ba7be
commit 645c1b7916
22 changed files with 8268 additions and 4649 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ports/bdk-atxx4-mstp/Makefile
+1
View File
@@ -108,6 +108,7 @@ BASICSRC = $(BACNET_BASIC)/service/h_dcc.c \
$(BACNET_BASIC)/service/h_noserv.c \
$(BACNET_BASIC)/service/s_iam.c \
$(BACNET_BASIC)/service/s_ihave.c \
$(BACNET_BASIC)/sys/bigend.c \
$(BACNET_BASIC)/sys/fifo.c \
$(BACNET_BASIC)/sys/mstimer.c \
$(BACNET_BASIC)/sys/ringbuf.c \
ports/bdk-atxx4-mstp/bacnet.cproj
+135 -12
View File
@@ -6,7 +6,7 @@
<ToolchainName>com.Atmel.AVRGCC8.C</ToolchainName>
<ProjectGuid>{1cefd571-4b50-48fd-b75e-0e968ebbd698}</ProjectGuid>
<avrdevice>ATmega644P</avrdevice>
<avrdeviceseries>none</avrdeviceseries>
<avrdeviceseries>mega</avrdeviceseries>
<OutputType>Executable</OutputType>
<Language>C</Language>
<OutputFileName>$(MSBuildProjectName)</OutputFileName>
@@ -27,14 +27,36 @@
<BootSegment>2</BootSegment>
<AsfFrameworkConfig>
<framework-data>
<options />
<options>
<option id="common.boards" value="Add" config="" content-id="Atmel.ASF" />
</options>
<configurations />
<files />
<documentation help="" />
<files>
<file path="src/config/conf_board.h" framework="" version="" source="common/applications/user_application/user_board/config/conf_board.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/common/boards/board.h" framework="" version="" source="common/boards/board.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/common/boards/user_board/init.c" framework="" version="" source="common/boards/user_board/init.c" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/common/boards/user_board/user_board.h" framework="" version="" source="common/boards/user_board/user_board.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/common/utils/interrupt.h" framework="" version="" source="common/utils/interrupt.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/common/utils/interrupt/interrupt_avr8.h" framework="" version="" source="common/utils/interrupt/interrupt_avr8.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/common/utils/make/Makefile.avr.in" framework="" version="" source="common/utils/make/Makefile.avr.in" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/common/utils/parts.h" framework="" version="" source="common/utils/parts.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/mega/utils/assembler.h" framework="" version="" source="mega/utils/assembler.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/mega/utils/assembler/gas.h" framework="" version="" source="mega/utils/assembler/gas.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/mega/utils/compiler.h" framework="" version="" source="mega/utils/compiler.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/mega/utils/preprocessor/mrepeat.h" framework="" version="" source="mega/utils/preprocessor/mrepeat.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/mega/utils/preprocessor/preprocessor.h" framework="" version="" source="mega/utils/preprocessor/preprocessor.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/mega/utils/preprocessor/stringz.h" framework="" version="" source="mega/utils/preprocessor/stringz.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/mega/utils/preprocessor/tpaste.h" framework="" version="" source="mega/utils/preprocessor/tpaste.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/mega/utils/progmem.h" framework="" version="" source="mega/utils/progmem.h" changed="False" content-id="Atmel.ASF" />
<file path="src/ASF/mega/utils/status_codes.h" framework="" version="" source="mega/utils/status_codes.h" changed="False" content-id="Atmel.ASF" />
</files>
<documentation help="http://asf.atmel.com/docs/3.39.0/common.applications.user_application.user_board.mega/html/index.html" />
<offline-documentation help="" />
<dependencies>
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.39.0" />
</dependencies>
<project id="common.applications.user_application.user_board.mega" value="Add" config="" content-id="Atmel.ASF" />
<board id="board.user_board.mega" value="Add" config="" content-id="Atmel.ASF" />
</framework-data>
</AsfFrameworkConfig>
<preserveEEPROM>true</preserveEEPROM>
@@ -50,8 +72,6 @@
<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.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
<avrgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>BACDL_MSTP</Value>
@@ -61,6 +81,7 @@
<Value>MAX_CHARACTER_STRING_BYTES=64</Value>
<Value>MAX_OCTET_STRING_BYTES=64</Value>
<Value>NDEBUG</Value>
<Value>BOARD=USER_BOARD</Value>
</ListValues>
</avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.directories.IncludePaths>
@@ -69,22 +90,40 @@
<Value>../../../src</Value>
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.3.300\include</Value>
<Value>../../../ports/bdk-atxx4-mstp</Value>
<Value>../src/ASF/common/boards/user_board</Value>
<Value>../src/ASF/common/boards</Value>
<Value>../src/ASF/mega/utils/preprocessor</Value>
<Value>../src/ASF/mega/utils</Value>
<Value>../src/ASF/common/utils</Value>
<Value>../src</Value>
<Value>../src/config</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.miscellaneous.LinkerFlags>-Wl,--relax</avrgcc.linker.miscellaneous.LinkerFlags>
<avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=USER_BOARD</avrgcc.assembler.general.AssemblerFlags>
<avrgcc.assembler.general.IncludePaths>
<ListValues>
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.3.300\include</Value>
<Value>../src/ASF/common/boards/user_board</Value>
<Value>../src/ASF/common/boards</Value>
<Value>../src/ASF/mega/utils/preprocessor</Value>
<Value>../src/ASF/mega/utils</Value>
<Value>../src/ASF/common/utils</Value>
<Value>../src</Value>
<Value>../src/config</Value>
</ListValues>
</avrgcc.assembler.general.IncludePaths>
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
</AvrGcc>
</ToolchainSettings>
<UsesExternalMakeFile>False</UsesExternalMakeFile>
@@ -101,8 +140,6 @@
<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.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
<avrgcc.compiler.symbols.DefSymbols>
<ListValues>
<Value>BACDL_MSTP</Value>
@@ -112,6 +149,7 @@
<Value>MAX_CHARACTER_STRING_BYTES=64</Value>
<Value>MAX_OCTET_STRING_BYTES=64</Value>
<Value>DEBUG</Value>
<Value>BOARD=USER_BOARD</Value>
</ListValues>
</avrgcc.compiler.symbols.DefSymbols>
<avrgcc.compiler.directories.IncludePaths>
@@ -121,23 +159,41 @@
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.3.300\include</Value>
<Value>../../../demo/object</Value>
<Value>../../../include</Value>
<Value>../src/ASF/common/boards/user_board</Value>
<Value>../src/ASF/common/boards</Value>
<Value>../src/ASF/mega/utils/preprocessor</Value>
<Value>../src/ASF/mega/utils</Value>
<Value>../src/ASF/common/utils</Value>
<Value>../src</Value>
<Value>../src/config</Value>
</ListValues>
</avrgcc.compiler.directories.IncludePaths>
<avrgcc.compiler.optimization.level>Optimize (-O1)</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.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.miscellaneous.LinkerFlags>-Wl,--relax</avrgcc.linker.miscellaneous.LinkerFlags>
<avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=USER_BOARD</avrgcc.assembler.general.AssemblerFlags>
<avrgcc.assembler.general.IncludePaths>
<ListValues>
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.3.300\include</Value>
<Value>../src/ASF/common/boards/user_board</Value>
<Value>../src/ASF/common/boards</Value>
<Value>../src/ASF/mega/utils/preprocessor</Value>
<Value>../src/ASF/mega/utils</Value>
<Value>../src/ASF/common/utils</Value>
<Value>../src</Value>
<Value>../src/config</Value>
</ListValues>
</avrgcc.assembler.general.IncludePaths>
<avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
</AvrGcc>
</ToolchainSettings>
@@ -353,7 +409,7 @@
</Compile>
<Compile Include="..\..\src\bacnet\proplist.c">
<SubType>compile</SubType>
<Link>BACnet Core\npdu.c</Link>
<Link>BACnet Core\proplist.c</Link>
</Compile>
<Compile Include="..\..\src\bacnet\rd.c">
<SubType>compile</SubType>
@@ -391,10 +447,77 @@
<SubType>compile</SubType>
<Link>BACnet Core\wp.c</Link>
</Compile>
<None Include="src\ASF\common\boards\board.h">
<SubType>compile</SubType>
</None>
<None Include="src\asf.h">
<SubType>compile</SubType>
</None>
<Compile Include="src\ASF\common\boards\user_board\init.c">
<SubType>compile</SubType>
</Compile>
<None Include="src\ASF\common\utils\make\Makefile.avr.in">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\mega\utils\preprocessor\tpaste.h">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\mega\utils\progmem.h">
<SubType>compile</SubType>
</None>
<None Include="src\config\conf_board.h">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\mega\utils\preprocessor\preprocessor.h">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\mega\utils\preprocessor\stringz.h">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\common\utils\interrupt.h">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\mega\utils\compiler.h">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\mega\utils\assembler.h">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\common\utils\parts.h">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\common\utils\interrupt\interrupt_avr8.h">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\mega\utils\preprocessor\mrepeat.h">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\mega\utils\assembler\gas.h">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\common\boards\user_board\user_board.h">
<SubType>compile</SubType>
</None>
<None Include="src\ASF\mega\utils\status_codes.h">
<SubType>compile</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="BACnet Handlers" />
<Folder Include="BACnet Core" />
<Folder Include="src\" />
<Folder Include="src\ASF\" />
<Folder Include="src\ASF\common\" />
<Folder Include="src\ASF\common\boards\" />
<Folder Include="src\ASF\common\boards\user_board\" />
<Folder Include="src\ASF\common\utils\" />
<Folder Include="src\ASF\common\utils\interrupt\" />
<Folder Include="src\ASF\common\utils\make\" />
<Folder Include="src\ASF\mega\" />
<Folder Include="src\ASF\mega\utils\" />
<Folder Include="src\ASF\mega\utils\assembler\" />
<Folder Include="src\ASF\mega\utils\preprocessor\" />
<Folder Include="src\config\" />
</ItemGroup>
<Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
</Project>
ports/bdk-atxx4-mstp/bacnet.ewp
+4409 -2279
View File
File diff suppressed because it is too large Load Diff
ports/bdk-atxx4-mstp/iar2gcc.h
+41
View File
@@ -49,6 +49,44 @@ static inline void _delay_us(
__delay_cycles(F_CPU / 1000000UL);
} while (microseconds--);
}
#if (__VER__ > 700)
#define DDA0 DDRA0
#define DDA1 DDRA1
#define DDA2 DDRA2
#define DDA3 DDRA3
#define DDA4 DDRA4
#define DDA5 DDRA5
#define DDA6 DDRA6
#define DDA7 DDRA7
#define DDB0 DDRB0
#define DDB1 DDRB1
#define DDB2 DDRB2
#define DDB3 DDRB3
#define DDB4 DDRB4
#define DDB5 DDRB5
#define DDB6 DDRB6
#define DDB7 DDRB7
#define DDC0 DDRC0
#define DDC1 DDRC1
#define DDC2 DDRC2
#define DDC3 DDRC3
#define DDC4 DDRC4
#define DDC5 DDRC5
#define DDC6 DDRC6
#define DDC7 DDRC7
#define DDD0 DDRD0
#define DDD1 DDRD1
#define DDD2 DDRD2
#define DDD3 DDRD3
#define DDD4 DDRD4
#define DDD5 DDRD5
#define DDD6 DDRD6
#define DDD7 DDRD7
#endif
#endif
#if defined(__GNUC__)
@@ -311,6 +349,9 @@ unsigned char __uint8_eeprom_load(
/* power macros in GCC-AVR */
#if (defined(__ICCAVR__) && (defined(__ATmega644P__))) || \
(defined(__CROSSWORKS_AVR) && (__TARGET_PROCESSOR == ATmega644P))
#if (defined(__ICCAVR__) && (__VER__ > 700))
#define PRR PRR0
#endif
#define power_adc_enable() (PRR &= (uint8_t)~(1 << PRADC))
#define power_spi_enable() (PRR &= (uint8_t)~(1 << PRSPI))
#define power_usart0_enable() (PRR &= (uint8_t)~(1 << PRUSART0))