renamed STM32F3 directories to reflect new models

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7342 35acf78f-673a-0410-8e92-d51de3d6d3f4

4 files changed, 42 insertions, 42 deletions

diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/Makefile b/demos/STM32/RT-STM32F303-DISCOVERY/Makefile
index 6f276f8f9..fcd7c512e 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/Makefile
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/Makefile
@@ -83,10 +83,10 @@ PROJECT = ch
 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/ports/STM32/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32/STM32F3xx/platform.mk

 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk

 include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp b/demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp
index 9427f0f63..fd7b13a99 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp
@@ -302,7 +302,7 @@
         <option>

           <name>CCIncludePath2</name>

           <state>$PROJ_DIR$\..\</state>

-          <state>$PROJ_DIR$\..\..\..\..\os\common\ports\ARMCMx\devices\STM32F30x</state>

+          <state>$PROJ_DIR$\..\..\..\..\os\common\ports\ARMCMx\devices\STM32F3xx</state>

           <state>$PROJ_DIR$\..\..\..\..\os\ext\CMSIS\include</state>

           <state>$PROJ_DIR$\..\..\..\..\os\ext\CMSIS\ST</state>

           <state>$PROJ_DIR$\..\..\..\..\os\rt\ports\ARMCMx</state>

@@ -312,7 +312,7 @@
           <state>$PROJ_DIR$\..\..\..\..\os\hal\include</state>

           <state>$PROJ_DIR$\..\..\..\..\os\hal\boards\ST_STM32F3_DISCOVERY</state>

           <state>$PROJ_DIR$\..\..\..\..\os\hal\ports\common\ARMCMx</state>

-          <state>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x</state>

+          <state>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx</state>

           <state>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD</state>

           <state>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD\GPIOv2</state>

           <state>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD\I2Cv2</state>

@@ -571,7 +571,7 @@
         <option>

           <name>AUserIncludes</name>

           <state>$PROJ_DIR$\..</state>

-          <state>$PROJ_DIR$\..\..\..\..\os\common\ports\ARMCMx\devices\STM32F30x</state>

+          <state>$PROJ_DIR$\..\..\..\..\os\common\ports\ARMCMx\devices\STM32F3xx</state>

           <state>$PROJ_DIR$\..\..\..\..\os\rt\ports\ARMCMx</state>

         </option>

         <option>

@@ -1256,7 +1256,7 @@
         <option>

           <name>CCIncludePath2</name>

           <state>$PROJ_DIR$\..\</state>

-          <state>$PROJ_DIR$\..\..\..\..\os\common\ports\ARMCMx\devices\STM32F30x</state>

+          <state>$PROJ_DIR$\..\..\..\..\os\common\ports\ARMCMx\devices\STM32F3xx</state>

           <state>$PROJ_DIR$\..\..\..\..\os\ext\CMSIS\include</state>

           <state>$PROJ_DIR$\..\..\..\..\os\ext\CMSIS\ST</state>

           <state>$PROJ_DIR$\..\..\..\..\os\rt\ports\ARMCMx</state>

@@ -1266,7 +1266,7 @@
           <state>$PROJ_DIR$\..\..\..\..\os\hal\include</state>

           <state>$PROJ_DIR$\..\..\..\..\os\hal\boards\ST_STM32F3_DISCOVERY</state>

           <state>$PROJ_DIR$\..\..\..\..\os\hal\ports\common\ARMCMx</state>

-          <state>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x</state>

+          <state>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx</state>

           <state>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD</state>

           <state>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD\GPIOv2</state>

           <state>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD\I2Cv2</state>

@@ -1525,7 +1525,7 @@
         <option>

           <name>AUserIncludes</name>

           <state>$PROJ_DIR$\..</state>

-          <state>$PROJ_DIR$\..\..\..\..\os\common\ports\ARMCMx\devices\STM32F30x</state>

+          <state>$PROJ_DIR$\..\..\..\..\os\common\ports\ARMCMx\devices\STM32F3xx</state>

           <state>$PROJ_DIR$\..\..\..\..\os\rt\ports\ARMCMx</state>

         </option>

         <option>

@@ -1920,7 +1920,7 @@
       <group>

         <name>ports</name>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\common\ports\ARMCMx\devices\STM32F30x\cmparams.h</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\common\ports\ARMCMx\devices\STM32F3xx\cmparams.h</name>

         </file>

         <file>

           <name>$PROJ_DIR$\..\..\..\..\os\common\ports\ARMCMx\compilers\IAR\cstartup.s</name>

@@ -1947,10 +1947,10 @@
           <name>$PROJ_DIR$\..\..\..\..\os\ext\CMSIS\include\core_cmInstr.h</name>

         </file>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\ext\CMSIS\ST\stm32f30x.h</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\ext\CMSIS\ST\stm32f3xx.h</name>

         </file>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\ext\CMSIS\ST\system_stm32f30x.h</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\ext\CMSIS\ST\system_stm32f3xx.h</name>

         </file>

       </group>

     </group>

