diff options
| -rw-r--r-- | demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.ewp | 233 | ||||
| -rw-r--r-- | demos/ARMCM3-STM32F103/iar/ch.ewp | 249 | ||||
| -rw-r--r-- | demos/ARMCM3-STM32F103ZG-FATFS/iar/ch.ewp | 258 | ||||
| -rw-r--r-- | demos/ARMCM3-STM32F107/iar/ch.ewp | 232 | ||||
| -rw-r--r-- | demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp | 47 | ||||
| -rw-r--r-- | readme.txt | 2 |
6 files changed, 709 insertions, 312 deletions
diff --git a/demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.ewp b/demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.ewp index 287b56a00..a277d1719 100644 --- a/demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.ewp +++ b/demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.ewp @@ -12,7 +12,7 @@ <name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>18</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -29,7 +29,7 @@ </option>
<option>
<name>Variant</name>
- <version>17</version>
+ <version>19</version>
<state>37</state>
</option>
<option>
@@ -38,8 +38,8 @@ </option>
<option>
<name>Input variant</name>
- <version>1</version>
- <state>3</state>
+ <version>3</version>
+ <state>6</state>
</option>
<option>
<name>Input description</name>
@@ -47,8 +47,8 @@ </option>
<option>
<name>Output variant</name>
- <version>0</version>
- <state>3</state>
+ <version>2</version>
+ <state>7</state>
</option>
<option>
<name>Output description</name>
@@ -60,7 +60,7 @@ </option>
<option>
<name>FPU</name>
- <version>1</version>
+ <version>2</version>
<state>0</state>
</option>
<option>
@@ -87,7 +87,7 @@ </option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>6.10.1.52170</state>
+ <state>6.20.2.52635</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -135,13 +135,31 @@ <name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
+ <option>
+ <name>GFPUCoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>GBECoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>OGUseCmsis</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>OGUseCmsisDspLib</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>26</version>
+ <version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -277,10 +295,15 @@ <name>CCIncludePath2</name>
<state>$PROJ_DIR$\..\</state>
<state>$PROJ_DIR$\..\..\..\os\kernel\include</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\common\ARMCMx\CMSIS\include</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\hal\include</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USBv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM32VL_DISCOVERY</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
@@ -364,11 +387,15 @@ <state>1</state>
</option>
<option>
- <name>IccRelaxedFpPrecision</name>
+ <name>IccCppInlineSemantics</name>
<state>0</state>
</option>
<option>
- <name>IccCppInlineSemantics</name>
+ <name>IccCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IccFloatSemantics</name>
<state>0</state>
</option>
</data>
@@ -523,7 +550,8 @@ </option>
<option>
<name>AUserIncludes</name>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM32VL_DISCOVERY</state>
</option>
<option>
@@ -591,7 +619,7 @@ <name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>11</version>
+ <version>13</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -837,6 +865,22 @@ <name>IlinkOptExceptionsForce</name>
<state>0</state>
</option>
+ <option>
+ <name>IlinkCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptMergeDuplSections</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>IlinkOptUseVfe</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptForceVfe</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -876,7 +920,7 @@ <name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>18</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -893,7 +937,7 @@ </option>
<option>
<name>Variant</name>
- <version>17</version>
+ <version>19</version>
<state>37</state>
</option>
<option>
@@ -902,8 +946,8 @@ </option>
<option>
<name>Input variant</name>
- <version>1</version>
- <state>3</state>
+ <version>3</version>
+ <state>6</state>
</option>
<option>
<name>Input description</name>
@@ -911,8 +955,8 @@ </option>
<option>
<name>Output variant</name>
- <version>0</version>
- <state>3</state>
+ <version>2</version>
+ <state>7</state>
</option>
<option>
<name>Output description</name>
@@ -924,7 +968,7 @@ </option>
<option>
<name>FPU</name>
- <version>1</version>
+ <version>2</version>
<state>0</state>
</option>
<option>
@@ -951,7 +995,7 @@ </option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>6.10.1.52170</state>
+ <state>6.20.2.52635</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -999,13 +1043,31 @@ <name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
+ <option>
+ <name>GFPUCoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>GBECoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>OGUseCmsis</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>OGUseCmsisDspLib</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>26</version>
+ <version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -1141,10 +1203,15 @@ <name>CCIncludePath2</name>
<state>$PROJ_DIR$\..\</state>
<state>$PROJ_DIR$\..\..\..\os\kernel\include</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\common\ARMCMx\CMSIS\include</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\hal\include</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USBv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM32VL_DISCOVERY</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
@@ -1228,11 +1295,15 @@ <state>1</state>
</option>
<option>
- <name>IccRelaxedFpPrecision</name>
+ <name>IccCppInlineSemantics</name>
<state>0</state>
</option>
<option>
- <name>IccCppInlineSemantics</name>
+ <name>IccCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IccFloatSemantics</name>
<state>0</state>
</option>
</data>
@@ -1387,7 +1458,8 @@ </option>
<option>
<name>AUserIncludes</name>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM32VL_DISCOVERY</state>
</option>
<option>
@@ -1455,7 +1527,7 @@ <name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>11</version>
+ <version>13</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -1701,6 +1773,22 @@ <name>IlinkOptExceptionsForce</name>
<state>0</state>
</option>
+ <option>
+ <name>IlinkCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptMergeDuplSections</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>IlinkOptUseVfe</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptForceVfe</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -1752,12 +1840,21 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\can.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\ext.h</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\gpt.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\hal.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\i2c.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\icu.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\mac.h</name>
</file>
<file>
@@ -1773,14 +1870,29 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\pwm.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\rtc.h</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\sdc.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\serial.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\serial_usb.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\spi.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\uart.h</name>
</file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\usb.h</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\usb_cdc.h</name>
+ </file>
</group>
<group>
<name>src</name>
@@ -1791,12 +1903,21 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\can.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\ext.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\gpt.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\hal.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\i2c.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\icu.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\mac.c</name>
</file>
<file>
@@ -1809,14 +1930,26 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\pwm.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\rtc.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\sdc.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\serial.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\serial_usb.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\spi.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\uart.c</name>
</file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\usb.c</name>
+ </file>
</group>
</group>
<group>
@@ -1951,40 +2084,31 @@ <group>
<name>platform</name>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\adc_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\adc_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\adc_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\can_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\adc_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\can_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\core_cm3.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f100.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f103.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f100.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f105_f107.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f103.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f105_f107.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pal_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pal_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.c</name>
@@ -2005,30 +2129,27 @@ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\spi_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32_dma.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32_dma.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1\stm32_dma.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32f10x.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1\stm32_dma.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\uart_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\stm32_rcc.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\uart_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\stm32f10x.h</name>
</file>
</group>
<group>
<name>port</name>
<group>
- <name>STM32</name>
+ <name>STM32F1xx</name>
<file>
- <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32\cmparams.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx\cmparams.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32\vectors.s</name>
+ <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx\vectors.s</name>
</file>
</group>
<file>
diff --git a/demos/ARMCM3-STM32F103/iar/ch.ewp b/demos/ARMCM3-STM32F103/iar/ch.ewp index 085175d5f..6add8178f 100644 --- a/demos/ARMCM3-STM32F103/iar/ch.ewp +++ b/demos/ARMCM3-STM32F103/iar/ch.ewp @@ -12,7 +12,7 @@ <name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>18</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -29,7 +29,7 @@ </option>
<option>
<name>Variant</name>
- <version>17</version>
+ <version>19</version>
<state>37</state>
</option>
<option>
@@ -38,8 +38,8 @@ </option>
<option>
<name>Input variant</name>
- <version>1</version>
- <state>3</state>
+ <version>3</version>
+ <state>6</state>
</option>
<option>
<name>Input description</name>
@@ -47,8 +47,8 @@ </option>
<option>
<name>Output variant</name>
- <version>0</version>
- <state>3</state>
+ <version>2</version>
+ <state>7</state>
</option>
<option>
<name>Output description</name>
@@ -60,7 +60,7 @@ </option>
<option>
<name>FPU</name>
- <version>1</version>
+ <version>2</version>
<state>0</state>
</option>
<option>
@@ -87,7 +87,7 @@ </option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>6.10.1.52170</state>
+ <state>6.20.2.52635</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -135,13 +135,31 @@ <name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
+ <option>
+ <name>GFPUCoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>GBECoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>OGUseCmsis</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>OGUseCmsisDspLib</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>26</version>
+ <version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -277,10 +295,15 @@ <name>CCIncludePath2</name>
<state>$PROJ_DIR$\..\</state>
<state>$PROJ_DIR$\..\..\..\os\kernel\include</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\common\ARMCMx\CMSIS\include</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\hal\include</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USBv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\OLIMEX_STM32_P103</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
@@ -364,11 +387,15 @@ <state>1</state>
</option>
<option>
- <name>IccRelaxedFpPrecision</name>
+ <name>IccCppInlineSemantics</name>
<state>0</state>
</option>
<option>
- <name>IccCppInlineSemantics</name>
+ <name>IccCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IccFloatSemantics</name>
<state>0</state>
</option>
</data>
@@ -523,8 +550,8 @@ </option>
<option>
<name>AUserIncludes</name>
- <state>$PROJ_DIR$\..\</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\OLIMEX_STM32_P103</state>
</option>
<option>
@@ -592,7 +619,7 @@ <name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>11</version>
+ <version>13</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -838,6 +865,22 @@ <name>IlinkOptExceptionsForce</name>
<state>0</state>
</option>
+ <option>
+ <name>IlinkCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptMergeDuplSections</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>IlinkOptUseVfe</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptForceVfe</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -877,7 +920,7 @@ <name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>18</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -894,7 +937,7 @@ </option>
<option>
<name>Variant</name>
- <version>17</version>
+ <version>19</version>
<state>37</state>
</option>
<option>
@@ -903,8 +946,8 @@ </option>
<option>
<name>Input variant</name>
- <version>1</version>
- <state>3</state>
+ <version>3</version>
+ <state>6</state>
</option>
<option>
<name>Input description</name>
@@ -912,8 +955,8 @@ </option>
<option>
<name>Output variant</name>
- <version>0</version>
- <state>3</state>
+ <version>2</version>
+ <state>7</state>
</option>
<option>
<name>Output description</name>
@@ -925,7 +968,7 @@ </option>
<option>
<name>FPU</name>
- <version>1</version>
+ <version>2</version>
<state>0</state>
</option>
<option>
@@ -952,7 +995,7 @@ </option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>6.10.1.52170</state>
+ <state>6.20.2.52635</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -1000,13 +1043,31 @@ <name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
+ <option>
+ <name>GFPUCoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>GBECoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>OGUseCmsis</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>OGUseCmsisDspLib</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>26</version>
+ <version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -1142,10 +1203,15 @@ <name>CCIncludePath2</name>
<state>$PROJ_DIR$\..\</state>
<state>$PROJ_DIR$\..\..\..\os\kernel\include</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\common\ARMCMx\CMSIS\include</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\hal\include</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USBv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\OLIMEX_STM32_P103</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
@@ -1229,11 +1295,15 @@ <state>1</state>
</option>
<option>
- <name>IccRelaxedFpPrecision</name>
+ <name>IccCppInlineSemantics</name>
<state>0</state>
</option>
<option>
- <name>IccCppInlineSemantics</name>
+ <name>IccCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IccFloatSemantics</name>
<state>0</state>
</option>
</data>
@@ -1388,8 +1458,8 @@ </option>
<option>
<name>AUserIncludes</name>
- <state>$PROJ_DIR$\..\</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\OLIMEX_STM32_P103</state>
</option>
<option>
@@ -1457,7 +1527,7 @@ <name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>11</version>
+ <version>13</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -1703,6 +1773,22 @@ <name>IlinkOptExceptionsForce</name>
<state>0</state>
</option>
+ <option>
+ <name>IlinkCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptMergeDuplSections</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>IlinkOptUseVfe</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptForceVfe</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -1754,12 +1840,21 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\can.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\ext.h</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\gpt.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\hal.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\i2c.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\icu.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\mac.h</name>
</file>
<file>
@@ -1775,14 +1870,29 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\pwm.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\rtc.h</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\sdc.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\serial.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\serial_usb.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\spi.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\uart.h</name>
</file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\usb.h</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\usb_cdc.h</name>
+ </file>
</group>
<group>
<name>src</name>
@@ -1793,12 +1903,21 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\can.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\ext.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\gpt.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\hal.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\i2c.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\icu.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\mac.c</name>
</file>
<file>
@@ -1811,14 +1930,26 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\pwm.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\rtc.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\sdc.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\serial.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\serial_usb.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\spi.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\uart.c</name>
</file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\usb.c</name>
+ </file>
</group>
</group>
<group>
@@ -1953,46 +2084,25 @@ <group>
<name>platform</name>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\adc_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\adc_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\can_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\can_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\core_cm3.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f100.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f103.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f105_f107.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f100.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f103.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f105_f107.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pal_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pal_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\serial_lld.c</name>
@@ -2001,36 +2111,27 @@ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\serial_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\spi_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\spi_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32_dma.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32_dma.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1\stm32_dma.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32f10x.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1\stm32_dma.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\uart_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\stm32_rcc.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\uart_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\stm32f10x.h</name>
</file>
</group>
<group>
<name>port</name>
<group>
- <name>STM32</name>
+ <name>STM32F1xx</name>
<file>
- <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32\cmparams.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx\cmparams.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32\vectors.s</name>
+ <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx\vectors.s</name>
</file>
</group>
<file>
diff --git a/demos/ARMCM3-STM32F103ZG-FATFS/iar/ch.ewp b/demos/ARMCM3-STM32F103ZG-FATFS/iar/ch.ewp index a66a70295..c62ba7e3b 100644 --- a/demos/ARMCM3-STM32F103ZG-FATFS/iar/ch.ewp +++ b/demos/ARMCM3-STM32F103ZG-FATFS/iar/ch.ewp @@ -12,7 +12,7 @@ <name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>18</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -29,7 +29,7 @@ </option>
<option>
<name>Variant</name>
- <version>17</version>
+ <version>19</version>
<state>37</state>
</option>
<option>
@@ -38,8 +38,8 @@ </option>
<option>
<name>Input variant</name>
- <version>1</version>
- <state>3</state>
+ <version>3</version>
+ <state>6</state>
</option>
<option>
<name>Input description</name>
@@ -47,8 +47,8 @@ </option>
<option>
<name>Output variant</name>
- <version>0</version>
- <state>3</state>
+ <version>2</version>
+ <state>7</state>
</option>
<option>
<name>Output description</name>
@@ -60,7 +60,7 @@ </option>
<option>
<name>FPU</name>
- <version>1</version>
+ <version>2</version>
<state>0</state>
</option>
<option>
@@ -87,7 +87,7 @@ </option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>6.10.1.52170</state>
+ <state>6.20.2.52635</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -135,18 +135,36 @@ <name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
+ <option>
+ <name>GFPUCoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>GBECoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>OGUseCmsis</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>OGUseCmsisDspLib</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>26</version>
+ <version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>CCDefines</name>
- <state>SHELL_USE_IPRINTF=FALSE</state>
+ <state></state>
</option>
<option>
<name>CCPreprocFile</name>
@@ -277,13 +295,18 @@ <name>CCIncludePath2</name>
<state>$PROJ_DIR$\..\</state>
<state>$PROJ_DIR$\..\..\..\os\kernel\include</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\common\ARMCMx\CMSIS\include</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\hal\include</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USBv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\various</state>
- <state>$PROJ_DIR$\..\..\..\boards\ST_STM3210E_EVAL</state>
<state>$PROJ_DIR$\..\..\..\ext\fatfs\src</state>
+ <state>$PROJ_DIR$\..\..\..\boards\ST_STM3210E_EVAL</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
<option>
@@ -366,11 +389,15 @@ <state>1</state>
</option>
<option>
- <name>IccRelaxedFpPrecision</name>
+ <name>IccCppInlineSemantics</name>
<state>0</state>
</option>
<option>
- <name>IccCppInlineSemantics</name>
+ <name>IccCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IccFloatSemantics</name>
<state>0</state>
</option>
</data>
@@ -525,8 +552,8 @@ </option>
<option>
<name>AUserIncludes</name>
- <state>$PROJ_DIR$\..\</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM3210E_EVAL</state>
</option>
<option>
@@ -594,7 +621,7 @@ <name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>11</version>
+ <version>13</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -840,6 +867,22 @@ <name>IlinkOptExceptionsForce</name>
<state>0</state>
</option>
+ <option>
+ <name>IlinkCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptMergeDuplSections</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>IlinkOptUseVfe</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptForceVfe</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -879,7 +922,7 @@ <name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>18</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -896,7 +939,7 @@ </option>
<option>
<name>Variant</name>
- <version>17</version>
+ <version>19</version>
<state>37</state>
</option>
<option>
@@ -905,8 +948,8 @@ </option>
<option>
<name>Input variant</name>
- <version>1</version>
- <state>3</state>
+ <version>3</version>
+ <state>6</state>
</option>
<option>
<name>Input description</name>
@@ -914,8 +957,8 @@ </option>
<option>
<name>Output variant</name>
- <version>0</version>
- <state>3</state>
+ <version>2</version>
+ <state>7</state>
</option>
<option>
<name>Output description</name>
@@ -927,7 +970,7 @@ </option>
<option>
<name>FPU</name>
- <version>1</version>
+ <version>2</version>
<state>0</state>
</option>
<option>
@@ -954,7 +997,7 @@ </option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>6.10.1.52170</state>
+ <state>6.20.2.52635</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -1002,19 +1045,36 @@ <name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
+ <option>
+ <name>GFPUCoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>GBECoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>OGUseCmsis</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>OGUseCmsisDspLib</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>26</version>
+ <version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
<name>CCDefines</name>
<state>NDEBUG</state>
- <state>SHELL_USE_IPRINTF=FALSE</state>
</option>
<option>
<name>CCPreprocFile</name>
@@ -1145,13 +1205,18 @@ <name>CCIncludePath2</name>
<state>$PROJ_DIR$\..\</state>
<state>$PROJ_DIR$\..\..\..\os\kernel\include</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\common\ARMCMx\CMSIS\include</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\hal\include</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USBv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\various</state>
- <state>$PROJ_DIR$\..\..\..\boards\ST_STM3210E_EVAL</state>
<state>$PROJ_DIR$\..\..\..\ext\fatfs\src</state>
+ <state>$PROJ_DIR$\..\..\..\boards\ST_STM3210E_EVAL</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
<option>
@@ -1177,7 +1242,7 @@ <option>
<name>CCOptStrategy</name>
<version>0</version>
- <state>1</state>
+ <state>2</state>
</option>
<option>
<name>CCOptLevelSlave</name>
@@ -1234,11 +1299,15 @@ <state>1</state>
</option>
<option>
- <name>IccRelaxedFpPrecision</name>
+ <name>IccCppInlineSemantics</name>
<state>0</state>
</option>
<option>
- <name>IccCppInlineSemantics</name>
+ <name>IccCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IccFloatSemantics</name>
<state>0</state>
</option>
</data>
@@ -1393,8 +1462,8 @@ </option>
<option>
<name>AUserIncludes</name>
- <state>$PROJ_DIR$\..\</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\ST_STM3210E_EVAL</state>
</option>
<option>
@@ -1462,7 +1531,7 @@ <name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>11</version>
+ <version>13</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -1708,6 +1777,22 @@ <name>IlinkOptExceptionsForce</name>
<state>0</state>
</option>
+ <option>
+ <name>IlinkCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptMergeDuplSections</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>IlinkOptUseVfe</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptForceVfe</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -1783,6 +1868,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\can.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\ext.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\gpt.h</name>
</file>
<file>
@@ -1810,6 +1898,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\pwm.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\rtc.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\sdc.h</name>
</file>
<file>
@@ -1840,6 +1931,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\can.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\ext.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\gpt.c</name>
</file>
<file>
@@ -1864,6 +1958,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\pwm.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\rtc.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\sdc.c</name>
</file>
<file>
@@ -1891,9 +1988,6 @@ <name>$PROJ_DIR$\..\..\..\os\kernel\include\ch.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\kernel\include\chbsem.h</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\..\..\os\kernel\include\chcond.h</name>
</file>
<file>
@@ -1906,9 +2000,6 @@ <name>$PROJ_DIR$\..\..\..\os\kernel\include\chevents.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\kernel\include\chfiles.h</name>
- </file>
- <file>
<name>$PROJ_DIR$\..\..\..\os\kernel\include\chheap.h</name>
</file>
<file>
@@ -2021,58 +2112,25 @@ <group>
<name>platform</name>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\adc_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\adc_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\can_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\can_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\core_cm3.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\gpt_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f100.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\gpt_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f103.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f105_f107.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f100.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f103.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f105_f107.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\icu_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\icu_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pal_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pal_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\sdc_lld.c</name>
@@ -2087,45 +2145,27 @@ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\serial_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\spi_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1\stm32_dma.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\spi_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1\stm32_dma.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32_dma.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\stm32_rcc.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32_dma.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32_usb.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32f10x.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\uart_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\uart_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\usb_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\usb_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\stm32f10x.h</name>
</file>
</group>
<group>
<name>port</name>
<group>
- <name>STM32</name>
+ <name>STM32F1xx</name>
<file>
- <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32\cmparams.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx\cmparams.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32\vectors.s</name>
+ <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx\vectors.s</name>
</file>
</group>
<file>
@@ -2159,6 +2199,12 @@ <group>
<name>various</name>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\various\chprintf.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\various\chprintf.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\various\shell.c</name>
</file>
<file>
diff --git a/demos/ARMCM3-STM32F107/iar/ch.ewp b/demos/ARMCM3-STM32F107/iar/ch.ewp index df3095c33..ae69e614f 100644 --- a/demos/ARMCM3-STM32F107/iar/ch.ewp +++ b/demos/ARMCM3-STM32F107/iar/ch.ewp @@ -12,7 +12,7 @@ <name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>18</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -29,7 +29,7 @@ </option>
<option>
<name>Variant</name>
- <version>17</version>
+ <version>19</version>
<state>37</state>
</option>
<option>
@@ -38,8 +38,8 @@ </option>
<option>
<name>Input variant</name>
- <version>1</version>
- <state>3</state>
+ <version>3</version>
+ <state>6</state>
</option>
<option>
<name>Input description</name>
@@ -47,8 +47,8 @@ </option>
<option>
<name>Output variant</name>
- <version>0</version>
- <state>3</state>
+ <version>2</version>
+ <state>7</state>
</option>
<option>
<name>Output description</name>
@@ -60,7 +60,7 @@ </option>
<option>
<name>FPU</name>
- <version>1</version>
+ <version>2</version>
<state>0</state>
</option>
<option>
@@ -87,7 +87,7 @@ </option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>6.10.1.52170</state>
+ <state>6.20.2.52635</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -99,7 +99,7 @@ </option>
<option>
<name>OGChipSelectEditMenu</name>
- <state>STM32F10xxB ST STM32F10xxB</state>
+ <state>STM32F107xC ST STM32F107xC</state>
</option>
<option>
<name>GenLowLevelInterface</name>
@@ -135,13 +135,31 @@ <name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
+ <option>
+ <name>GFPUCoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>GBECoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>OGUseCmsis</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>OGUseCmsisDspLib</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>26</version>
+ <version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -277,10 +295,15 @@ <name>CCIncludePath2</name>
<state>$PROJ_DIR$\..\</state>
<state>$PROJ_DIR$\..\..\..\os\kernel\include</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\common\ARMCMx\CMSIS\include</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\hal\include</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USBv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\OLIMEX_STM32_P107</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
@@ -364,11 +387,15 @@ <state>1</state>
</option>
<option>
- <name>IccRelaxedFpPrecision</name>
+ <name>IccCppInlineSemantics</name>
<state>0</state>
</option>
<option>
- <name>IccCppInlineSemantics</name>
+ <name>IccCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IccFloatSemantics</name>
<state>0</state>
</option>
</data>
@@ -523,7 +550,8 @@ </option>
<option>
<name>AUserIncludes</name>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\OLIMEX_STM32_P107</state>
</option>
<option>
@@ -591,7 +619,7 @@ <name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>11</version>
+ <version>13</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -837,6 +865,22 @@ <name>IlinkOptExceptionsForce</name>
<state>0</state>
</option>
+ <option>
+ <name>IlinkCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptMergeDuplSections</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>IlinkOptUseVfe</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptForceVfe</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -876,7 +920,7 @@ <name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>18</version>
+ <version>21</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -893,7 +937,7 @@ </option>
<option>
<name>Variant</name>
- <version>17</version>
+ <version>19</version>
<state>37</state>
</option>
<option>
@@ -902,8 +946,8 @@ </option>
<option>
<name>Input variant</name>
- <version>1</version>
- <state>3</state>
+ <version>3</version>
+ <state>6</state>
</option>
<option>
<name>Input description</name>
@@ -911,8 +955,8 @@ </option>
<option>
<name>Output variant</name>
- <version>0</version>
- <state>3</state>
+ <version>2</version>
+ <state>7</state>
</option>
<option>
<name>Output description</name>
@@ -924,7 +968,7 @@ </option>
<option>
<name>FPU</name>
- <version>1</version>
+ <version>2</version>
<state>0</state>
</option>
<option>
@@ -951,7 +995,7 @@ </option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>6.10.1.52170</state>
+ <state>6.20.2.52635</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -999,13 +1043,31 @@ <name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
+ <option>
+ <name>GFPUCoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>GBECoreSlave</name>
+ <version>19</version>
+ <state>37</state>
+ </option>
+ <option>
+ <name>OGUseCmsis</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>OGUseCmsisDspLib</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>26</version>
+ <version>28</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -1141,11 +1203,15 @@ <name>CCIncludePath2</name>
<state>$PROJ_DIR$\..\</state>
<state>$PROJ_DIR$\..\..\..\os\kernel\include</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\common\ARMCMx\CMSIS\include</state>
<state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx</state>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\os\hal\include</state>
<state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32</state>
- <state>$PROJ_DIR$\..\..\..\os\various</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USBv1</state>
+ <state>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\OLIMEX_STM32_P107</state>
<state>$PROJ_DIR$\..\..\..\test</state>
</option>
@@ -1229,11 +1295,15 @@ <state>1</state>
</option>
<option>
- <name>IccRelaxedFpPrecision</name>
+ <name>IccCppInlineSemantics</name>
<state>0</state>
</option>
<option>
- <name>IccCppInlineSemantics</name>
+ <name>IccCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IccFloatSemantics</name>
<state>0</state>
</option>
</data>
@@ -1388,7 +1458,8 @@ </option>
<option>
<name>AUserIncludes</name>
- <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32</state>
+ <state>$PROJ_DIR$\..</state>
+ <state>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx</state>
<state>$PROJ_DIR$\..\..\..\boards\OLIMEX_STM32_P107</state>
</option>
<option>
@@ -1456,7 +1527,7 @@ <name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
- <version>11</version>
+ <version>13</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -1702,6 +1773,22 @@ <name>IlinkOptExceptionsForce</name>
<state>0</state>
</option>
+ <option>
+ <name>IlinkCmsis</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptMergeDuplSections</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>IlinkOptUseVfe</name>
+ <state>1</state>
+ </option>
+ <option>
+ <name>IlinkOptForceVfe</name>
+ <state>0</state>
+ </option>
</data>
</settings>
<settings>
@@ -1753,6 +1840,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\can.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\ext.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\gpt.h</name>
</file>
<file>
@@ -1762,6 +1852,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\i2c.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\icu.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\mac.h</name>
</file>
<file>
@@ -1777,6 +1870,12 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\pwm.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\rtc.h</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\sdc.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\serial.h</name>
</file>
<file>
@@ -1791,6 +1890,9 @@ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\usb.h</name>
</file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\usb_cdc.h</name>
+ </file>
</group>
<group>
<name>src</name>
@@ -1801,6 +1903,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\can.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\ext.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\gpt.c</name>
</file>
<file>
@@ -1810,6 +1915,9 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\i2c.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\icu.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\mac.c</name>
</file>
<file>
@@ -1822,6 +1930,12 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\pwm.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\rtc.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\sdc.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\serial.c</name>
</file>
<file>
@@ -1970,46 +2084,25 @@ <group>
<name>platform</name>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\adc_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\adc_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\can_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f100.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\can_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f103.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\core_cm3.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\hal_lld_f105_f107.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f100.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f103.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\hal_lld_f105_f107.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pal_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pal_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\serial_lld.c</name>
@@ -2018,36 +2111,27 @@ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\serial_lld.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\spi_lld.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\spi_lld.h</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32_dma.c</name>
- </file>
- <file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32_dma.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1\stm32_dma.c</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\stm32f10x.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\DMAv1\stm32_dma.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\uart_lld.c</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\stm32_rcc.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\uart_lld.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32F1xx\stm32f10x.h</name>
</file>
</group>
<group>
<name>port</name>
<group>
- <name>STM32</name>
+ <name>STM32F1xx</name>
<file>
- <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32\cmparams.h</name>
+ <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx\cmparams.h</name>
</file>
<file>
- <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32\vectors.s</name>
+ <name>$PROJ_DIR$\..\..\..\os\ports\IAR\ARMCMx\STM32F1xx\vectors.s</name>
</file>
</group>
<file>
diff --git a/demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp b/demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp index d84ff7beb..d6c066984 100644 --- a/demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp +++ b/demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp @@ -99,7 +99,7 @@ </option>
<option>
<name>OGChipSelectEditMenu</name>
- <state>STM32L151xB ST STM32L151xB</state>
+ <state>STM32L152xB ST STM32L152xB</state>
</option>
<option>
<name>GenLowLevelInterface</name>
@@ -1840,12 +1840,21 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\can.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\ext.h</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\gpt.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\hal.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\i2c.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\icu.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\mac.h</name>
</file>
<file>
@@ -1861,14 +1870,29 @@ <name>$PROJ_DIR$\..\..\..\os\hal\include\pwm.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\rtc.h</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\sdc.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\serial.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\serial_usb.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\spi.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\include\uart.h</name>
</file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\usb.h</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\include\usb_cdc.h</name>
+ </file>
</group>
<group>
<name>src</name>
@@ -1879,12 +1903,21 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\can.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\ext.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\gpt.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\hal.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\i2c.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\icu.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\mac.c</name>
</file>
<file>
@@ -1897,14 +1930,26 @@ <name>$PROJ_DIR$\..\..\..\os\hal\src\pwm.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\rtc.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\sdc.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\serial.c</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\serial_usb.c</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\spi.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\os\hal\src\uart.c</name>
</file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\os\hal\src\usb.c</name>
+ </file>
</group>
</group>
<group>
diff --git a/readme.txt b/readme.txt index 9653ea87e..5ea8fc151 100644 --- a/readme.txt +++ b/readme.txt @@ -160,7 +160,7 @@ - NEW: Added provisional support for STM32F2xx. Because of this some
directories related to the STM32 have been renamed, your makefiles may
require adjustments.
- (TODO: change to be ported to IAR and Keil build files)
+ (TODO: change to be ported to Keil build files)
- NEW: Added a custom rule to the various rules.mk files, now it is possible
to add an user rule into the Makefiles.
- NEW: Improvements to the trace buffer, now it stores a full thread pointer
|