Skip to content

Commit 8ae7724

Browse files
fpistmfpistm
authored
Merge pull request #1427 from fpistm/CubeUpdate
Update STM32 F1,F2 and L1 HAL and CMSIS drivers
2 parents 626ede3 + 3a9a055 commit 8ae7724

File tree

312 files changed

+14406
-8025
lines changed

Some content is hidden

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

312 files changed

+14406
-8025
lines changed

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xb.h

+8
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,14 @@ typedef struct
641641
* @{
642642
*/
643643

644+
/** @addtogroup Hardware_Constant_Definition
645+
* @{
646+
*/
647+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
648+
/**
649+
* @}
650+
*/
651+
644652
/** @addtogroup Peripheral_Registers_Bits_Definition
645653
* @{
646654
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xe.h

+8
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,14 @@ typedef struct
750750
* @{
751751
*/
752752

753+
/** @addtogroup Hardware_Constant_Definition
754+
* @{
755+
*/
756+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
757+
/**
758+
* @}
759+
*/
760+
753761
/** @addtogroup Peripheral_Registers_Bits_Definition
754762
* @{
755763
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101x6.h

+8
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,14 @@ typedef struct
566566
* @{
567567
*/
568568

569+
/** @addtogroup Hardware_Constant_Definition
570+
* @{
571+
*/
572+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
573+
/**
574+
* @}
575+
*/
576+
569577
/** @addtogroup Peripheral_Registers_Bits_Definition
570578
* @{
571579
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xb.h

+8
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,14 @@ typedef struct
581581
* @{
582582
*/
583583

584+
/** @addtogroup Hardware_Constant_Definition
585+
* @{
586+
*/
587+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
588+
/**
589+
* @}
590+
*/
591+
584592
/** @addtogroup Peripheral_Registers_Bits_Definition
585593
* @{
586594
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xe.h

+8
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,14 @@ typedef struct
750750
* @{
751751
*/
752752

753+
/** @addtogroup Hardware_Constant_Definition
754+
* @{
755+
*/
756+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
757+
/**
758+
* @}
759+
*/
760+
753761
/** @addtogroup Peripheral_Registers_Bits_Definition
754762
* @{
755763
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xg.h

+8
Original file line numberDiff line numberDiff line change
@@ -775,6 +775,14 @@ typedef struct
775775
* @{
776776
*/
777777

778+
/** @addtogroup Hardware_Constant_Definition
779+
* @{
780+
*/
781+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
782+
/**
783+
* @}
784+
*/
785+
778786
/** @addtogroup Peripheral_Registers_Bits_Definition
779787
* @{
780788
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f102x6.h

+8
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,14 @@ typedef struct
606606
* @{
607607
*/
608608

609+
/** @addtogroup Hardware_Constant_Definition
610+
* @{
611+
*/
612+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
613+
/**
614+
* @}
615+
*/
616+
609617
/** @addtogroup Peripheral_Registers_Bits_Definition
610618
* @{
611619
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f102xb.h

+8
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,14 @@ typedef struct
619619
* @{
620620
*/
621621

622+
/** @addtogroup Hardware_Constant_Definition
623+
* @{
624+
*/
625+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
626+
/**
627+
* @}
628+
*/
629+
622630
/** @addtogroup Peripheral_Registers_Bits_Definition
623631
* @{
624632
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h

+8
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,14 @@ typedef struct
681681
* @{
682682
*/
683683

684+
/** @addtogroup Hardware_Constant_Definition
685+
* @{
686+
*/
687+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
688+
/**
689+
* @}
690+
*/
691+
684692
/** @addtogroup Peripheral_Registers_Bits_Definition
685693
* @{
686694
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h

+8
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,14 @@ typedef struct
696696
* @{
697697
*/
698698

699+
/** @addtogroup Hardware_Constant_Definition
700+
* @{
701+
*/
702+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
703+
/**
704+
* @}
705+
*/
706+
699707
/** @addtogroup Peripheral_Registers_Bits_Definition
700708
* @{
701709
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xe.h

+8
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,14 @@ typedef struct
905905
* @{
906906
*/
907907

908+
/** @addtogroup Hardware_Constant_Definition
909+
* @{
910+
*/
911+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
912+
/**
913+
* @}
914+
*/
915+
908916
/** @addtogroup Peripheral_Registers_Bits_Definition
909917
* @{
910918
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xg.h

+8
Original file line numberDiff line numberDiff line change
@@ -924,6 +924,14 @@ typedef struct
924924
* @{
925925
*/
926926

927+
/** @addtogroup Hardware_Constant_Definition
928+
* @{
929+
*/
930+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
931+
/**
932+
* @}
933+
*/
934+
927935
/** @addtogroup Peripheral_Registers_Bits_Definition
928936
* @{
929937
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f105xc.h

+8
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,14 @@ typedef struct
890890
* @{
891891
*/
892892

893+
/** @addtogroup Hardware_Constant_Definition
894+
* @{
895+
*/
896+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
897+
/**
898+
* @}
899+
*/
900+
893901
/** @addtogroup Peripheral_Registers_Bits_Definition
894902
* @{
895903
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f107xc.h

+8
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,14 @@ typedef struct
970970
* @{
971971
*/
972972

973+
/** @addtogroup Hardware_Constant_Definition
974+
* @{
975+
*/
976+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
977+
/**
978+
* @}
979+
*/
980+
973981
/** @addtogroup Peripheral_Registers_Bits_Definition
974982
* @{
975983
*/

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

+57-2
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@
9090
#endif /* USE_HAL_DRIVER */
9191

9292
/**
93-
* @brief CMSIS Device version number V4.3.2
93+
* @brief CMSIS Device version number V4.3.3
9494
*/
9595
#define __STM32F1_CMSIS_VERSION_MAIN (0x04) /*!< [31:24] main version */
9696
#define __STM32F1_CMSIS_VERSION_SUB1 (0x03) /*!< [23:16] sub1 version */
97-
#define __STM32F1_CMSIS_VERSION_SUB2 (0x02) /*!< [15:8] sub2 version */
97+
#define __STM32F1_CMSIS_VERSION_SUB2 (0x03) /*!< [15:8] sub2 version */
9898
#define __STM32F1_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */
9999
#define __STM32F1_CMSIS_VERSION ((__STM32F1_CMSIS_VERSION_MAIN << 24)\
100100
|(__STM32F1_CMSIS_VERSION_SUB1 << 16)\
@@ -191,6 +191,61 @@ typedef enum
191191

192192
#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL)))
193193

194+
/* Use of CMSIS compiler intrinsics for register exclusive access */
195+
/* Atomic 32-bit register access macro to set one or several bits */
196+
#define ATOMIC_SET_BIT(REG, BIT) \
197+
do { \
198+
uint32_t val; \
199+
do { \
200+
val = __LDREXW((__IO uint32_t *)&(REG)) | (BIT); \
201+
} while ((__STREXW(val,(__IO uint32_t *)&(REG))) != 0U); \
202+
} while(0)
203+
204+
/* Atomic 32-bit register access macro to clear one or several bits */
205+
#define ATOMIC_CLEAR_BIT(REG, BIT) \
206+
do { \
207+
uint32_t val; \
208+
do { \
209+
val = __LDREXW((__IO uint32_t *)&(REG)) & ~(BIT); \
210+
} while ((__STREXW(val,(__IO uint32_t *)&(REG))) != 0U); \
211+
} while(0)
212+
213+
/* Atomic 32-bit register access macro to clear and set one or several bits */
214+
#define ATOMIC_MODIFY_REG(REG, CLEARMSK, SETMASK) \
215+
do { \
216+
uint32_t val; \
217+
do { \
218+
val = (__LDREXW((__IO uint32_t *)&(REG)) & ~(CLEARMSK)) | (SETMASK); \
219+
} while ((__STREXW(val,(__IO uint32_t *)&(REG))) != 0U); \
220+
} while(0)
221+
222+
/* Atomic 16-bit register access macro to set one or several bits */
223+
#define ATOMIC_SETH_BIT(REG, BIT) \
224+
do { \
225+
uint16_t val; \
226+
do { \
227+
val = __LDREXH((__IO uint16_t *)&(REG)) | (BIT); \
228+
} while ((__STREXH(val,(__IO uint16_t *)&(REG))) != 0U); \
229+
} while(0)
230+
231+
/* Atomic 16-bit register access macro to clear one or several bits */
232+
#define ATOMIC_CLEARH_BIT(REG, BIT) \
233+
do { \
234+
uint16_t val; \
235+
do { \
236+
val = __LDREXH((__IO uint16_t *)&(REG)) & ~(BIT); \
237+
} while ((__STREXH(val,(__IO uint16_t *)&(REG))) != 0U); \
238+
} while(0)
239+
240+
/* Atomic 16-bit register access macro to clear and set one or several bits */
241+
#define ATOMIC_MODIFYH_REG(REG, CLEARMSK, SETMASK) \
242+
do { \
243+
uint16_t val; \
244+
do { \
245+
val = (__LDREXH((__IO uint16_t *)&(REG)) & ~(CLEARMSK)) | (SETMASK); \
246+
} while ((__STREXH(val,(__IO uint16_t *)&(REG))) != 0U); \
247+
} while(0)
248+
194249

195250
/**
196251
* @}

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32F1xx/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ CMSIS Device F1 | CMSIS Core | Was delivered in the full MCU package
3232
Tag v4.3.1 | Tag v5.4.0_cm3 | Tag v1.8.0
3333
Tag v4.3.1 | Tag v5.4.0_cm3 | Tag v1.8.1
3434
Tag v4.3.2 | Tag v5.4.0_cm3 | Tag v1.8.2
35+
Tag v4.3.3 | Tag v5.4.0_cm3 | Tag v1.8.4
3536

3637
The full **STM32CubeF1** MCU package is available [here](https://github.com/STMicroelectronics/STM32CubeF1).
3738

0 commit comments

Comments
 (0)