@@ -2037,10 +2037,10 @@
       <group>

         <name>port</name>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x\adc_lld.c</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx\adc_lld.c</name>

         </file>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x\adc_lld.h</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx\adc_lld.h</name>

         </file>

         <file>

           <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD\can_lld.c</name>

@@ -2055,10 +2055,10 @@
           <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD\ext_lld.h</name>

         </file>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x\ext_lld_isr.c</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx\ext_lld_isr.c</name>

         </file>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x\ext_lld_isr.h</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx\ext_lld_isr.h</name>

         </file>

         <file>

           <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD\TIMv1\gpt_lld.c</name>

@@ -2067,10 +2067,10 @@
           <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD\TIMv1\gpt_lld.h</name>

         </file>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x\hal_lld.c</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx\hal_lld.c</name>

         </file>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x\hal_lld.h</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx\hal_lld.h</name>

         </file>

         <file>

           <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD\I2Cv2\i2c_lld.c</name>

@@ -2127,19 +2127,19 @@
           <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD\TIMv1\st_lld.h</name>

         </file>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x\stm32_dma.c</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx\stm32_dma.c</name>

         </file>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x\stm32_dma.h</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx\stm32_dma.h</name>

         </file>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x\stm32_isr.h</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx\stm32_isr.h</name>

         </file>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x\stm32_rcc.h</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx\stm32_rcc.h</name>

         </file>

         <file>

-          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F30x\stm32_registry.h</name>

+          <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\STM32F3xx\stm32_registry.h</name>

         </file>

         <file>

           <name>$PROJ_DIR$\..\..\..\..\os\hal\ports\STM32\LLD\TIMv1\stm32_tim.h</name>

diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/keil/ch.uvproj b/demos/STM32/RT-STM32F303-DISCOVERY/keil/ch.uvproj
index 9ef19d043..a51f20d30 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/keil/ch.uvproj
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/keil/ch.uvproj
@@ -19,7 +19,7 @@
           <StartupFile></StartupFile>
           <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F3xx_256 -FS08000000 -FL040000 -FP0($$Device:STM32F303VC$Flash\STM32F3xx_256.FLM))</FlashDriverDll>
           <DeviceId>6331</DeviceId>
-          <RegisterFile>$$Device:STM32F303VC$Device\Include\STM32F30x.h</RegisterFile>
+          <RegisterFile>$$Device:STM32F303VC$Device\Include\STM32F3xx.h</RegisterFile>
           <MemoryEnv></MemoryEnv>
           <Cmp></Cmp>
           <Asm></Asm>
@@ -29,7 +29,7 @@
           <SLE66CMisc></SLE66CMisc>
           <SLE66AMisc></SLE66AMisc>
           <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32F303VC$SVD\STM32F30x.svd</SFDFile>
+          <SFDFile>$$Device:STM32F303VC$SVD\STM32F3xx.svd</SFDFile>
           <bCustSvd>0</bCustSvd>
           <UseEnv>0</UseEnv>
           <BinPath></BinPath>
@@ -357,7 +357,7 @@
               <MiscControls>--c99</MiscControls>
               <Define>CORTEX_USE_FPU=1 __heap_base__=Image$$RW_IRAM1$$ZI$$Limit __heap_end__=Image$$RW_IRAM2$$Base</Define>
               <Undefine></Undefine>
-              <IncludePath>..\;..\..\..\..\os\common\ports\ARMCMx\devices\STM32F30x;..\..\..\..\os\ext\CMSIS\include;..\..\..\..\os\ext\CMSIS\ST;..\..\..\..\os\rt\ports\ARMCMx;..\..\..\..\os\rt\ports\ARMCMx\compilers\RVCT;..\..\..\..\os\rt\include;..\..\..\..\os\hal\osal\rt;..\..\..\..\os\hal\include;..\..\..\..\os\hal\boards\ST_STM32F3_DISCOVERY;..\..\..\..\os\hal\ports\common\ARMCMx;..\..\..\..\os\hal\ports\STM32\STM32F30x;..\..\..\..\os\hal\ports\STM32\LLD;..\..\..\..\os\hal\ports\STM32\LLD\GPIOv2;..\..\..\..\os\hal\ports\STM32\LLD\I2Cv2;..\..\..\..\os\hal\ports\STM32\LLD\RTCv2;..\..\..\..\os\hal\ports\STM32\LLD\SPIv2;..\..\..\..\os\hal\ports\STM32\LLD\TIMv1;..\..\..\..\os\hal\ports\STM32\LLD\USARTv2;..\..\..\..\os\hal\ports\STM32\LLD\USBv1;..\..\..\..\test</IncludePath>
+              <IncludePath>..\;..\..\..\..\os\common\ports\ARMCMx\devices\STM32F3xx;..\..\..\..\os\ext\CMSIS\include;..\..\..\..\os\ext\CMSIS\ST;..\..\..\..\os\rt\ports\ARMCMx;..\..\..\..\os\rt\ports\ARMCMx\compilers\RVCT;..\..\..\..\os\rt\include;..\..\..\..\os\hal\osal\rt;..\..\..\..\os\hal\include;..\..\..\..\os\hal\boards\ST_STM32F3_DISCOVERY;..\..\..\..\os\hal\ports\common\ARMCMx;..\..\..\..\os\hal\ports\STM32\STM32F3xx;..\..\..\..\os\hal\ports\STM32\LLD;..\..\..\..\os\hal\ports\STM32\LLD\GPIOv2;..\..\..\..\os\hal\ports\STM32\LLD\I2Cv2;..\..\..\..\os\hal\ports\STM32\LLD\RTCv2;..\..\..\..\os\hal\ports\STM32\LLD\SPIv2;..\..\..\..\os\hal\ports\STM32\LLD\TIMv1;..\..\..\..\os\hal\ports\STM32\LLD\USARTv2;..\..\..\..\os\hal\ports\STM32\LLD\USBv1;..\..\..\..\test</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -373,7 +373,7 @@
               <MiscControls>--cpreproc</MiscControls>
               <Define>CORTEX_USE_FPU=1</Define>
               <Undefine></Undefine>
