aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
Diffstat (limited to 'os')
-rw-r--r--os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h85
-rw-r--r--os/common/ports/ARMCMx/devices/STM32F3xx/cmparams.h (renamed from os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h)0
-rw-r--r--os/hal/ports/STM32/STM32F3xx/adc_lld.c (renamed from os/hal/ports/STM32/STM32F30x/adc_lld.c)4
-rw-r--r--os/hal/ports/STM32/STM32F3xx/adc_lld.h (renamed from os/hal/ports/STM32/STM32F30x/adc_lld.h)4
-rw-r--r--os/hal/ports/STM32/STM32F3xx/ext_lld_isr.c (renamed from os/hal/ports/STM32/STM32F30x/ext_lld_isr.c)4
-rw-r--r--os/hal/ports/STM32/STM32F3xx/ext_lld_isr.h (renamed from os/hal/ports/STM32/STM32F30x/ext_lld_isr.h)4
-rw-r--r--os/hal/ports/STM32/STM32F3xx/hal_lld.c (renamed from os/hal/ports/STM32/STM32F30x/hal_lld.c)4
-rw-r--r--os/hal/ports/STM32/STM32F3xx/hal_lld.h (renamed from os/hal/ports/STM32/STM32F30x/hal_lld.h)8
-rw-r--r--os/hal/ports/STM32/STM32F3xx/platform.mk (renamed from os/hal/ports/STM32/STM32F30x/platform.mk)12
-rw-r--r--os/hal/ports/STM32/STM32F3xx/stm32_dma.c (renamed from os/hal/ports/STM32/STM32F30x/stm32_dma.c)4
-rw-r--r--os/hal/ports/STM32/STM32F3xx/stm32_dma.h (renamed from os/hal/ports/STM32/STM32F30x/stm32_dma.h)4
-rw-r--r--os/hal/ports/STM32/STM32F3xx/stm32_isr.h (renamed from os/hal/ports/STM32/STM32F30x/stm32_isr.h)4
-rw-r--r--os/hal/ports/STM32/STM32F3xx/stm32_rcc.h (renamed from os/hal/ports/STM32/STM32F30x/stm32_rcc.h)4
-rw-r--r--os/hal/ports/STM32/STM32F3xx/stm32_registry.h (renamed from os/hal/ports/STM32/STM32F30x/stm32_registry.h)4
-rw-r--r--os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk (renamed from os/nil/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk)4
-rw-r--r--os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f3xx.mk (renamed from os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk)4
16 files changed, 34 insertions, 119 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-26 08:18:11 +0000