Skip to content

Commit bfe639c

Browse files
committed
system(wl3): update STM32WL3x CMSIS Drivers to v1.5.0
Included in STM32CubeWL3 FW v1.5.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 9b8d4cb commit bfe639c

21 files changed

Lines changed: 1049 additions & 205 deletions

‎system/Drivers/CMSIS/Device/ST/STM32WL3x/Include/stm32wl3rx.h‎

Lines changed: 40 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ typedef struct{ /*!< PWR Structure */
398398
__IO uint32_t RESERVED2[10];
399399
__IO uint32_t DBGR; /*!< (@ 0x00000084) DBGR register */
400400
__IO uint32_t EXTSRR; /*!< (@ 0x00000088) EXTSRR register */
401-
__IO uint32_t RESERVED3;
401+
__IO uint32_t DBGSMPS; /*!< (@ 0x0000008C) DBGSMPS register */
402402
__IO uint32_t TRIMR; /*!< (@ 0x00000090) TRIMR register */
403403
__IO uint32_t ENGTRIM; /*!< (@ 0x00000094) ENGTRIM register */
404404
__IO uint32_t RESERVED4[2];
@@ -702,7 +702,7 @@ typedef struct{ /*!< MR_SUBG_RADIO Structure */
702702
__IO uint32_t IQC_CTRL1; /*!< (@ 0x00000044) IQC_CTRL1 register */
703703
__IO uint32_t IQC_CTRL2; /*!< (@ 0x00000048) IQC_CTRL2 register */
704704
__IO uint32_t IQC_CTRL3; /*!< (@ 0x0000004C) IQC_CTRL3 register */
705-
__IO uint32_t RESERVED;
705+
__IO uint32_t AGC_ANA_ENG; /*!< (@ 0x00000050) AGC_ANA_ENG register */
706706
__IO uint32_t AGC0_CTRL; /*!< (@ 0x00000054) AGC0_CTRL register */
707707
__IO uint32_t AGC1_CTRL; /*!< (@ 0x00000058) AGC1_CTRL register */
708708
__IO uint32_t AGC2_CTRL; /*!< (@ 0x0000005C) AGC2_CTRL register */
@@ -906,9 +906,9 @@ typedef struct{ /*!< MR_SUBG_GLOB_RETAINED Structure */
906906

907907
/*!< Peripheral memory map */
908908
#define APB0PERIPH_BASE PERIPH_BASE
909-
#define APB1PERIPH_BASE (PERIPH_BASE + 0x01000000LU)
910-
#define AHBPERIPH_BASE (PERIPH_BASE + 0x08000000LU)
911-
#define APB2PERIPH_BASE (PERIPH_BASE + 0x09000000LU)
909+
#define APB1PERIPH_BASE (PERIPH_BASE + 0x01000000UL)
910+
#define AHBPERIPH_BASE (PERIPH_BASE + 0x08000000UL)
911+
#define APB2PERIPH_BASE (PERIPH_BASE + 0x09000000UL)
912912

913913

914914
/*!< APB0 peripherals */
@@ -7516,6 +7516,19 @@ typedef struct{ /*!< MR_SUBG_GLOB_RETAINED Structure */
75167516
#define PWR_EXTSRR_DEEPSTOPF_Msk (0x200UL) /*!< PWR EXTSRR: DEEPSTOPF (Bitfield-Mask: 0x01) */
75177517
#define PWR_EXTSRR_DEEPSTOPF PWR_EXTSRR_DEEPSTOPF_Msk
75187518

7519+
/* ===================================================== DBGSMPS =====================================================*/
7520+
#define PWR_DBGSMPS_BOF_CUR_SEL_Pos (14UL) /*!<PWR DBGSMPS: BOF_CUR_SEL (Bit 14) */
7521+
#define PWR_DBGSMPS_BOF_CUR_SEL_Msk (0xc000UL) /*!< PWR DBGSMPS: BOF_CUR_SEL (Bitfield-Mask: 0x03) */
7522+
#define PWR_DBGSMPS_BOF_CUR_SEL PWR_DBGSMPS_BOF_CUR_SEL_Msk
7523+
#define PWR_DBGSMPS_BOF_CUR_SEL_0 (0x1U << PWR_DBGSMPS_BOF_CUR_SEL_Pos)
7524+
#define PWR_DBGSMPS_BOF_CUR_SEL_1 (0x2U << PWR_DBGSMPS_BOF_CUR_SEL_Pos)
7525+
#define PWR_DBGSMPS_ILIM_BOOST_Pos (13UL) /*!<PWR DBGSMPS: ILIM_BOOST (Bit 13) */
7526+
#define PWR_DBGSMPS_ILIM_BOOST_Msk (0x2000UL) /*!< PWR DBGSMPS: ILIM_BOOST (Bitfield-Mask: 0x01) */
7527+
#define PWR_DBGSMPS_ILIM_BOOST PWR_DBGSMPS_ILIM_BOOST_Msk
7528+
#define PWR_DBGSMPS_DIS_ILIM_Pos (12UL) /*!<PWR DBGSMPS: DIS_ILIM (Bit 12) */
7529+
#define PWR_DBGSMPS_DIS_ILIM_Msk (0x1000UL) /*!< PWR DBGSMPS: DIS_ILIM (Bitfield-Mask: 0x01) */
7530+
#define PWR_DBGSMPS_DIS_ILIM PWR_DBGSMPS_DIS_ILIM_Msk
7531+
75197532
/* ===================================================== TRIMR =====================================================*/
75207533
#define PWR_TRIMR_SMPS_TRIM_Pos (8UL) /*!<PWR TRIMR: SMPS_TRIM (Bit 8) */
75217534
#define PWR_TRIMR_SMPS_TRIM_Msk (0x700UL) /*!< PWR TRIMR: SMPS_TRIM (Bitfield-Mask: 0x07) */
@@ -7567,18 +7580,6 @@ typedef struct{ /*!< MR_SUBG_GLOB_RETAINED Structure */
75677580
#define PWR_ENGTRIM_TRIMRFDREGEN_Msk (0x1UL) /*!< PWR ENGTRIM: TRIMRFDREGEN (Bitfield-Mask: 0x01) */
75687581
#define PWR_ENGTRIM_TRIMRFDREGEN PWR_ENGTRIM_TRIMRFDREGEN_Msk
75697582

7570-
/* ===================================================== ENGTRIM2 =====================================================*/
7571-
#define PWR_ENGTRIM2_BOF_TRIM_Pos (1UL) /*!<PWR ENGTRIM2: BOF_TRIM (Bit 1) */
7572-
#define PWR_ENGTRIM2_BOF_TRIM_Msk (0xeUL) /*!< PWR ENGTRIM2: BOF_TRIM (Bitfield-Mask: 0x07) */
7573-
#define PWR_ENGTRIM2_BOF_TRIM PWR_ENGTRIM2_BOF_TRIM_Msk
7574-
#define PWR_ENGTRIM2_BOF_TRIM_0 (0x1U << PWR_ENGTRIM2_BOF_TRIM_Pos)
7575-
#define PWR_ENGTRIM2_BOF_TRIM_1 (0x2U << PWR_ENGTRIM2_BOF_TRIM_Pos)
7576-
#define PWR_ENGTRIM2_BOF_TRIM_2 (0x4U << PWR_ENGTRIM2_BOF_TRIM_Pos)
7577-
#define PWR_ENGTRIM2_BOFTRIMEN_Pos (0UL) /*!<PWR ENGTRIM2: BOFTRIMEN (Bit 0) */
7578-
#define PWR_ENGTRIM2_BOFTRIMEN_Msk (0x1UL) /*!< PWR ENGTRIM2: BOFTRIMEN (Bitfield-Mask: 0x01) */
7579-
#define PWR_ENGTRIM2_BOFTRIMEN PWR_ENGTRIM2_BOFTRIMEN_Msk
7580-
7581-
75827583
/* ============================================================================================================================*/
75837584
/*===================== RNG =====================*/
75847585
/* ============================================================================================================================*/
@@ -9050,9 +9051,9 @@ typedef struct{ /*!< MR_SUBG_GLOB_RETAINED Structure */
90509051
#define MR_SUBG_GLOB_DYNAMIC_VCO_CAL_CONFIG_VCO_CALAMP_EXT_13 (0x2000U << MR_SUBG_GLOB_DYNAMIC_VCO_CAL_CONFIG_VCO_CALAMP_EXT_Pos)
90519052

90529053
/* ===================================================== RX_TIMER =====================================================*/
9053-
#define MR_SUBG_GLOB_DYNAMIC_RX_TIMER_RX_OR_nAND_SELECT_Pos (31UL) /*!<MR_SUBG_GLOB_DYNAMIC RX_TIMER: RX_OR_nAND_SELECT (Bit 31) */
9054-
#define MR_SUBG_GLOB_DYNAMIC_RX_TIMER_RX_OR_nAND_SELECT_Msk (0x80000000UL) /*!< MR_SUBG_GLOB_DYNAMIC RX_TIMER: RX_OR_nAND_SELECT (Bitfield-Mask: 0x01) */
9055-
#define MR_SUBG_GLOB_DYNAMIC_RX_TIMER_RX_OR_nAND_SELECT MR_SUBG_GLOB_DYNAMIC_RX_TIMER_RX_OR_nAND_SELECT_Msk
9054+
#define MR_SUBG_GLOB_DYNAMIC_RX_TIMER_RX_OR_NAND_SELECT_Pos (31UL) /*!<MR_SUBG_GLOB_DYNAMIC RX_TIMER: RX_OR_NAND_SELECT (Bit 31) */
9055+
#define MR_SUBG_GLOB_DYNAMIC_RX_TIMER_RX_OR_NAND_SELECT_Msk (0x80000000UL) /*!< MR_SUBG_GLOB_DYNAMIC RX_TIMER: RX_OR_NAND_SELECT (Bitfield-Mask: 0x01) */
9056+
#define MR_SUBG_GLOB_DYNAMIC_RX_TIMER_RX_OR_NAND_SELECT MR_SUBG_GLOB_DYNAMIC_RX_TIMER_RX_OR_NAND_SELECT_Msk
90569057
#define MR_SUBG_GLOB_DYNAMIC_RX_TIMER_RX_SQI_TIMEOUT_MASK_Pos (30UL) /*!<MR_SUBG_GLOB_DYNAMIC RX_TIMER: RX_SQI_TIMEOUT_MASK (Bit 30) */
90579058
#define MR_SUBG_GLOB_DYNAMIC_RX_TIMER_RX_SQI_TIMEOUT_MASK_Msk (0x40000000UL) /*!< MR_SUBG_GLOB_DYNAMIC RX_TIMER: RX_SQI_TIMEOUT_MASK (Bitfield-Mask: 0x01) */
90589059
#define MR_SUBG_GLOB_DYNAMIC_RX_TIMER_RX_SQI_TIMEOUT_MASK MR_SUBG_GLOB_DYNAMIC_RX_TIMER_RX_SQI_TIMEOUT_MASK_Msk
@@ -10902,6 +10903,24 @@ typedef struct{ /*!< MR_SUBG_GLOB_RETAINED Structure */
1090210903
#define MR_SUBG_RADIO_IQC_CTRL3_FAST_TIME_2 (0x4U << MR_SUBG_RADIO_IQC_CTRL3_FAST_TIME_Pos)
1090310904
#define MR_SUBG_RADIO_IQC_CTRL3_FAST_TIME_3 (0x8U << MR_SUBG_RADIO_IQC_CTRL3_FAST_TIME_Pos)
1090410905

10906+
/* ===================================================== AGC_ANA_ENG =====================================================*/
10907+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_PGA_AGCGAIN_Pos (5UL) /*!<MR_SUBG_RADIO AGC_ANA_ENG: RFD_RX_PGA_AGCGAIN (Bit 5) */
10908+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_PGA_AGCGAIN_Msk (0xe0UL) /*!< MR_SUBG_RADIO AGC_ANA_ENG: RFD_RX_PGA_AGCGAIN (Bitfield-Mask: 0x07) */
10909+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_PGA_AGCGAIN MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_PGA_AGCGAIN_Msk
10910+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_PGA_AGCGAIN_0 (0x1U << MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_PGA_AGCGAIN_Pos)
10911+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_PGA_AGCGAIN_1 (0x2U << MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_PGA_AGCGAIN_Pos)
10912+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_PGA_AGCGAIN_2 (0x4U << MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_PGA_AGCGAIN_Pos)
10913+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_ATTEN_AGCGAIN_Pos (1UL) /*!<MR_SUBG_RADIO AGC_ANA_ENG: RFD_RX_ATTEN_AGCGAIN (Bit 1) */
10914+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_ATTEN_AGCGAIN_Msk (0x1eUL) /*!< MR_SUBG_RADIO AGC_ANA_ENG: RFD_RX_ATTEN_AGCGAIN (Bitfield-Mask: 0x0f) */
10915+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_ATTEN_AGCGAIN MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_ATTEN_AGCGAIN_Msk
10916+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_ATTEN_AGCGAIN_0 (0x1U << MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_ATTEN_AGCGAIN_Pos)
10917+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_ATTEN_AGCGAIN_1 (0x2U << MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_ATTEN_AGCGAIN_Pos)
10918+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_ATTEN_AGCGAIN_2 (0x4U << MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_ATTEN_AGCGAIN_Pos)
10919+
#define MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_ATTEN_AGCGAIN_3 (0x8U << MR_SUBG_RADIO_AGC_ANA_ENG_RFD_RX_ATTEN_AGCGAIN_Pos)
10920+
#define MR_SUBG_RADIO_AGC_ANA_ENG_FORCE_AGC_GAINS_Pos (0UL) /*!<MR_SUBG_RADIO AGC_ANA_ENG: FORCE_AGC_GAINS (Bit 0) */
10921+
#define MR_SUBG_RADIO_AGC_ANA_ENG_FORCE_AGC_GAINS_Msk (0x1UL) /*!< MR_SUBG_RADIO AGC_ANA_ENG: FORCE_AGC_GAINS (Bitfield-Mask: 0x01) */
10922+
#define MR_SUBG_RADIO_AGC_ANA_ENG_FORCE_AGC_GAINS MR_SUBG_RADIO_AGC_ANA_ENG_FORCE_AGC_GAINS_Msk
10923+
1090510924
/* ===================================================== AGC0_CTRL =====================================================*/
1090610925
#define MR_SUBG_RADIO_AGC0_CTRL_AGC_EN_Pos (7UL) /*!<MR_SUBG_RADIO AGC0_CTRL: AGC_EN (Bit 7) */
1090710926
#define MR_SUBG_RADIO_AGC0_CTRL_AGC_EN_Msk (0x80UL) /*!< MR_SUBG_RADIO AGC0_CTRL: AGC_EN (Bitfield-Mask: 0x01) */
@@ -11554,7 +11573,7 @@ typedef struct{ /*!< MR_SUBG_GLOB_RETAINED Structure */
1155411573
#define IS_AES_ALL_INSTANCE(INSTANCE) (((INSTANCE) == AES))
1155511574

1155611575

11557-
/** @} */ /* End of group STM32WBL3x_Peripheral_Exported_macros */
11576+
/** @} */ /* End of group STM32WL3x_Peripheral_Exported_macros */
1155811577

1155911578
/** @} */ /* End of group STM32WL3x */
1156011579

‎system/Drivers/CMSIS/Device/ST/STM32WL3x/Include/stm32wl3x.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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:
10-
* - The STM32WBxx device used in the target application
10+
* - The device used in the target application (STM32WL3xx or STM32WL3Rx)
1111
* - To use or not the peripheral's drivers in application code(i.e.
1212
* code will be based on direct access to peripheral's registers
1313
* rather than drivers API), this option is controlled by
@@ -88,8 +88,8 @@
8888
* @brief CMSIS Device version number
8989
*/
9090
#define __STM32WL3x_CMSIS_VERSION_MAIN (0x01U) /*!< [31:24] main version */
91-
#define __STM32WL3x_CMSIS_VERSION_SUB1 (0x03U) /*!< [23:16] sub1 version */
92-
#define __STM32WL3x_CMSIS_VERSION_SUB2 (0x01U) /*!< [15:8] sub2 version */
91+
#define __STM32WL3x_CMSIS_VERSION_SUB1 (0x05U) /*!< [23:16] sub1 version */
92+
#define __STM32WL3x_CMSIS_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
9393
#define __STM32WL3x_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
9494
#define __STM32WL3x_CMSIS_VERSION ((__STM32WL3x_CMSIS_VERSION_MAIN << 24U)\
9595
|(__STM32WL3x_CMSIS_VERSION_SUB1 << 16U)\

0 commit comments

Comments
 (0)