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

Updated builds for ports/atmega168 (IAR) and for ports/bdk-atxx4-mstp (AVR Studio)

Browse Source
This commit is contained in:
skarg
2010-10-07 15:56:35 +00:00
parent b54218939e
commit 8d2560225d
4 changed files with 107 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/atmega168/bacnet.ewp
+103 -60
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<project> <project>
<fileVersion>1</fileVersion> <fileVersion>2</fileVersion>
<configuration> <configuration>
<name>Debug</name> <name>Debug</name>
<toolchain> <toolchain>
@@ -10,9 +10,9 @@
<debug>1</debug> <debug>1</debug>
<settings> <settings>
<name>General</name> <name>General</name>
<archiveVersion>5</archiveVersion> <archiveVersion>9</archiveVersion>
<data> <data>
<version>7</version> <version>8</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@@ -127,8 +127,8 @@
</option> </option>
<option> <option>
<name>New Variant Processor</name> <name>New Variant Processor</name>
<version>24</version> <version>30</version>
<state>45</state> <state>57</state>
</option> </option>
<option> <option>
<name>GRuntimeLibSelect</name> <name>GRuntimeLibSelect</name>
@@ -174,11 +174,6 @@
<version>0</version> <version>0</version>
<state>1</state> <state>1</state>
</option> </option>
<option>
<name>GeneralMisraRules</name>
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
<option> <option>
<name>GeneralEnableMisra</name> <name>GeneralEnableMisra</name>
<state>0</state> <state>0</state>
@@ -211,13 +206,27 @@
<name>GGNoMULInstruction</name> <name>GGNoMULInstruction</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>GeneralMisraVer</name>
<state>0</state>
</option>
<option>
<name>GeneralMisraRules04</name>
<version>0</version>
<state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
</option>
<option>
<name>GeneralMisraRules98</name>
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
<name>ICCAVR</name> <name>ICCAVR</name>
<archiveVersion>4</archiveVersion> <archiveVersion>5</archiveVersion>
<data> <data>
<version>13</version> <version>14</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@@ -448,11 +457,6 @@
<name>CCLangSelect</name> <name>CCLangSelect</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>CompilerMisraRules</name>
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
<option> <option>
<name>CompilerMisraOverride</name> <name>CompilerMisraOverride</name>
<state>0</state> <state>0</state>
@@ -481,6 +485,16 @@
<name>OCCAdditionalCommandLineOptionsSlave</name> <name>OCCAdditionalCommandLineOptionsSlave</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>CompilerMisraRules04</name>
<version>0</version>
<state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
</option>
<option>
<name>CompilerMisraRules98</name>
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@@ -986,19 +1000,19 @@
<debug>0</debug> <debug>0</debug>
<settings> <settings>
<name>General</name> <name>General</name>
<archiveVersion>5</archiveVersion> <archiveVersion>9</archiveVersion>
<data> <data>
<version>7</version> <version>8</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>0</debug> <debug>0</debug>
<option> <option>
<name>GGEnhancedCore</name> <name>GGEnhancedCore</name>
<state>0</state> <state>1</state>
</option> </option>
<option> <option>
<name>Variant Memory</name> <name>Variant Memory</name>
<version>0</version> <version>0</version>
<state>0</state> <state>1</state>
</option> </option>
<option> <option>
<name>ExePath</name> <name>ExePath</name>
@@ -1031,7 +1045,7 @@
</option> </option>
<option> <option>
<name>LCEnableBitDefs</name> <name>LCEnableBitDefs</name>
<state>0</state> <state>1</state>
</option> </option>
<option> <option>
<name>LCHeapSize</name> <name>LCHeapSize</name>
@@ -1039,7 +1053,7 @@
</option> </option>
<option> <option>
<name>SCCStackSize</name> <name>SCCStackSize</name>
<state>0x20</state> <state>0x200</state>
</option> </option>
<option> <option>
<name>SCExtCStack</name> <name>SCExtCStack</name>
@@ -1047,7 +1061,7 @@
</option> </option>
<option> <option>
<name>SCRStackSize</name> <name>SCRStackSize</name>
<state>16</state> <state>32</state>
</option> </option>
<option> <option>
<name>SCExtRStack</name> <name>SCExtRStack</name>
@@ -1095,42 +1109,46 @@
</option> </option>
<option> <option>
<name>GGEepromUtil</name> <name>GGEepromUtil</name>
<state>0</state> <state>1</state>
</option> </option>
<option> <option>
<name>GGEepromUtilSize</name> <name>GGEepromUtilSize</name>
<state>0</state> <state>512</state>
</option> </option>
<option> <option>
<name>New Variant Processor</name> <name>New Variant Processor</name>
<version>24</version> <version>30</version>
<state>0</state> <state>57</state>
</option> </option>
<option> <option>
<name>GRuntimeLibSelect</name> <name>GRuntimeLibSelect</name>
<version>0</version> <version>0</version>
<state>4</state> <state>1</state>
</option> </option>
<option> <option>
<name>RTDescription</name> <name>RTDescription</name>
<state>Use the legacy C runtime library.</state> <state>Use the normal configuration of the C/EC++</state>
<state>runtime library. No locale interface,</state>
<state>C locale, no file descriptor support,</state>
<state>no multibytes in printf and scanf, and</state>
<state>no hex floats in strtod.</state>
</option> </option>
<option> <option>
<name>RTConfigPath</name> <name>RTConfigPath</name>
<state></state> <state>$TOOLKIT_DIR$\LIB\DLIB\dlAVR-3s-ec_mul-sf-n.h</state>
</option> </option>
<option> <option>
<name>RTLibraryPath</name> <name>RTLibraryPath</name>
<state>$TOOLKIT_DIR$\LIB\CLIB\cl0t.r90</state> <state>$TOOLKIT_DIR$\LIB\DLIB\dlAVR-3s-ec_mul-sf-n.r90</state>
</option> </option>
<option> <option>
<name>Input variant</name> <name>Input variant</name>
<version>0</version> <version>0</version>
<state>2</state> <state>0</state>
</option> </option>
<option> <option>
<name>Input description</name> <name>Input description</name>
<state>No float.</state> <state>Full formatting.</state>
</option> </option>
<option> <option>
<name>Output variant</name> <name>Output variant</name>
@@ -1139,17 +1157,12 @@
</option> </option>
<option> <option>
<name>Output description</name> <name>Output description</name>
<state>No float, no field width, no precision.</state> <state> specifier a or A, no specifier n, no float or long long.</state>
</option> </option>
<option> <option>
<name>GRuntimeLibSelectSlave</name> <name>GRuntimeLibSelectSlave</name>
<version>0</version> <version>0</version>
<state>4</state> <state>1</state>
</option>
<option>
<name>GeneralMisraRules</name>
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option> </option>
<option> <option>
<name>GeneralEnableMisra</name> <name>GeneralEnableMisra</name>
@@ -1183,13 +1196,27 @@
<name>GGNoMULInstruction</name> <name>GGNoMULInstruction</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>GeneralMisraVer</name>
<state>0</state>
</option>
<option>
<name>GeneralMisraRules04</name>
<version>0</version>
<state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
</option>
<option>
<name>GeneralMisraRules98</name>
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
<name>ICCAVR</name> <name>ICCAVR</name>
<archiveVersion>4</archiveVersion> <archiveVersion>5</archiveVersion>
<data> <data>
<version>13</version> <version>14</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>0</debug> <debug>0</debug>
<option> <option>
@@ -1211,6 +1238,16 @@
<option> <option>
<name>CCDefines</name> <name>CCDefines</name>
<state>NDEBUG</state> <state>NDEBUG</state>
<state>BACDL_MSTP</state>
<state>MAX_APDU=50</state>
<state>BIG_ENDIAN=0</state>
<state>MAX_TSM_TRANSACTIONS=0</state>
<state>BACAPP_REAL</state>
<state>BACAPP_UNSIGNED</state>
<state>BACAPP_ENUMERATED</state>
<state>BACAPP_CHARACTER_STRING</state>
<state>BACAPP_OBJECT_ID</state>
<state>WRITE_PROPERTY</state>
</option> </option>
<option> <option>
<name>CCPreprocFile</name> <name>CCPreprocFile</name>
@@ -1250,7 +1287,7 @@
</option> </option>
<option> <option>
<name>CCDiagSuppress</name> <name>CCDiagSuppress</name>
<state></state> <state>Pe550</state>
</option> </option>
<option> <option>
<name>CCDiagRemark</name> <name>CCDiagRemark</name>
@@ -1374,7 +1411,8 @@
</option> </option>
<option> <option>
<name>newCCIncludePaths</name> <name>newCCIncludePaths</name>
<state></state> <state>$PROJ_DIR$</state>
<state>$PROJ_DIR$\..\..\include</state>
</option> </option>
<option> <option>
<name>CCStdIncCheck</name> <name>CCStdIncCheck</name>
@@ -1383,7 +1421,7 @@
<option> <option>
<name>CCStdIncludePaths</name> <name>CCStdIncludePaths</name>
<state>$TOOLKIT_DIR$\INC\</state> <state>$TOOLKIT_DIR$\INC\</state>
<state>$TOOLKIT_DIR$\INC\CLIB\</state> <state>$TOOLKIT_DIR$\INC\DLIB\</state>
</option> </option>
<option> <option>
<name>CCEepromSize</name> <name>CCEepromSize</name>
@@ -1410,11 +1448,6 @@
<name>CCLangSelect</name> <name>CCLangSelect</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>CompilerMisraRules</name>
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
<option> <option>
<name>CompilerMisraOverride</name> <name>CompilerMisraOverride</name>
<state>0</state> <state>0</state>
@@ -1443,6 +1476,16 @@
<name>OCCAdditionalCommandLineOptionsSlave</name> <name>OCCAdditionalCommandLineOptionsSlave</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>CompilerMisraRules04</name>
<version>0</version>
<state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
</option>
<option>
<name>CompilerMisraRules98</name>
<version>0</version>
<state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@@ -1727,7 +1770,7 @@
</option> </option>
<option> <option>
<name>XclFile</name> <name>XclFile</name>
<state>$TOOLKIT_DIR$\src\template\lnk0t.xcl</state> <state>$TOOLKIT_DIR$\src\template\cfgm168.xcl</state>
</option> </option>
<option> <option>
<name>XclFileSlave</name> <name>XclFileSlave</name>
@@ -1845,7 +1888,7 @@
</option> </option>
<option> <option>
<name>ExtraOutputFile</name> <name>ExtraOutputFile</name>
<state>templproj.a90</state> <state>bacnet.a90</state>
</option> </option>
<option> <option>
<name>ExtraOutputFormat</name> <name>ExtraOutputFormat</name>
@@ -1984,6 +2027,9 @@
<file> <file>
<name>$PROJ_DIR$\dlmstp.c</name> <name>$PROJ_DIR$\dlmstp.c</name>
</file> </file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\h_npdu.c</name>
</file>
<file> <file>
<name>$PROJ_DIR$\h_rp.c</name> <name>$PROJ_DIR$\h_rp.c</name>
</file> </file>
@@ -2008,12 +2054,6 @@
<file> <file>
<name>$PROJ_DIR$\..\..\demo\handler\noserv.c</name> <name>$PROJ_DIR$\..\..\demo\handler\noserv.c</name>
</file> </file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\s_iam.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\h_npdu.c</name>
</file>
<file> <file>
<name>$PROJ_DIR$\..\..\src\npdu.c</name> <name>$PROJ_DIR$\..\..\src\npdu.c</name>
</file> </file>
@@ -2030,11 +2070,14 @@
<name>$PROJ_DIR$\rs485.h</name> <name>$PROJ_DIR$\rs485.h</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\timer.c</name> <name>$PROJ_DIR$\..\..\demo\handler\s_iam.c</name>
</file> </file>
<file> <file>
<name>$PROJ_DIR$\stack.c</name> <name>$PROJ_DIR$\stack.c</name>
</file> </file>
<file>
<name>$PROJ_DIR$\timer.c</name>
</file>
<file> <file>
<name>$PROJ_DIR$\timer.h</name> <name>$PROJ_DIR$\timer.h</name>
</file> </file>
bacnet-stack/ports/atmega168/iar2gcc.h
+2
View File
@@ -43,7 +43,9 @@
#include <inavr.h> #include <inavr.h>
#include <ioavr.h> #include <ioavr.h>
/* BitValue is used alot in GCC examples */ /* BitValue is used alot in GCC examples */
#ifndef _BV
#define _BV(bit_num) (1 << (bit_num)) #define _BV(bit_num) (1 << (bit_num))
#endif
/* inline function */ /* inline function */
static inline void _delay_us( static inline void _delay_us(
bacnet-stack/ports/atmega168/stack.c
+1
View File
@@ -22,6 +22,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
*********************************************************************/ *********************************************************************/
#include <stdint.h>
#include "hardware.h" #include "hardware.h"
/* stack checking */ /* stack checking */
bacnet-stack/ports/bdk-atxx4-mstp/bacnet.aps
+1 -1
View File
File diff suppressed because one or more lines are too long