Skip to content

Commit 9b8d4cb

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

38 files changed

Lines changed: 1448 additions & 627 deletions

‎system/Drivers/STM32WL3x_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ extern "C" {
363363
#define DMA_REQUEST_DCMI_PSSI DMA_REQUEST_DCMI
364364
#elif defined(STM32L4P5xx) || defined(STM32L4Q5xx)
365365
#define DMA_REQUEST_PSSI DMA_REQUEST_DCMI_PSSI
366-
#define LL_DMAMUX_REQ_PSSI LL_DMAMUX_REQ_DCMI_PSSI
367366
#endif /* STM32L4R5xx || STM32L4R9xx || STM32L4R9xx || STM32L4S5xx || STM32L4S7xx || STM32L4S9xx */
368367

369368
#endif /* STM32L4 */
@@ -1918,7 +1917,11 @@ extern "C" {
19181917
#define HAL_PWREx_DisableSDADCAnalog HAL_PWREx_DisableSDADC
19191918
#define HAL_PWREx_EnableSDADCAnalog HAL_PWREx_EnableSDADC
19201919
#define HAL_PWREx_PVMConfig HAL_PWREx_ConfigPVM
1921-
1920+
#if defined(STM32G0C1xx) || defined(STM32G0B1xx)
1921+
#define PWR_PVM_USB PWR_PVM_ENABLE
1922+
#define PWR_FLAG_PVMOUSB PWR_FLAG_PVMOVDDIO2
1923+
#define PWR_FLAG_PVMO_USB PWR_FLAG_PVMO_VDDIO2
1924+
#endif /* STM32G0C1xx || STM32G0B1xx */
19221925
#define PWR_MODE_NORMAL PWR_PVD_MODE_NORMAL
19231926
#define PWR_MODE_IT_RISING PWR_PVD_MODE_IT_RISING
19241927
#define PWR_MODE_IT_FALLING PWR_PVD_MODE_IT_FALLING
@@ -2031,6 +2034,9 @@ extern "C" {
20312034

20322035
#define PWR_ALL_RAM_RUN_RETENTION_MASK PWR_ALL_RAM_RUN_MASK
20332036
#endif
2037+
#if defined (STM32H7RS)
2038+
#define PWR_SMPS_1V8_SUPPLIES_EXT_AND_LDO PWR_SMPS_1V8_SUPPLIES_EXT_VDD_SUPPLIES_LDO
2039+
#endif
20342040

20352041
/**
20362042
* @}
@@ -2159,6 +2165,13 @@ extern "C" {
21592165
#define HAL_GetFMCMemorySwappingConfig HAL_FMC_GetBankSwapConfig
21602166
#endif /* STM32H7RS || STM32N6 */
21612167

2168+
#if defined(STM32N6)
2169+
/* alias CMSIS */
2170+
#define CSI_PCR_PWRDOWN_Pos CSI_PCR_NPWRDOWN_Pos
2171+
#define CSI_PCR_PWRDOWN_Msk CSI_PCR_NPWRDOWN_Msk
2172+
#define CSI_PCR_PWRDOWN CSI_PCR_NPWRDOWN
2173+
#endif /* STM32N6 */
2174+
21622175
/**
21632176
* @}
21642177
*/

‎system/Drivers/STM32WL3x_HAL_Driver/Inc/stm32wl3x_hal.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ extern "C" {
4848
* @brief HAL Driver version number
4949
*/
5050
#define __STM32WL3X_HAL_VERSION_MAIN (0x01U) /*!< [31:24] main version */
51-
#define __STM32WL3X_HAL_VERSION_SUB1 (0x03U) /*!< [23:16] sub1 version */
52-
#define __STM32WL3X_HAL_VERSION_SUB2 (0x01U) /*!< [15:8] sub2 version */
51+
#define __STM32WL3X_HAL_VERSION_SUB1 (0x05U) /*!< [23:16] sub1 version */
52+
#define __STM32WL3X_HAL_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
5353
#define __STM32WL3X_HAL_VERSION_RC (0x00U) /*!< [7:0] release candidate */
5454
#define __STM32WL3X_HAL_VERSION ((__STM32WL3X_HAL_VERSION_MAIN << 24U)\
5555
|(__STM32WL3X_HAL_VERSION_SUB1 << 16U)\

‎system/Drivers/STM32WL3x_HAL_Driver/Inc/stm32wl3x_hal_gpio.h‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ typedef enum
139139
* @brief GPIO Output Maximum frequency
140140
* @{
141141
*/
142-
#define GPIO_SPEED_FREQ_LOW 0x00000000u /*!< Low speed */
143-
#define GPIO_SPEED_FREQ_MEDIUM 0x00000001u /*!< Medium speed */
144-
#define GPIO_SPEED_FREQ_HIGH 0x00000002u /*!< High speed */
145-
#define GPIO_SPEED_FREQ_VERY_HIGH 0x00000003u /*!< Very high speed */
142+
#define GPIO_SPEED_FREQ_LOW 0x00000000U /*!< Low speed */
143+
#define GPIO_SPEED_FREQ_MEDIUM 0x00000001U /*!< Medium speed */
144+
#define GPIO_SPEED_FREQ_HIGH 0x00000002U /*!< High speed */
145+
#define GPIO_SPEED_FREQ_VERY_HIGH 0x00000003U /*!< Very high speed */
146146
/**
147147
* @}
148148
*/
@@ -151,9 +151,9 @@ typedef enum
151151
* @brief GPIO Pull-Up or Pull-Down Activation
152152
* @{
153153
*/
154-
#define GPIO_NOPULL 0x00000000u /*!< No Pull-up or Pull-down activation */
155-
#define GPIO_PULLUP 0x00000001u /*!< Pull-up activation */
156-
#define GPIO_PULLDOWN 0x00000002u /*!< Pull-down activation */
154+
#define GPIO_NOPULL 0x00000000U /*!< No Pull-up or Pull-down activation */
155+
#define GPIO_PULLUP 0x00000001U /*!< Pull-up activation */
156+
#define GPIO_PULLDOWN 0x00000002U /*!< Pull-down activation */
157157
/**
158158
* @}
159159
*/
@@ -215,36 +215,36 @@ typedef enum
215215
/** @defgroup GPIO_Private_Constants GPIO Private Constants
216216
* @{
217217
*/
218-
#define GPIO_MODE_Pos 0u
219-
#define GPIO_MODE (0x3uL << GPIO_MODE_Pos)
220-
#define MODE_INPUT (0x0uL << GPIO_MODE_Pos)
221-
#define MODE_OUTPUT (0x1uL << GPIO_MODE_Pos)
222-
#define MODE_AF (0x2uL << GPIO_MODE_Pos)
223-
#define MODE_ANALOG (0x3uL << GPIO_MODE_Pos)
224-
#define OUTPUT_TYPE_Pos 4u
225-
#define OUTPUT_TYPE (0x1uL << OUTPUT_TYPE_Pos)
226-
#define OUTPUT_PP (0x0uL << OUTPUT_TYPE_Pos)
227-
#define OUTPUT_OD (0x1uL << OUTPUT_TYPE_Pos)
228-
#define EXTI_MODE_Pos 16u
229-
#define EXTI_MODE (0x3uL << EXTI_MODE_Pos)
230-
#define EXTI_IT (0x1uL << EXTI_MODE_Pos)
231-
#define EXTI_EVT (0x2uL << EXTI_MODE_Pos)
232-
#define DETECTION_TYPE_Pos 18u
233-
#define DETECTION_TYPE (0x1uL << DETECTION_TYPE_Pos)
234-
#define DETECTION_TYPE_EDGE (0x0uL << DETECTION_TYPE_Pos)
235-
#define DETECTION_TYPE_LEVEL (0x1uL << DETECTION_TYPE_Pos)
236-
#define EDGE_SELECTION_Pos 20u
237-
#define EDGE_SELECTION (0x1uL << EDGE_SELECTION_Pos)
238-
#define EDGE_SELECTION_SINGLE (0x0uL << EDGE_SELECTION_Pos)
239-
#define EDGE_SELECTION_BOTH (0x1uL << EDGE_SELECTION_Pos)
240-
#define TRIGGER_MODE_Pos 22u
241-
#define TRIGGER_MODE (0x1uL << TRIGGER_MODE_Pos)
242-
#define TRIGGER_RISING (0x1uL << TRIGGER_MODE_Pos)
243-
#define TRIGGER_FALLING (0x0uL << TRIGGER_MODE_Pos)
244-
#define EDGE_LEVEL_Pos 24u
245-
#define EDGE_LEVEL (0x1uL << EDGE_LEVEL_Pos)
246-
#define EDGE_LOW (0x0uL << EDGE_LEVEL_Pos)
247-
#define EDGE_HIGH (0x1uL << EDGE_LEVEL_Pos)
218+
#define GPIO_MODE_Pos 0U
219+
#define GPIO_MODE (0x3UL << GPIO_MODE_Pos)
220+
#define MODE_INPUT (0x0UL << GPIO_MODE_Pos)
221+
#define MODE_OUTPUT (0x1UL << GPIO_MODE_Pos)
222+
#define MODE_AF (0x2UL << GPIO_MODE_Pos)
223+
#define MODE_ANALOG (0x3UL << GPIO_MODE_Pos)
224+
#define OUTPUT_TYPE_Pos 4U
225+
#define OUTPUT_TYPE (0x1UL << OUTPUT_TYPE_Pos)
226+
#define OUTPUT_PP (0x0UL << OUTPUT_TYPE_Pos)
227+
#define OUTPUT_OD (0x1UL << OUTPUT_TYPE_Pos)
228+
#define EXTI_MODE_Pos 16U
229+
#define EXTI_MODE (0x3UL << EXTI_MODE_Pos)
230+
#define EXTI_IT (0x1UL << EXTI_MODE_Pos)
231+
#define EXTI_EVT (0x2UL << EXTI_MODE_Pos)
232+
#define DETECTION_TYPE_Pos 18U
233+
#define DETECTION_TYPE (0x1UL << DETECTION_TYPE_Pos)
234+
#define DETECTION_TYPE_EDGE (0x0UL << DETECTION_TYPE_Pos)
235+
#define DETECTION_TYPE_LEVEL (0x1UL << DETECTION_TYPE_Pos)
236+
#define EDGE_SELECTION_Pos 20U
237+
#define EDGE_SELECTION (0x1UL << EDGE_SELECTION_Pos)
238+
#define EDGE_SELECTION_SINGLE (0x0UL << EDGE_SELECTION_Pos)
239+
#define EDGE_SELECTION_BOTH (0x1UL << EDGE_SELECTION_Pos)
240+
#define TRIGGER_MODE_Pos 22U
241+
#define TRIGGER_MODE (0x1UL << TRIGGER_MODE_Pos)
242+
#define TRIGGER_RISING (0x1UL << TRIGGER_MODE_Pos)
243+
#define TRIGGER_FALLING (0x0UL << TRIGGER_MODE_Pos)
244+
#define EDGE_LEVEL_Pos 24U
245+
#define EDGE_LEVEL (0x1UL << EDGE_LEVEL_Pos)
246+
#define EDGE_LOW (0x0UL << EDGE_LEVEL_Pos)
247+
#define EDGE_HIGH (0x1UL << EDGE_LEVEL_Pos)
248248
/**
249249
* @}
250250
*/
@@ -254,11 +254,11 @@ typedef enum
254254
*/
255255
#define IS_GPIO_PIN_ACTION(ACTION) (((ACTION) == GPIO_PIN_RESET) || ((ACTION) == GPIO_PIN_SET))
256256

257-
#define IS_GPIO_PIN(__PIN__) ((((uint32_t)(__PIN__) & GPIO_PIN_MASK) != 0x00u) &&\
258-
(((uint32_t)(__PIN__) & ~GPIO_PIN_MASK) == 0x00u))
257+
#define IS_GPIO_PIN(__PIN__) ((((uint32_t)(__PIN__) & GPIO_PIN_MASK) != 0x00U) &&\
258+
(((uint32_t)(__PIN__) & ~GPIO_PIN_MASK) == 0x00U))
259259

260260
#define IS_GPIO_COMMON_PIN(__RESETMASK__, __SETMASK__) \
261-
(((uint32_t)(__RESETMASK__) & (uint32_t)(__SETMASK__)) == 0x00u)
261+
(((uint32_t)(__RESETMASK__) & (uint32_t)(__SETMASK__)) == 0x00U)
262262

263263

264264
#define IS_GPIO_MODE(__MODE__) (((__MODE__) == GPIO_MODE_INPUT) ||\

‎system/Drivers/STM32WL3x_HAL_Driver/Inc/stm32wl3x_hal_gpio_ex.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ extern "C" {
139139
* @{
140140
*/
141141

142-
#define GPIO_GET_INDEX(__GPIOx__) (((__GPIOx__) == (GPIOA))? 0uL : 1uL)
142+
#define GPIO_GET_INDEX(__GPIOx__) (((__GPIOx__) == (GPIOA))? 0UL : 1UL)
143143

144144
/**
145145
* @}

‎system/Drivers/STM32WL3x_HAL_Driver/Inc/stm32wl3x_hal_i2c_ex.h‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -130,23 +130,31 @@ void HAL_I2CEx_DisableFastModePlus(uint32_t ConfigFastModePlus);
130130

131131
#define IS_I2C_DIGITAL_FILTER(FILTER) ((FILTER) <= 0x0000000FU)
132132

133-
#if defined(I2C1)
133+
#if defined(I2C1) && defined(I2C2)
134134
#define IS_I2C_FASTMODEPLUS(__CONFIG__) ( \
135-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PB7)) == I2C_FASTMODEPLUS_PB7) || \
136-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA0)) == I2C_FASTMODEPLUS_PA0) || \
137-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA1)) == I2C_FASTMODEPLUS_PA1) || \
138-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PB10)) == I2C_FASTMODEPLUS_PB10) || \
139-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PB11)) == I2C_FASTMODEPLUS_PB11) )
140-
#endif /* I2C1 */
141-
142-
#if defined(I2C2)
135+
(((__CONFIG__) & I2C_FASTMODEPLUS_PB7) == I2C_FASTMODEPLUS_PB7) || \
136+
(((__CONFIG__) & I2C_FASTMODEPLUS_PA0) == I2C_FASTMODEPLUS_PA0) || \
137+
(((__CONFIG__) & I2C_FASTMODEPLUS_PA1) == I2C_FASTMODEPLUS_PA1) || \
138+
(((__CONFIG__) & I2C_FASTMODEPLUS_PB10) == I2C_FASTMODEPLUS_PB10) || \
139+
(((__CONFIG__) & I2C_FASTMODEPLUS_PB11) == I2C_FASTMODEPLUS_PB11) || \
140+
(((__CONFIG__) & I2C_FASTMODEPLUS_PA6) == I2C_FASTMODEPLUS_PA6) || \
141+
(((__CONFIG__) & I2C_FASTMODEPLUS_PA7) == I2C_FASTMODEPLUS_PA7) || \
142+
(((__CONFIG__) & I2C_FASTMODEPLUS_PA13) == I2C_FASTMODEPLUS_PA13) || \
143+
(((__CONFIG__) & I2C_FASTMODEPLUS_PA14) == I2C_FASTMODEPLUS_PA14) )
144+
#elif defined(I2C1)
143145
#define IS_I2C_FASTMODEPLUS(__CONFIG__) ( \
144-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA6)) == I2C_FASTMODEPLUS_PA6) || \
145-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA7)) == I2C_FASTMODEPLUS_PA7) || \
146-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA13)) == I2C_FASTMODEPLUS_PA13) || \
147-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA14)) == I2C_FASTMODEPLUS_PA14) )
148-
#endif /* I2C2 */
149-
146+
(((__CONFIG__) & I2C_FASTMODEPLUS_PB7) == I2C_FASTMODEPLUS_PB7) || \
147+
(((__CONFIG__) & I2C_FASTMODEPLUS_PA0) == I2C_FASTMODEPLUS_PA0) || \
148+
(((__CONFIG__) & I2C_FASTMODEPLUS_PA1) == I2C_FASTMODEPLUS_PA1) || \
149+
(((__CONFIG__) & I2C_FASTMODEPLUS_PB10) == I2C_FASTMODEPLUS_PB10) || \
150+
(((__CONFIG__) & I2C_FASTMODEPLUS_PB11) == I2C_FASTMODEPLUS_PB11) )
151+
#elif defined(I2C2)
152+
#define IS_I2C_FASTMODEPLUS(__CONFIG__) ( \
153+
(((__CONFIG__) & I2C_FASTMODEPLUS_PA6) == I2C_FASTMODEPLUS_PA6) || \
154+
(((__CONFIG__) & I2C_FASTMODEPLUS_PA7) == I2C_FASTMODEPLUS_PA7) || \
155+
(((__CONFIG__) & I2C_FASTMODEPLUS_PA13) == I2C_FASTMODEPLUS_PA13) || \
156+
(((__CONFIG__) & I2C_FASTMODEPLUS_PA14) == I2C_FASTMODEPLUS_PA14) )
157+
#endif
150158
/**
151159
* @}
152160
*/