-              <IncludePath>..\;..\..\..\..\os\common\ports\ARMCMx\devices\STM32F30x;..\..\..\..\os\rt\ports\ARMCMx</IncludePath>
+              <IncludePath>..\;..\..\..\..\os\common\ports\ARMCMx\devices\STM32F3xx;..\..\..\..\os\rt\ports\ARMCMx</IncludePath>
             </VariousControls>
           </Aads>
           <LDads>
@@ -401,7 +401,7 @@
             <File>
               <FileName>cmparams.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\os\common\ports\ARMCMx\devices\STM32F30x\cmparams.h</FilePath>
+              <FilePath>..\..\..\..\os\common\ports\ARMCMx\devices\STM32F3xx\cmparams.h</FilePath>
             </File>
             <File>
               <FileName>cstartup.s</FileName>
@@ -439,9 +439,9 @@
               <FilePath>..\..\..\..\os\ext\CMSIS\include\core_cmFunc.h</FilePath>
             </File>
             <File>
-              <FileName>system_stm32f30x.h</FileName>
+              <FileName>system_stm32f3xx.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\os\ext\CMSIS\ST\system_stm32f30x.h</FilePath>
+              <FilePath>..\..\..\..\os\ext\CMSIS\ST\system_stm32f3xx.h</FilePath>
             </File>
           </Files>
         </Group>
@@ -716,57 +716,57 @@
             <File>
               <FileName>adc_lld.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F30x\adc_lld.c</FilePath>
+              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F3xx\adc_lld.c</FilePath>
             </File>
             <File>
               <FileName>adc_lld.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F30x\adc_lld.h</FilePath>
+              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F3xx\adc_lld.h</FilePath>
             </File>
             <File>
               <FileName>ext_lld_isr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F30x\ext_lld_isr.c</FilePath>
+              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F3xx\ext_lld_isr.c</FilePath>
             </File>
             <File>
               <FileName>ext_lld_isr.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F30x\ext_lld_isr.h</FilePath>
+              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F3xx\ext_lld_isr.h</FilePath>
             </File>
             <File>
               <FileName>hal_lld.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F30x\hal_lld.c</FilePath>
+              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F3xx\hal_lld.c</FilePath>
             </File>
             <File>
               <FileName>hal_lld.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F30x\hal_lld.h</FilePath>
+              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F3xx\hal_lld.h</FilePath>
             </File>
             <File>
               <FileName>stm32_dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F30x\stm32_dma.c</FilePath>
+              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F3xx\stm32_dma.c</FilePath>
             </File>
             <File>
               <FileName>stm32_dma.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F30x\stm32_dma.h</FilePath>
+              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F3xx\stm32_dma.h</FilePath>
             </File>
             <File>
               <FileName>stm32_isr.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F30x\stm32_isr.h</FilePath>
+              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F3xx\stm32_isr.h</FilePath>
             </File>
             <File>
               <FileName>stm32_rcc.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F30x\stm32_rcc.h</FilePath>
+              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F3xx\stm32_rcc.h</FilePath>
             </File>
             <File>
               <FileName>stm32_registry.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F30x\stm32_registry.h</FilePath>
+              <FilePath>..\..\..\..\os\hal\ports\STM32\STM32F3xx\stm32_registry.h</FilePath>
             </File>
             <File>
               <FileName>can_lld.c</FileName>
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F303-DISCOVERY/mcuconf.h
index 28b5e1351..131092493 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/mcuconf.h
@@ -15,7 +15,7 @@
 */

 

 /*

- * STM32F30x drivers configuration.

+ * STM32F3xx drivers configuration.

  * The following settings override the default settings present in

  * the various device driver implementation headers.

  * Note that the settings for each driver only have effect if the whole

@@ -28,7 +28,7 @@
  * 0...3        Lowest...Highest.

  */

 

-#define STM32F30x_MCUCONF

+#define STM32F3xx_MCUCONF

 

 /*

  * HAL driver system settings.