Skip to content

Commit 503a866

Browse files
committed
[F4] Update STM32F4xx CMSIS to v2.6.3
Included in STM32CubeF4 FW V1.24.0 Signed-off-by: Frederic.Pillon <[email protected]>
1 parent 0e8722f commit 503a866

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+208678
-206746
lines changed

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f401xc.h

+5,518-5,459
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f401xe.h

+5,518-5,459
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f405xx.h

+9,134-9,071
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h

+9,831-9,768
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f410cx.h

+4,770-4,755
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f410rx.h

+4,772-4,757
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f410tx.h

+4,732-4,717
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f411xe.h

+5,545-5,486
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412cx.h

+8,521-8,500
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412rx.h

+9,174-9,141
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412vx.h

+9,186-9,139
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412zx.h

+9,204-9,135
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f413xx.h

+9,736-9,347
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f415xx.h

+9,318-9,260
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f417xx.h

+10,011-9,953
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f423xx.h

+9,748-9,359
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f427xx.h

+10,560-10,498
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f429xx.h

+10,718-10,656
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f437xx.h

+10,759-10,691
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f439xx.h

+10,909-10,841
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f446xx.h

+10,129-10,068
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f469xx.h

+13,236-13,183
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f479xx.h

+13,430-13,371
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h

+29-29
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
* @file stm32f4xx.h
44
* @author MCD Application Team
55
* @brief CMSIS STM32F4xx Device Peripheral Access Layer Header File.
6-
*
6+
*
77
* The file is the unique include file that the application programmer
88
* is using in the C source code, usually in main.c. This file contains:
99
* - Configuration section that allows to select:
1010
* - The STM32F4xx device used in the target application
11-
* - To use or not the peripheral’s drivers in application code(i.e.
12-
* code will be based on direct access to peripheral’s registers
13-
* rather than drivers API), this option is controlled by
11+
* - To use or not the peripheral’s drivers in application code(i.e.
12+
* code will be based on direct access to peripheral’s registers
13+
* rather than drivers API), this option is controlled by
1414
* "#define USE_HAL_DRIVER"
15-
*
15+
*
1616
******************************************************************************
1717
* @attention
1818
*
@@ -50,18 +50,18 @@
5050
/** @addtogroup stm32f4xx
5151
* @{
5252
*/
53-
53+
5454
#ifndef __STM32F4xx_H
5555
#define __STM32F4xx_H
5656

