From f4d189fe8e498de3b6d8e6b7057f39c759891bbe Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 24 Sep 2011 09:13:08 +0000
Subject: STM32 IAR projects updated.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3395 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.ewp | 233 +++++++++++++++++++++-------
 1 file changed, 177 insertions(+), 56 deletions(-)

(limited to 'demos/ARMCM3-STM32F100-DISCOVERY')

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>
@@ -1751,12 +1839,21 @@
         <file>
           <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>
@@ -1772,15 +1869,30 @@
         <file>
           <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>
@@ -1790,12 +1902,21 @@
         <file>
           <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>
@@ -1808,15 +1929,27 @@
         <file>
           <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>
-- 
cgit v1.2.3