diff options
49 files changed, 123 insertions, 208 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.
diff --git a/demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile b/demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile index 37ed37def..bafcc1f1c 100644 --- a/demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile +++ b/demos/STM32/RT-STM32F373-STM32373C_EVAL/Makefile @@ -86,7 +86,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/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_stm32f37x.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/os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h deleted file mode 100644 index a877c1bd4..000000000 --- a/os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h +++ /dev/null @@ -1,85 +0,0 @@ -/*
- ChibiOS - Copyright (C) 2006,2007,2008,2009,2010,
- 2011,2012,2013,2014 Giovanni Di Sirio.
-
- This file is part of ChibiOS.
-
- ChibiOS is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file STM32F37x/cmparams.h
- * @brief ARM Cortex-M4 parameters for the STM32F37x.
- *
- * @defgroup ARMCMx_STM32F37x STM32F37x Specific Parameters
- * @ingroup ARMCMx_SPECIFIC
- * @details This file contains the Cortex-M4 specific parameters for the
- * STM32F37x platform.
- * @{
- */
-
-#ifndef _CMPARAMS_H_
-#define _CMPARAMS_H_
-
-/**
- * @brief Cortex core model.
- */
-#define CORTEX_MODEL CORTEX_M4
-
-/**
- * @brief Floating Point unit presence.
- */
-#define CORTEX_HAS_FPU 1
-
-/**
- * @brief Number of bits in priority masks.
- */
-#define CORTEX_PRIORITY_BITS 4
-
-/**
- * @brief Number of interrupt vectors.
- * @note This number does not include the 16 system vectors and must be
- * rounded to a multiple of 8.
- */
-#define CORTEX_NUM_VECTORS 88
-
-/* The following code is not processed when the file is included from an
- asm module.*/
-#if !defined(_FROM_ASM_)
-
-/* If the device type is not externally defined, for example from the Makefile,
- then a file named board.h is included. This file must contain a device
- definition compatible with the vendor include file.*/
-#if !defined (STM32F373xC) && !defined (STM32F378xx)
-#include "board.h"
-#endif
-
-/* Including the device CMSIS header. Note, we are not using the definitions
- from this header because we need this file to be usable also from
- assembler source files. We verify that the info matches instead.*/
-#include "stm32f3xx.h"
-
-#if !CORTEX_HAS_FPU != !__FPU_PRESENT
-#error "CMSIS __FPU_PRESENT mismatch"
-#endif
-
-#if CORTEX_PRIORITY_BITS != __NVIC_PRIO_BITS
-#error "CMSIS __NVIC_PRIO_BITS mismatch"
-#endif
-
-#endif /* !defined(_FROM_ASM_) */
-
-#endif /* _CMPARAMS_H_ */
-
-/** @} */
diff --git a/os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F3xx/cmparams.h index 526453f99..526453f99 100644 --- a/os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F3xx/cmparams.h diff --git a/os/hal/ports/STM32/STM32F30x/adc_lld.c b/os/hal/ports/STM32/STM32F3xx/adc_lld.c index 2e875f169..1ceb7dafd 100644 --- a/os/hal/ports/STM32/STM32F30x/adc_lld.c +++ b/os/hal/ports/STM32/STM32F3xx/adc_lld.c @@ -15,8 +15,8 @@ */
/**
- * @file STM32F30x/adc_lld.c
- * @brief STM32F30x ADC subsystem low level driver source.
+ * @file STM32F3xx/adc_lld.c
+ * @brief STM32F3xx ADC subsystem low level driver source.
*
* @addtogroup ADC
* @{
diff --git a/os/hal/ports/STM32/STM32F30x/adc_lld.h b/os/hal/ports/STM32/STM32F3xx/adc_lld.h index bc8a7c25b..a2631505a 100644 --- a/os/hal/ports/STM32/STM32F30x/adc_lld.h +++ b/os/hal/ports/STM32/STM32F3xx/adc_lld.h @@ -15,8 +15,8 @@ */
/**
- * @file STM32F30x/adc_lld.h
- * @brief STM32F30x ADC subsystem low level driver header.
+ * @file STM32F3xx/adc_lld.h
+ * @brief STM32F3xx ADC subsystem low level driver header.
*
* @addtogroup ADC
* @{
diff --git a/os/hal/ports/STM32/STM32F30x/ext_lld_isr.c b/os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c index b16158d8b..1ac1c2c78 100644 --- a/os/hal/ports/STM32/STM32F30x/ext_lld_isr.c +++ b/os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c @@ -15,8 +15,8 @@ */
/**
- * @file STM32F30x/ext_lld_isr.c
- * @brief STM32F30x EXT subsystem low level driver ISR code.
+ * @file STM32F3xx/ext_lld_isr.c
+ * @brief STM32F3xx EXT subsystem low level driver ISR code.
*
* @addtogroup EXT
* @{
diff --git a/os/hal/ports/STM32/STM32F30x/ext_lld_isr.h b/os/hal/ports/STM32/STM32F3xx/ext_lld_isr.h index 35e379e26..b94c89b2c 100644 --- a/os/hal/ports/STM32/STM32F30x/ext_lld_isr.h +++ b/os/hal/ports/STM32/STM32F3xx/ext_lld_isr.h @@ -15,8 +15,8 @@ */
/**
- * @file STM32F30x/ext_lld_isr.h
- * @brief STM32F30x EXT subsystem low level driver ISR header.
+ * @file STM32F3xx/ext_lld_isr.h
+ * @brief STM32F3xx EXT subsystem low level driver ISR header.
*
* @addtogroup EXT
* @{
diff --git a/os/hal/ports/STM32/STM32F30x/hal_lld.c b/os/hal/ports/STM32/STM32F3xx/hal_lld.c index 6e5a8db8d..cfa538e2e 100644 --- a/os/hal/ports/STM32/STM32F30x/hal_lld.c +++ b/os/hal/ports/STM32/STM32F3xx/hal_lld.c @@ -15,8 +15,8 @@ */
/**
- * @file STM32F30x/hal_lld.c
- * @brief STM32F30x HAL subsystem low level driver source.
+ * @file STM32F3xx/hal_lld.c
+ * @brief STM32F3xx HAL subsystem low level driver source.
*
* @addtogroup HAL
* @{
diff --git a/os/hal/ports/STM32/STM32F30x/hal_lld.h b/os/hal/ports/STM32/STM32F3xx/hal_lld.h index d95efd4dd..21f6d4a84 100644 --- a/os/hal/ports/STM32/STM32F30x/hal_lld.h +++ b/os/hal/ports/STM32/STM32F3xx/hal_lld.h @@ -15,8 +15,8 @@ */
/**
- * @file STM32F30x/hal_lld.h
- * @brief STM32F30x HAL subsystem low level driver header.
+ * @file STM32F3xx/hal_lld.h
+ * @brief STM32F3xx HAL subsystem low level driver header.
* @pre This module requires the following macros to be defined in the
* @p board.h file:
* - STM32_LSECLK.
@@ -546,8 +546,8 @@ /*
* Configuration-related checks.
*/
-#if !defined(STM32F30x_MCUCONF)
-#error "Using a wrong mcuconf.h file, STM32F30x_MCUCONF not defined"
+#if !defined(STM32F3xx_MCUCONF)
+#error "Using a wrong mcuconf.h file, STM32F3xx_MCUCONF not defined"
#endif
/*
diff --git a/os/hal/ports/STM32/STM32F30x/platform.mk b/os/hal/ports/STM32/STM32F3xx/platform.mk index f24aee535..5851cf65b 100644 --- a/os/hal/ports/STM32/STM32F30x/platform.mk +++ b/os/hal/ports/STM32/STM32F3xx/platform.mk @@ -1,9 +1,9 @@ -# List of all the STM32F30x platform files.
+# List of all the STM32F3xx platform files.
PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
- ${CHIBIOS}/os/hal/ports/STM32/STM32F30x/stm32_dma.c \
- ${CHIBIOS}/os/hal/ports/STM32/STM32F30x/hal_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/STM32F30x/adc_lld.c \
- ${CHIBIOS}/os/hal/ports/STM32/STM32F30x/ext_lld_isr.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F3xx/stm32_dma.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F3xx/hal_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F3xx/adc_lld.c \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c \
${CHIBIOS}/os/hal/ports/STM32/LLD/can_lld.c \
${CHIBIOS}/os/hal/ports/STM32/LLD/ext_lld.c \
${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c \
@@ -20,7 +20,7 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \ # Required include directories
PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
- ${CHIBIOS}/os/hal/ports/STM32/STM32F30x \
+ ${CHIBIOS}/os/hal/ports/STM32/STM32F3xx \
${CHIBIOS}/os/hal/ports/STM32/LLD \
${CHIBIOS}/os/hal/ports/STM32/LLD/GPIOv2 \
${CHIBIOS}/os/hal/ports/STM32/LLD/I2Cv2 \
diff --git a/os/hal/ports/STM32/STM32F30x/stm32_dma.c b/os/hal/ports/STM32/STM32F3xx/stm32_dma.c index 6794e5992..e956fe9e4 100644 --- a/os/hal/ports/STM32/STM32F30x/stm32_dma.c +++ b/os/hal/ports/STM32/STM32F3xx/stm32_dma.c @@ -15,10 +15,10 @@ */
/**
- * @file STM32F30x/stm32_dma.c
+ * @file STM32F3xx/stm32_dma.c
* @brief DMA helper driver code.
*
- * @addtogroup STM32F30x_DMA
+ * @addtogroup STM32F3xx_DMA
* @details DMA sharing helper driver. In the STM32 the DMA streams are a
* shared resource, this driver allows to allocate and free DMA
* streams at runtime in order to allow all the other device
diff --git a/os/hal/ports/STM32/STM32F30x/stm32_dma.h b/os/hal/ports/STM32/STM32F3xx/stm32_dma.h index 4c3d4284c..afb167615 100644 --- a/os/hal/ports/STM32/STM32F30x/stm32_dma.h +++ b/os/hal/ports/STM32/STM32F3xx/stm32_dma.h @@ -15,13 +15,13 @@ */
/**
- * @file STM32F30x/stm32_dma.h
+ * @file STM32F3xx/stm32_dma.h
* @brief DMA helper driver header.
* @note This file requires definitions from the ST header file stm32f30x.h.
* @note This driver uses the new naming convention used for the STM32F2xx
* so the "DMA channels" are referred as "DMA streams".
*
- * @addtogroup STM32F30x_DMA
+ * @addtogroup STM32F3xx_DMA
* @{
*/
diff --git a/os/hal/ports/STM32/STM32F30x/stm32_isr.h b/os/hal/ports/STM32/STM32F3xx/stm32_isr.h index a03f74c06..410c2d793 100644 --- a/os/hal/ports/STM32/STM32F30x/stm32_isr.h +++ b/os/hal/ports/STM32/STM32F3xx/stm32_isr.h @@ -15,10 +15,10 @@ */
/**
- * @file STM32F30x/stm32_isr.h
+ * @file STM32F3xx/stm32_isr.h
* @brief ISR remapper driver header.
*
- * @addtogroup STM32F30x_ISR
+ * @addtogroup STM32F3xx_ISR
* @{
*/
diff --git a/os/hal/ports/STM32/STM32F30x/stm32_rcc.h b/os/hal/ports/STM32/STM32F3xx/stm32_rcc.h index a152dfadd..208c2e6c8 100644 --- a/os/hal/ports/STM32/STM32F30x/stm32_rcc.h +++ b/os/hal/ports/STM32/STM32F3xx/stm32_rcc.h @@ -15,12 +15,12 @@ */
/**
- * @file STM32F30x/stm32_rcc.h
+ * @file STM32F3xx/stm32_rcc.h
* @brief RCC helper driver header.
* @note This file requires definitions from the ST header file
* @p stm32f30x.h.
*
- * @addtogroup STM32F30x_RCC
+ * @addtogroup STM32F3xx_RCC
* @{
*/
diff --git a/os/hal/ports/STM32/STM32F30x/stm32_registry.h b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h index 0ebf0d2e0..1a576e5dd 100644 --- a/os/hal/ports/STM32/STM32F30x/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F3xx/stm32_registry.h @@ -15,8 +15,8 @@ */
/**
- * @file STM32F30x/stm32_registry.h
- * @brief STM32F30x capabilities registry.
+ * @file STM32F3xx/stm32_registry.h
+ * @brief STM32F3xx capabilities registry.
*
* @addtogroup HAL
* @{
diff --git a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk index 18df7e0a9..2c02987dc 100644 --- a/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk +++ b/os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk @@ -1,4 +1,4 @@ -# List of the ChibiOS/NIL Cortex-M4 STM32F30x port files.
+# List of the ChibiOS/NIL Cortex-M4 STM32F3xx port files.
PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \
$(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \
${CHIBIOS}/os/nil/ports/ARMCMx/nilcore.c \
@@ -8,7 +8,7 @@ PORTASM = $(CHIBIOS)/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \
${CHIBIOS}/os/ext/CMSIS/ST \
- ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32F30x \
+ ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32F3xx \
${CHIBIOS}/os/nil/ports/ARMCMx \
${CHIBIOS}/os/nil/ports/ARMCMx/compilers/GCC
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk index e3d87f411..7df6d2c06 100644 --- a/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk +++ b/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk @@ -1,4 +1,4 @@ -# List of the ChibiOS/RT Cortex-M4 STM32F30x port files.
+# List of the ChibiOS/RT Cortex-M4 STM32F3xx port files.
PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \
$(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c \
${CHIBIOS}/os/rt/ports/ARMCMx/chcore.c \
@@ -8,7 +8,7 @@ PORTASM = $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \
${CHIBIOS}/os/ext/CMSIS/ST \
- ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32F30x \
+ ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32F3xx \
${CHIBIOS}/os/rt/ports/ARMCMx \
${CHIBIOS}/os/rt/ports/ARMCMx/compilers/GCC
diff --git a/testhal/STM32/STM32F30x/ADC/Makefile b/testhal/STM32/STM32F30x/ADC/Makefile index 41542fcb2..5adcdade8 100644 --- a/testhal/STM32/STM32F30x/ADC/Makefile +++ b/testhal/STM32/STM32F30x/ADC/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/testhal/STM32/STM32F30x/ADC/mcuconf.h b/testhal/STM32/STM32F30x/ADC/mcuconf.h index 7838058a0..663294258 100644 --- a/testhal/STM32/STM32F30x/ADC/mcuconf.h +++ b/testhal/STM32/STM32F30x/ADC/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.
diff --git a/testhal/STM32/STM32F30x/ADC_DUAL/Makefile b/testhal/STM32/STM32F30x/ADC_DUAL/Makefile index 41542fcb2..5adcdade8 100644 --- a/testhal/STM32/STM32F30x/ADC_DUAL/Makefile +++ b/testhal/STM32/STM32F30x/ADC_DUAL/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/testhal/STM32/STM32F30x/ADC_DUAL/mcuconf.h b/testhal/STM32/STM32F30x/ADC_DUAL/mcuconf.h index 3468f7e92..4256fca85 100644 --- a/testhal/STM32/STM32F30x/ADC_DUAL/mcuconf.h +++ b/testhal/STM32/STM32F30x/ADC_DUAL/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.
diff --git a/testhal/STM32/STM32F30x/CAN/Makefile b/testhal/STM32/STM32F30x/CAN/Makefile index 41542fcb2..5adcdade8 100644 --- a/testhal/STM32/STM32F30x/CAN/Makefile +++ b/testhal/STM32/STM32F30x/CAN/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/testhal/STM32/STM32F30x/CAN/mcuconf.h b/testhal/STM32/STM32F30x/CAN/mcuconf.h index 86e830fe2..f5175fe03 100644 --- a/testhal/STM32/STM32F30x/CAN/mcuconf.h +++ b/testhal/STM32/STM32F30x/CAN/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.
diff --git a/testhal/STM32/STM32F30x/EXT/Makefile b/testhal/STM32/STM32F30x/EXT/Makefile index 41542fcb2..5adcdade8 100644 --- a/testhal/STM32/STM32F30x/EXT/Makefile +++ b/testhal/STM32/STM32F30x/EXT/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/testhal/STM32/STM32F30x/EXT/mcuconf.h b/testhal/STM32/STM32F30x/EXT/mcuconf.h index abb99ae10..01e6670a9 100644 --- a/testhal/STM32/STM32F30x/EXT/mcuconf.h +++ b/testhal/STM32/STM32F30x/EXT/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.
diff --git a/testhal/STM32/STM32F30x/IRQ_STORM/Makefile b/testhal/STM32/STM32F30x/IRQ_STORM/Makefile index 41542fcb2..5adcdade8 100644 --- a/testhal/STM32/STM32F30x/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32F30x/IRQ_STORM/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/testhal/STM32/STM32F30x/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32F30x/IRQ_STORM/mcuconf.h index 082f71c8f..3aa32b115 100644 --- a/testhal/STM32/STM32F30x/IRQ_STORM/mcuconf.h +++ b/testhal/STM32/STM32F30x/IRQ_STORM/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.
diff --git a/testhal/STM32/STM32F30x/PWM-ICU/Makefile b/testhal/STM32/STM32F30x/PWM-ICU/Makefile index 41542fcb2..5adcdade8 100644 --- a/testhal/STM32/STM32F30x/PWM-ICU/Makefile +++ b/testhal/STM32/STM32F30x/PWM-ICU/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/testhal/STM32/STM32F30x/PWM-ICU/mcuconf.h b/testhal/STM32/STM32F30x/PWM-ICU/mcuconf.h index bb59d7e27..626449cd5 100644 --- a/testhal/STM32/STM32F30x/PWM-ICU/mcuconf.h +++ b/testhal/STM32/STM32F30x/PWM-ICU/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.
diff --git a/testhal/STM32/STM32F30x/SPI/Makefile b/testhal/STM32/STM32F30x/SPI/Makefile index 41542fcb2..5adcdade8 100644 --- a/testhal/STM32/STM32F30x/SPI/Makefile +++ b/testhal/STM32/STM32F30x/SPI/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/testhal/STM32/STM32F30x/SPI/mcuconf.h b/testhal/STM32/STM32F30x/SPI/mcuconf.h index 8ba3d4ea8..281dd7706 100644 --- a/testhal/STM32/STM32F30x/SPI/mcuconf.h +++ b/testhal/STM32/STM32F30x/SPI/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.
diff --git a/testhal/STM32/STM32F30x/UART/Makefile b/testhal/STM32/STM32F30x/UART/Makefile index 41542fcb2..5adcdade8 100644 --- a/testhal/STM32/STM32F30x/UART/Makefile +++ b/testhal/STM32/STM32F30x/UART/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/testhal/STM32/STM32F30x/UART/mcuconf.h b/testhal/STM32/STM32F30x/UART/mcuconf.h index f3ebfcc2a..650d45ce4 100644 --- a/testhal/STM32/STM32F30x/UART/mcuconf.h +++ b/testhal/STM32/STM32F30x/UART/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.
diff --git a/testhal/STM32/STM32F30x/USB_CDC/Makefile b/testhal/STM32/STM32F30x/USB_CDC/Makefile index dc7053c2f..4028a4949 100644 --- a/testhal/STM32/STM32F30x/USB_CDC/Makefile +++ b/testhal/STM32/STM32F30x/USB_CDC/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/testhal/STM32/STM32F30x/USB_CDC/mcuconf.h b/testhal/STM32/STM32F30x/USB_CDC/mcuconf.h index 57f596299..08038a3fe 100644 --- a/testhal/STM32/STM32F30x/USB_CDC/mcuconf.h +++ b/testhal/STM32/STM32F30x/USB_CDC/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.
diff --git a/testhal/STM32/STM32F37x/ADC/Makefile b/testhal/STM32/STM32F37x/ADC/Makefile index c8842b0e0..81ea22dcc 100644 --- a/testhal/STM32/STM32F37x/ADC/Makefile +++ b/testhal/STM32/STM32F37x/ADC/Makefile @@ -86,7 +86,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/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_stm32f37x.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/testhal/STM32/STM32F37x/CAN/Makefile b/testhal/STM32/STM32F37x/CAN/Makefile index c8842b0e0..81ea22dcc 100644 --- a/testhal/STM32/STM32F37x/CAN/Makefile +++ b/testhal/STM32/STM32F37x/CAN/Makefile @@ -86,7 +86,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/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_stm32f37x.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/testhal/STM32/STM32F37x/EXT/Makefile b/testhal/STM32/STM32F37x/EXT/Makefile index c8842b0e0..81ea22dcc 100644 --- a/testhal/STM32/STM32F37x/EXT/Makefile +++ b/testhal/STM32/STM32F37x/EXT/Makefile @@ -86,7 +86,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/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_stm32f37x.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/testhal/STM32/STM32F37x/I2C/Makefile b/testhal/STM32/STM32F37x/I2C/Makefile index c8842b0e0..81ea22dcc 100644 --- a/testhal/STM32/STM32F37x/I2C/Makefile +++ b/testhal/STM32/STM32F37x/I2C/Makefile @@ -86,7 +86,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/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_stm32f37x.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/testhal/STM32/STM32F37x/IRQ_STORM/Makefile b/testhal/STM32/STM32F37x/IRQ_STORM/Makefile index c8842b0e0..81ea22dcc 100644 --- a/testhal/STM32/STM32F37x/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32F37x/IRQ_STORM/Makefile @@ -86,7 +86,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/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_stm32f37x.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/testhal/STM32/STM32F37x/PWM-ICU/Makefile b/testhal/STM32/STM32F37x/PWM-ICU/Makefile index c8842b0e0..81ea22dcc 100644 --- a/testhal/STM32/STM32F37x/PWM-ICU/Makefile +++ b/testhal/STM32/STM32F37x/PWM-ICU/Makefile @@ -86,7 +86,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/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_stm32f37x.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/testhal/STM32/STM32F37x/SDADC/Makefile b/testhal/STM32/STM32F37x/SDADC/Makefile index c8842b0e0..81ea22dcc 100644 --- a/testhal/STM32/STM32F37x/SDADC/Makefile +++ b/testhal/STM32/STM32F37x/SDADC/Makefile @@ -86,7 +86,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/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_stm32f37x.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/testhal/STM32/STM32F37x/SPI/Makefile b/testhal/STM32/STM32F37x/SPI/Makefile index c8842b0e0..81ea22dcc 100644 --- a/testhal/STM32/STM32F37x/SPI/Makefile +++ b/testhal/STM32/STM32F37x/SPI/Makefile @@ -86,7 +86,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/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_stm32f37x.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/testhal/STM32/STM32F37x/UART/Makefile b/testhal/STM32/STM32F37x/UART/Makefile index c8842b0e0..81ea22dcc 100644 --- a/testhal/STM32/STM32F37x/UART/Makefile +++ b/testhal/STM32/STM32F37x/UART/Makefile @@ -86,7 +86,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/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_stm32f37x.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/testhal/STM32/STM32F37x/USB_CDC/Makefile b/testhal/STM32/STM32F37x/USB_CDC/Makefile index 14fadc572..537b6fa59 100644 --- a/testhal/STM32/STM32F37x/USB_CDC/Makefile +++ b/testhal/STM32/STM32F37x/USB_CDC/Makefile @@ -86,7 +86,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32373C_EVAL/board.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/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_stm32f37x.mk
+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk
include $(CHIBIOS)/test/rt/test.mk
# Define linker script file here
|