5757
#ifdef __cplusplus
5858
extern "C" {
5959
#endif /* __cplusplus */
60-
60+
6161
/** @addtogroup Library_configuration_section
6262
* @{
6363
*/
64-
64+
6565
/**
6666
* @brief STM32 Family
6767
*/
@@ -70,7 +70,7 @@
7070
#endif /* STM32F4 */
7171

7272
/* Uncomment the line below according to the target STM32 device used in your
73-
application
73+
application
7474
*/
7575
#if !defined (STM32F405xx) && !defined (STM32F415xx) && !defined (STM32F407xx) && !defined (STM32F417xx) && \
7676
!defined (STM32F427xx) && !defined (STM32F437xx) && !defined (STM32F429xx) && !defined (STM32F439xx) && \
@@ -84,21 +84,21 @@
8484
/* #define STM32F417xx */ /*!< STM32F417VG, STM32F417VE, STM32F417ZG, STM32F417ZE, STM32F417IG and STM32F417IE Devices */
8585
/* #define STM32F427xx */ /*!< STM32F427VG, STM32F427VI, STM32F427ZG, STM32F427ZI, STM32F427IG and STM32F427II Devices */
8686
/* #define STM32F437xx */ /*!< STM32F437VG, STM32F437VI, STM32F437ZG, STM32F437ZI, STM32F437IG and STM32F437II Devices */
87-
/* #define STM32F429xx */ /*!< STM32F429VG, STM32F429VI, STM32F429ZG, STM32F429ZI, STM32F429BG, STM32F429BI, STM32F429NG,
87+
/* #define STM32F429xx */ /*!< STM32F429VG, STM32F429VI, STM32F429ZG, STM32F429ZI, STM32F429BG, STM32F429BI, STM32F429NG,
8888
STM32F439NI, STM32F429IG and STM32F429II Devices */
89-
/* #define STM32F439xx */ /*!< STM32F439VG, STM32F439VI, STM32F439ZG, STM32F439ZI, STM32F439BG, STM32F439BI, STM32F439NG,
89+
/* #define STM32F439xx */ /*!< STM32F439VG, STM32F439VI, STM32F439ZG, STM32F439ZI, STM32F439BG, STM32F439BI, STM32F439NG,
9090
STM32F439NI, STM32F439IG and STM32F439II Devices */
9191
/* #define STM32F401xC */ /*!< STM32F401CB, STM32F401CC, STM32F401RB, STM32F401RC, STM32F401VB and STM32F401VC Devices */
9292
/* #define STM32F401xE */ /*!< STM32F401CD, STM32F401RD, STM32F401VD, STM32F401CE, STM32F401RE and STM32F401VE Devices */
9393
/* #define STM32F410Tx */ /*!< STM32F410T8 and STM32F410TB Devices */
9494
/* #define STM32F410Cx */ /*!< STM32F410C8 and STM32F410CB Devices */
9595
/* #define STM32F410Rx */ /*!< STM32F410R8 and STM32F410RB Devices */
9696
/* #define STM32F411xE */ /*!< STM32F411CC, STM32F411RC, STM32F411VC, STM32F411CE, STM32F411RE and STM32F411VE Devices */
97-
/* #define STM32F446xx */ /*!< STM32F446MC, STM32F446ME, STM32F446RC, STM32F446RE, STM32F446VC, STM32F446VE, STM32F446ZC,
97+
/* #define STM32F446xx */ /*!< STM32F446MC, STM32F446ME, STM32F446RC, STM32F446RE, STM32F446VC, STM32F446VE, STM32F446ZC,
9898
and STM32F446ZE Devices */
99-
/* #define STM32F469xx */ /*!< STM32F469AI, STM32F469II, STM32F469BI, STM32F469NI, STM32F469AG, STM32F469IG, STM32F469BG,
99+
/* #define STM32F469xx */ /*!< STM32F469AI, STM32F469II, STM32F469BI, STM32F469NI, STM32F469AG, STM32F469IG, STM32F469BG,
100100
STM32F469NG, STM32F469AE, STM32F469IE, STM32F469BE and STM32F469NE Devices */
101-
/* #define STM32F479xx */ /*!< STM32F479AI, STM32F479II, STM32F479BI, STM32F479NI, STM32F479AG, STM32F479IG, STM32F479BG
101+
/* #define STM32F479xx */ /*!< STM32F479AI, STM32F479II, STM32F479BI, STM32F479NI, STM32F479AG, STM32F479IG, STM32F479BG
102102
and STM32F479NG Devices */
103103
/* #define STM32F412Cx */ /*!< STM32F412CEU and STM32F412CGU Devices */
104104
/* #define STM32F412Zx */ /*!< STM32F412ZET, STM32F412ZGT, STM32F412ZEJ and STM32F412ZGJ Devices */
@@ -108,25 +108,25 @@
108108
STM32F413RG, STM32F413VG and STM32F413ZG Devices */
109109
/* #define STM32F423xx */ /*!< STM32F423CH, STM32F423RH, STM32F423VH and STM32F423ZH Devices */
110110
#endif
111-
111+
112112
/* Tip: To avoid modifying this file each time you need to switch between these
113113
devices, you can define the device in your toolchain compiler preprocessor.
114114
*/
115115
#if !defined (USE_HAL_DRIVER)
116116
/**
117117
* @brief Comment the line below if you will not use the peripherals drivers.
118-
In this case, these drivers will not be included and the application code will
119-
be based on direct access to peripherals registers
118+
In this case, these drivers will not be included and the application code will
119+
be based on direct access to peripherals registers
120120
*/
121121
/*#define USE_HAL_DRIVER */
122122
#endif /* USE_HAL_DRIVER */
123123

124124
/**
125-
* @brief CMSIS version number V2.6.2
125+
* @brief CMSIS version number V2.6.3
126126
*/
127127
#define __STM32F4xx_CMSIS_VERSION_MAIN (0x02U) /*!< [31:24] main version */
128128
#define __STM32F4xx_CMSIS_VERSION_SUB1 (0x06U) /*!< [23:16] sub1 version */
129-
#define __STM32F4xx_CMSIS_VERSION_SUB2 (0x02U) /*!< [15:8] sub2 version */
129+
#define __STM32F4xx_CMSIS_VERSION_SUB2 (0x03U) /*!< [15:8] sub2 version */
130130
#define __STM32F4xx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
131131
#define __STM32F4xx_CMSIS_VERSION ((__STM32F4xx_CMSIS_VERSION_MAIN << 24)\
132132
|(__STM32F4xx_CMSIS_VERSION_SUB1 << 16)\
@@ -197,24 +197,24 @@
197197

198198
/** @addtogroup Exported_types
199199
* @{
200-
*/
201-
typedef enum
200+
*/
201+
typedef enum
202202
{
203-
RESET = 0U,
203+
RESET = 0U,
204204
SET = !RESET
205205
} FlagStatus, ITStatus;
206206

207-
typedef enum
207+
typedef enum
208208
{
209-
DISABLE = 0U,
209+
DISABLE = 0U,
210210
ENABLE = !DISABLE
211211
} FunctionalState;
212212
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
213213

214-
typedef enum
214+
typedef enum
215215
{
216-
ERROR = 0U,
217-
SUCCESS = !ERROR
216+
SUCCESS = 0U,
217+
ERROR = !SUCCESS
218218
} ErrorStatus;
219219

220220
/**
@@ -239,7 +239,7 @@ typedef enum
239239

240240
#define MODIFY_REG(REG, CLEARMASK, SETMASK) WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK)))
241241

242-
#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL)))
242+
#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL)))
243243

244244

245245
/**
@@ -262,7 +262,7 @@ typedef enum
262262
/**
263263
* @}
264264
*/
265-
265+
266266

267267

268268

system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/system_stm32f4xx.h

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
******************************************************************************
33
* @file system_stm32f4xx.h
44
* @author MCD Application Team
5-
* @brief CMSIS Cortex-M4 Device System Source File for STM32F4xx devices.
6-
******************************************************************************
5+
* @brief CMSIS Cortex-M4 Device System Source File for STM32F4xx devices.
6+
******************************************************************************
77
* @attention
88
*
99
* <h2><center>&copy; COPYRIGHT(c) 2017 STMicroelectronics</center></h2>
@@ -30,17 +30,17 @@
3030
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3131
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3232
*
33-
******************************************************************************
34-
*/
33+
******************************************************************************
34+
*/
3535

3636
/** @addtogroup CMSIS
3737
* @{
3838
*/
3939

4040
/** @addtogroup stm32f4xx_system
4141
* @{
42-
*/
43-
42+
*/
43+
4444
/**
4545
* @brief Define to prevent recursive inclusion
4646
*/
@@ -49,7 +49,7 @@
4949

5050
#ifdef __cplusplus
5151
extern "C" {
52-
#endif
52+
#endif
5353

5454
/** @addtogroup STM32F4xx_System_Includes
5555
* @{
@@ -66,7 +66,7 @@
6666
/* This variable is updated in three ways:
6767
1) by calling CMSIS function SystemCoreClockUpdate()
6868
2) by calling HAL API function HAL_RCC_GetSysClockFreq()
69-
3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
69+
3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
7070
Note: If you use this function to configure the system clock; then there
7171
is no need to call the 2 first functions listed above, since SystemCoreClock
7272
variable is updated automatically.
@@ -99,7 +99,7 @@ extern const uint8_t APBPrescTable[8]; /*!< APB prescalers table values */
9999
/** @addtogroup STM32F4xx_System_Exported_Functions
100100
* @{
101101
*/
102-
102+
103103
extern void SystemInit(void);
104104
extern void SystemCoreClockUpdate(void);
105105
/**
@@ -115,8 +115,8 @@ extern void SystemCoreClockUpdate(void);
115115
/**
116116
* @}
117117
*/
118-
118+
119119
/**
120120
* @}
121-
*/
121+
*/
122122
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

0 commit comments

Comments
 (0)