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

Adjusted BDK port to compile for ATmega1284p for IAR.

Browse Source
This commit is contained in:
skarg
2012-10-31 16:30:18 +00:00
parent cde2d61d92
commit d1567978c9
3 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/bdk-atxx4-mstp/bacnet.ewp
+12 -12
View File
@@ -123,7 +123,7 @@
</option> </option>
<option> <option>
<name>GGEepromUtilSize</name> <name>GGEepromUtilSize</name>
<state>2048</state> <state>4096</state>
</option> </option>
<option> <option>
<name>GRuntimeLibSelect</name> <name>GRuntimeLibSelect</name>
@@ -140,11 +140,11 @@
</option> </option>
<option> <option>
<name>RTConfigPath</name> <name>RTConfigPath</name>
<state>$TOOLKIT_DIR$\LIB\DLIB\dlAVR-3s-ec_mul-sf-n.h</state> <state>$TOOLKIT_DIR$\LIB\DLIB\dlAVR-3s-ec_mul-n.h</state>
</option> </option>
<option> <option>
<name>RTLibraryPath</name> <name>RTLibraryPath</name>
<state>$TOOLKIT_DIR$\LIB\DLIB\dlAVR-3s-ec_mul-sf-n.r90</state> <state>$TOOLKIT_DIR$\LIB\DLIB\dlAVR-3s-ec_mul-n.r90</state>
</option> </option>
<option> <option>
<name>Input variant</name> <name>Input variant</name>
@@ -153,7 +153,7 @@
</option> </option>
<option> <option>
<name>Input description</name> <name>Input description</name>
<state> No specifier n, no float or long long, no scan set, no assignment suppressing.</state> <state>No specifier n, no float nor long long, no scan set, no assignment suppressing.</state>
</option> </option>
<option> <option>
<name>Output variant</name> <name>Output variant</name>
@@ -162,7 +162,7 @@
</option> </option>
<option> <option>
<name>Output description</name> <name>Output description</name>
<state> specifier a or A, no specifier n, no float or long long.</state> <state>No specifier a, A, no specifier n, no float nor long long.</state>
</option> </option>
<option> <option>
<name>GRuntimeLibSelectSlave</name> <name>GRuntimeLibSelectSlave</name>
@@ -217,7 +217,7 @@
</option> </option>
<option> <option>
<name>GenDeviceSelectMenu</name> <name>GenDeviceSelectMenu</name>
<state>m644p ATmega644P</state> <state>m1284p ATmega1284P</state>
</option> </option>
</data> </data>
</settings> </settings>
@@ -802,7 +802,7 @@
</option> </option>
<option> <option>
<name>XclFile</name> <name>XclFile</name>
<state>$TOOLKIT_DIR$\src\template\cfgm644p.xcl</state> <state>$TOOLKIT_DIR$\src\template\cfgm1284p.xcl</state>
</option> </option>
<option> <option>
<name>XclFileSlave</name> <name>XclFileSlave</name>
@@ -1136,7 +1136,7 @@
</option> </option>
<option> <option>
<name>GGEepromUtilSize</name> <name>GGEepromUtilSize</name>
<state>2048</state> <state>4096</state>
</option> </option>
<option> <option>
<name>GRuntimeLibSelect</name> <name>GRuntimeLibSelect</name>
@@ -1153,7 +1153,7 @@
</option> </option>
<option> <option>
<name>RTConfigPath</name> <name>RTConfigPath</name>
<state>$TOOLKIT_DIR$\LIB\DLIB\dlAVR-3s-ec_mul-sf-n.h</state> <state>$TOOLKIT_DIR$\LIB\DLIB\dlAVR-3s-ec_mul-n.h</state>
</option> </option>
<option> <option>
<name>RTLibraryPath</name> <name>RTLibraryPath</name>
@@ -1166,7 +1166,7 @@
</option> </option>
<option> <option>
<name>Input description</name> <name>Input description</name>
<state>Full formatting.</state> <state>Full formatting</state>
</option> </option>
<option> <option>
<name>Output variant</name> <name>Output variant</name>
@@ -1175,7 +1175,7 @@
</option> </option>
<option> <option>
<name>Output description</name> <name>Output description</name>
<state> specifier a or A, no specifier n, no float or long long.</state> <state>No specifier a, A, no specifier n, no float nor long long.</state>
</option> </option>
<option> <option>
<name>GRuntimeLibSelectSlave</name> <name>GRuntimeLibSelectSlave</name>
@@ -1230,7 +1230,7 @@
</option> </option>
<option> <option>
<name>GenDeviceSelectMenu</name> <name>GenDeviceSelectMenu</name>
<state>m644p ATmega644P</state> <state>m1284p ATmega1284P</state>
</option> </option>
</data> </data>
</settings> </settings>
bacnet-stack/ports/bdk-atxx4-mstp/hardware.h
+5
View File
@@ -32,8 +32,13 @@
/* IAR compiler specific configuration */ /* IAR compiler specific configuration */
#if defined(__ICCAVR__) #if defined(__ICCAVR__)
#if defined(__ATmega644P__)
#include <iom644p.h> #include <iom644p.h>
#endif #endif
#if defined(__ATmega1284P__)
#include <iom1284p.h>
#endif
#endif
/* AVR-GCC compiler specific configuration */ /* AVR-GCC compiler specific configuration */
#if defined(__GNUC__) #if defined(__GNUC__)
bacnet-stack/ports/bdk-atxx4-mstp/iar2gcc.h
+22
View File
@@ -308,6 +308,28 @@ unsigned char __uint8_eeprom_load(
#define WDTO_2S 7 #define WDTO_2S 7
#endif #endif
/* power macros in GCC-AVR */
#if (defined(__ICCAVR__) && (defined(__ATmega644P__))) || \
(defined(__CROSSWORKS_AVR) && (__TARGET_PROCESSOR == ATmega644P))
#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))
#define power_usart1_enable() (PRR &= (uint8_t)~(1 << PRUSART1))
#define power_timer0_enable() (PRR &= (uint8_t)~(1 << PRTIM0))
#define power_timer1_enable() (PRR &= (uint8_t)~(1 << PRTIM1))
#define power_timer2_enable() (PRR &= (uint8_t)~(1 << PRTIM2))
#endif
#if (defined(__ICCAVR__) && (defined(__ATmega1284P__))) || \
(defined(__CROSSWORKS_AVR) && (__TARGET_PROCESSOR == ATmega1284P))
#define power_adc_enable() (PRR0 &= (uint8_t)~(1 << PRADC))
#define power_spi_enable() (PRR0 &= (uint8_t)~(1 << PRSPI))
#define power_usart0_enable() (PRR0 &= (uint8_t)~(1 << PRUSART0))
#define power_usart1_enable() (PRR0 &= (uint8_t)~(1 << PRUSART1))
#define power_timer0_enable() (PRR0 &= (uint8_t)~(1 << PRTIM0))
#define power_timer1_enable() (PRR0 &= (uint8_t)~(1 << PRTIM1))
#define power_timer2_enable() (PRR0 &= (uint8_t)~(1 << PRTIM2))
#endif
#if defined(__CROSSWORKS_AVR) #if defined(__CROSSWORKS_AVR)
#define inline #define inline
#endif #endif