‎system/Drivers/STM32WL3x_HAL_Driver/Inc/stm32wl3x_hal_i2s.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ extern "C" {
2727
/* Includes ------------------------------------------------------------------*/
2828
#include "stm32wl3x_hal_def.h"
2929

30-
#if defined(SPI_I2S_SUPPORT)
3130
/** @addtogroup STM32WL3x_HAL_Driver
3231
* @{
3332
*/
@@ -452,8 +451,8 @@ void HAL_I2S_ErrorCallback(I2S_HandleTypeDef *hi2s);
452451
* @{
453452
*/
454453
/* Peripheral Control and State functions ************************************/
455-
HAL_I2S_StateTypeDef HAL_I2S_GetState(I2S_HandleTypeDef *hi2s);
456-
uint32_t HAL_I2S_GetError(I2S_HandleTypeDef *hi2s);
454+
HAL_I2S_StateTypeDef HAL_I2S_GetState(const I2S_HandleTypeDef *hi2s);
455+
uint32_t HAL_I2S_GetError(const I2S_HandleTypeDef *hi2s);
457456
/**
458457
* @}
459458
*/
@@ -544,7 +543,6 @@ uint32_t HAL_I2S_GetError(I2S_HandleTypeDef *hi2s);
544543
/**
545544
* @}
546545
*/
547-
#endif /* SPI_I2S_SUPPORT */
548546

549547
#ifdef __cplusplus
550548
}

0 commit comments

Comments
 (0)