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

Fixed compile of STM32F10x project with IAR-EWARM 7.40.

Browse Source
This commit is contained in:
skarg
2016-01-07 21:36:32 +00:00
parent 0697065030
commit be74823235
2 changed files with 136 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/stm32f10x/CMSIS/core_cm3.h
+2 -1
View File
@@ -1542,6 +1542,7 @@ static __INLINE void NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority)
* *
* Note: The priority cannot be set for every core interrupt. * Note: The priority cannot be set for every core interrupt.
*/ */
#ifndef __CSTAT__
static __INLINE uint32_t NVIC_GetPriority(IRQn_Type IRQn) static __INLINE uint32_t NVIC_GetPriority(IRQn_Type IRQn)
{ {
@@ -1550,7 +1551,7 @@ static __INLINE uint32_t NVIC_GetPriority(IRQn_Type IRQn)
else { else {
return((uint32_t)(NVIC->IP[(uint32_t)(IRQn)] >> (8 - __NVIC_PRIO_BITS))); } /* get priority for device specific interrupts */ return((uint32_t)(NVIC->IP[(uint32_t)(IRQn)] >> (8 - __NVIC_PRIO_BITS))); } /* get priority for device specific interrupts */
} }
#endif
/** /**
* @brief Encode the priority for an interrupt * @brief Encode the priority for an interrupt
bacnet-stack/ports/stm32f10x/bacnet.ewp
+134 -48
View File
@@ -12,7 +12,7 @@
<name>General</name> <name>General</name>
<archiveVersion>3</archiveVersion> <archiveVersion>3</archiveVersion>
<data> <data>
<version>21</version> <version>24</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@@ -27,11 +27,6 @@
<name>ListPath</name> <name>ListPath</name>
<state>Debug\List</state> <state>Debug\List</state>
</option> </option>
<option>
<name>Variant</name>
<version>19</version>
<state>37</state>
</option>
<option> <option>
<name>GEndianMode</name> <name>GEndianMode</name>
<state>0</state> <state>0</state>
@@ -58,11 +53,6 @@
<name>GOutputBinary</name> <name>GOutputBinary</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>FPU</name>
<version>2</version>
<state>0</state>
</option>
<option> <option>
<name>OGCoreOrChip</name> <name>OGCoreOrChip</name>
<state>1</state> <state>1</state>
@@ -87,7 +77,7 @@
</option> </option>
<option> <option>
<name>OGLastSavedByProductVersion</name> <name>OGLastSavedByProductVersion</name>
<state>6.30.7.53437</state> <state>7.40.7.9864</state>
</option> </option>
<option> <option>
<name>GeneralEnableMisra</name> <name>GeneralEnableMisra</name>
@@ -135,15 +125,10 @@
<name>RTConfigPath2</name> <name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state> <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option> </option>
<option>
<name>GFPUCoreSlave</name>
<version>19</version>
<state>37</state>
</option>
<option> <option>
<name>GBECoreSlave</name> <name>GBECoreSlave</name>
<version>19</version> <version>22</version>
<state>37</state> <state>38</state>
</option> </option>
<option> <option>
<name>OGUseCmsis</name> <name>OGUseCmsis</name>
@@ -153,15 +138,51 @@
<name>OGUseCmsisDspLib</name> <name>OGUseCmsisDspLib</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>GRuntimeLibThreads</name>
<state>0</state>
</option>
<option>
<name>CoreVariant</name>
<version>22</version>
<state>38</state>
</option>
<option>
<name>GFPUDeviceSlave</name>
<state>STM32F103xG ST STM32F103xG</state>
</option>
<option>
<name>FPU2</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>NrRegs</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>NEON</name>
<state>0</state>
</option>
<option>
<name>GFPUCoreSlave2</name>
<version>22</version>
<state>38</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
<name>ICCARM</name> <name>ICCARM</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>28</version> <version>31</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option>
<name>CCOptimizationNoSizeConstraints</name>
<state>0</state>
</option>
<option> <option>
<name>CCDefines</name> <name>CCDefines</name>
<state>STM32F10X_XL</state> <state>STM32F10X_XL</state>
@@ -237,7 +258,7 @@
<option> <option>
<name>CCAllowList</name> <name>CCAllowList</name>
<version>1</version> <version>1</version>
<state>0000000</state> <state>00000000</state>
</option> </option>
<option> <option>
<name>CCDebugInfo</name> <name>CCDebugInfo</name>
@@ -402,13 +423,26 @@
<name>IccFloatSemantics</name> <name>IccFloatSemantics</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>CCNoLiteralPool</name>
<state>0</state>
</option>
<option>
<name>CCOptStrategySlave</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>CCGuardCalls</name>
<state>1</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
<name>AARM</name> <name>AARM</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>8</version> <version>9</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@@ -564,6 +598,10 @@
<name>AExtraOptionsV2</name> <name>AExtraOptionsV2</name>
<state></state> <state></state>
</option> </option>
<option>
<name>AsmNoLiteralPool</name>
<state>0</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@@ -575,7 +613,7 @@
<debug>1</debug> <debug>1</debug>
<option> <option>
<name>OOCOutputFormat</name> <name>OOCOutputFormat</name>
<version>2</version> <version>3</version>
<state>0</state> <state>0</state>
</option> </option>
<option> <option>
@@ -602,6 +640,7 @@
<data> <data>
<extensions></extensions> <extensions></extensions>
<cmdline></cmdline> <cmdline></cmdline>
<hasPrio>0</hasPrio>
</data> </data>
</settings> </settings>
<settings> <settings>
@@ -621,7 +660,7 @@
<name>ILINK</name> <name>ILINK</name>
<archiveVersion>0</archiveVersion> <archiveVersion>0</archiveVersion>
<data> <data>
<version>15</version> <version>16</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@@ -901,6 +940,10 @@
<version>0</version> <version>0</version>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>IlinkThreadsSlave</name>
<state>1</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@@ -940,7 +983,7 @@
<name>General</name> <name>General</name>
<archiveVersion>3</archiveVersion> <archiveVersion>3</archiveVersion>
<data> <data>
<version>21</version> <version>24</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>0</debug> <debug>0</debug>
<option> <option>
@@ -955,11 +998,6 @@
<name>ListPath</name> <name>ListPath</name>
<state>Release\List</state> <state>Release\List</state>
</option> </option>
<option>
<name>Variant</name>
<version>19</version>
<state>37</state>
</option>
<option> <option>
<name>GEndianMode</name> <name>GEndianMode</name>
<state>0</state> <state>0</state>
@@ -986,11 +1024,6 @@
<name>GOutputBinary</name> <name>GOutputBinary</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>FPU</name>
<version>2</version>
<state>0</state>
</option>
<option> <option>
<name>OGCoreOrChip</name> <name>OGCoreOrChip</name>
<state>1</state> <state>1</state>
@@ -1015,7 +1048,7 @@
</option> </option>
<option> <option>
<name>OGLastSavedByProductVersion</name> <name>OGLastSavedByProductVersion</name>
<state>6.30.7.53437</state> <state>7.40.7.9864</state>
</option> </option>
<option> <option>
<name>GeneralEnableMisra</name> <name>GeneralEnableMisra</name>
@@ -1063,15 +1096,10 @@
<name>RTConfigPath2</name> <name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state> <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option> </option>
<option>
<name>GFPUCoreSlave</name>
<version>19</version>
<state>37</state>
</option>
<option> <option>
<name>GBECoreSlave</name> <name>GBECoreSlave</name>
<version>19</version> <version>22</version>
<state>37</state> <state>38</state>
</option> </option>
<option> <option>
<name>OGUseCmsis</name> <name>OGUseCmsis</name>
@@ -1081,15 +1109,51 @@
<name>OGUseCmsisDspLib</name> <name>OGUseCmsisDspLib</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>GRuntimeLibThreads</name>
<state>0</state>
</option>
<option>
<name>CoreVariant</name>
<version>22</version>
<state>38</state>
</option>
<option>
<name>GFPUDeviceSlave</name>
<state>STM32F103xG ST STM32F103xG</state>
</option>
<option>
<name>FPU2</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>NrRegs</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>NEON</name>
<state>0</state>
</option>
<option>
<name>GFPUCoreSlave2</name>
<version>22</version>
<state>38</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
<name>ICCARM</name> <name>ICCARM</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>28</version> <version>31</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>0</debug> <debug>0</debug>
<option>
<name>CCOptimizationNoSizeConstraints</name>
<state>0</state>
</option>
<option> <option>
<name>CCDefines</name> <name>CCDefines</name>
<state>NDEBUG</state> <state>NDEBUG</state>
@@ -1166,7 +1230,7 @@
<option> <option>
<name>CCAllowList</name> <name>CCAllowList</name>
<version>1</version> <version>1</version>
<state>1111111</state> <state>11111110</state>
</option> </option>
<option> <option>
<name>CCDebugInfo</name> <name>CCDebugInfo</name>
@@ -1331,13 +1395,26 @@
<name>IccFloatSemantics</name> <name>IccFloatSemantics</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>CCNoLiteralPool</name>
<state>0</state>
</option>
<option>
<name>CCOptStrategySlave</name>
<version>0</version>
<state>0</state>
</option>
<option>
<name>CCGuardCalls</name>
<state>1</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
<name>AARM</name> <name>AARM</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>8</version> <version>9</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>0</debug> <debug>0</debug>
<option> <option>
@@ -1493,6 +1570,10 @@
<name>AExtraOptionsV2</name> <name>AExtraOptionsV2</name>
<state></state> <state></state>
</option> </option>
<option>
<name>AsmNoLiteralPool</name>
<state>0</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@@ -1504,7 +1585,7 @@
<debug>0</debug> <debug>0</debug>
<option> <option>
<name>OOCOutputFormat</name> <name>OOCOutputFormat</name>
<version>2</version> <version>3</version>
<state>0</state> <state>0</state>
</option> </option>
<option> <option>
@@ -1531,6 +1612,7 @@
<data> <data>
<extensions></extensions> <extensions></extensions>
<cmdline></cmdline> <cmdline></cmdline>
<hasPrio>0</hasPrio>
</data> </data>
</settings> </settings>
<settings> <settings>
@@ -1550,7 +1632,7 @@
<name>ILINK</name> <name>ILINK</name>
<archiveVersion>0</archiveVersion> <archiveVersion>0</archiveVersion>
<data> <data>
<version>15</version> <version>16</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>0</debug> <debug>0</debug>
<option> <option>
@@ -1830,6 +1912,10 @@
<version>0</version> <version>0</version>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>IlinkThreadsSlave</name>
<state>1</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>