Skip to content

Commit 22e40f4

Browse files
fpistmfpistm
committed
system(wb) update STM32WBxx HAL Drivers to v1.14.7
Included in STM32CubeWB FW v1.24.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent b5db0ca commit 22e40f4

40 files changed

Lines changed: 534 additions & 458 deletions

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,10 @@ extern "C" {
361361
#if defined(STM32L4R5xx) || defined(STM32L4R9xx) || defined(STM32L4R9xx) || defined(STM32L4S5xx) || \
362362
defined(STM32L4S7xx) || defined(STM32L4S9xx)
363363
#define DMA_REQUEST_DCMI_PSSI DMA_REQUEST_DCMI
364-
#endif
364+
#elif defined(STM32L4P5xx) || defined(STM32L4Q5xx)
365+
#define DMA_REQUEST_PSSI DMA_REQUEST_DCMI_PSSI
366+
#define LL_DMAMUX_REQ_PSSI LL_DMAMUX_REQ_DCMI_PSSI
367+
#endif /* STM32L4R5xx || STM32L4R9xx || STM32L4R9xx || STM32L4S5xx || STM32L4S7xx || STM32L4S9xx */
365368

366369
#endif /* STM32L4 */
367370

@@ -2149,6 +2152,13 @@ extern "C" {
21492152
#define UFB_MODE_BitNumber UFB_MODE_BIT_NUMBER
21502153
#define CMP_PD_BitNumber CMP_PD_BIT_NUMBER
21512154

2155+
#if defined(STM32H7RS) || defined(STM32N6)
2156+
#define FMC_SWAPBMAP_DISABLE FMC_SWAPBANK_MODE0
2157+
#define FMC_SWAPBMAP_SDRAM_SRAM FMC_SWAPBANK_MODE1
2158+
#define HAL_SetFMCMemorySwappingConfig HAL_FMC_SetBankSwapConfig
2159+
#define HAL_GetFMCMemorySwappingConfig HAL_FMC_GetBankSwapConfig
2160+
#endif /* STM32H7RS || STM32N6 */
2161+
21522162
/**
21532163
* @}
21542164
*/

‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cryp.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ extern "C" {
3232
*/
3333

3434

35-
3635
/** @defgroup CRYP CRYP
3736
* @brief CRYP HAL module driver.
3837
* @{

‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cryp_ex.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ extern "C" {
3232
*/
3333

3434

35-
3635
/** @defgroup CRYPEx CRYPEx
3736
* @brief CRYP Extension HAL module driver.
3837
* @{
@@ -93,8 +92,10 @@ extern "C" {
9392
/** @addtogroup CRYPEx_Exported_Functions_Group1
9493
* @{
9594
*/
96-
HAL_StatusTypeDef HAL_CRYPEx_AESGCM_GenerateAuthTAG(CRYP_HandleTypeDef *hcryp, uint32_t *AuthTag, uint32_t Timeout);
97-
HAL_StatusTypeDef HAL_CRYPEx_AESCCM_GenerateAuthTAG(CRYP_HandleTypeDef *hcryp, uint32_t *AuthTag, uint32_t Timeout);
95+
HAL_StatusTypeDef HAL_CRYPEx_AESGCM_GenerateAuthTAG(CRYP_HandleTypeDef *hcryp, const uint32_t *AuthTag,
96+
uint32_t Timeout);
97+
HAL_StatusTypeDef HAL_CRYPEx_AESCCM_GenerateAuthTAG(CRYP_HandleTypeDef *hcryp, const uint32_t *AuthTag,
98+
uint32_t Timeout);
9899

99100
/**
100101
* @}

‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_dma_ex.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ typedef struct
193193

194194
/* ------------------------- REQUEST -----------------------------------------*/
195195
HAL_StatusTypeDef HAL_DMAEx_ConfigMuxRequestGenerator(DMA_HandleTypeDef *hdma,
196-
HAL_DMA_MuxRequestGeneratorConfigTypeDef *pRequestGeneratorConfig);
196+
const HAL_DMA_MuxRequestGeneratorConfigTypeDef *pRequestGeneratorConfig);
197197
HAL_StatusTypeDef HAL_DMAEx_EnableMuxRequestGenerator(DMA_HandleTypeDef *hdma);
198198
HAL_StatusTypeDef HAL_DMAEx_DisableMuxRequestGenerator(DMA_HandleTypeDef *hdma);
199199
/* -------------------------------------------------------------------------- */

‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_exti.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,9 @@ typedef struct
321321
* @{
322322
*/
323323
/* Configuration functions ****************************************************/
324-
HAL_StatusTypeDef HAL_EXTI_SetConfigLine(EXTI_HandleTypeDef *hexti, EXTI_ConfigTypeDef *pExtiConfig);
325-
HAL_StatusTypeDef HAL_EXTI_GetConfigLine(EXTI_HandleTypeDef *hexti, EXTI_ConfigTypeDef *pExtiConfig);
326-
HAL_StatusTypeDef HAL_EXTI_ClearConfigLine(EXTI_HandleTypeDef *hexti);
324+
HAL_StatusTypeDef HAL_EXTI_SetConfigLine(EXTI_HandleTypeDef *hexti, const EXTI_ConfigTypeDef *pExtiConfig);
325+
HAL_StatusTypeDef HAL_EXTI_GetConfigLine(const EXTI_HandleTypeDef *hexti, EXTI_ConfigTypeDef *pExtiConfig);
326+
HAL_StatusTypeDef HAL_EXTI_ClearConfigLine(const EXTI_HandleTypeDef *hexti);
327327
HAL_StatusTypeDef HAL_EXTI_RegisterCallback(EXTI_HandleTypeDef *hexti, EXTI_CallbackIDTypeDef CallbackID, void (*pPendingCbfn)(void));
328328
HAL_StatusTypeDef HAL_EXTI_GetHandle(EXTI_HandleTypeDef *hexti, uint32_t ExtiLine);
329329
/**
@@ -335,10 +335,10 @@ HAL_StatusTypeDef HAL_EXTI_GetHandle(EXTI_HandleTypeDef *hexti, uint32_t ExtiLin
335335
* @{
336336
*/
337337
/* IO operation functions *****************************************************/
338-
void HAL_EXTI_IRQHandler(EXTI_HandleTypeDef *hexti);
339-
uint32_t HAL_EXTI_GetPending(EXTI_HandleTypeDef *hexti, uint32_t Edge);
340-
void HAL_EXTI_ClearPending(EXTI_HandleTypeDef *hexti, uint32_t Edge);
341-
void HAL_EXTI_GenerateSWI(EXTI_HandleTypeDef *hexti);
338+
void HAL_EXTI_IRQHandler(const EXTI_HandleTypeDef *hexti);
339+
uint32_t HAL_EXTI_GetPending(const EXTI_HandleTypeDef *hexti, uint32_t Edge);
340+
void HAL_EXTI_ClearPending(const EXTI_HandleTypeDef *hexti, uint32_t Edge);
341+
void HAL_EXTI_GenerateSWI(const EXTI_HandleTypeDef *hexti);
342342

343343
/**
344344
* @}

‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_gpio.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ typedef enum
285285
*/
286286

287287
/* Initialization and de-initialization functions *****************************/
288-
void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef *GPIO_Init);
288+
void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, const GPIO_InitTypeDef *GPIO_Init);
289289
void HAL_GPIO_DeInit(GPIO_TypeDef *GPIOx, uint32_t GPIO_Pin);
290290

291291
/**
@@ -298,7 +298,7 @@ void HAL_GPIO_DeInit(GPIO_TypeDef *GPIOx, uint32_t GPIO_Pin);
298298
*/
299299

300300
/* IO operation functions *****************************************************/
301-
GPIO_PinState HAL_GPIO_ReadPin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin);
301+
GPIO_PinState HAL_GPIO_ReadPin(const GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin);
302302
void HAL_GPIO_WritePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin, GPIO_PinState PinState);
303303
void HAL_GPIO_WriteMultipleStatePin(GPIO_TypeDef *GPIOx, uint16_t PinReset, uint16_t PinSet);
304304
void HAL_GPIO_TogglePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin);

‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pcd.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ PCD_StateTypeDef HAL_PCD_GetState(PCD_HandleTypeDef const *hpcd);
366366
*/
367367

368368

369-
#define USB_WAKEUP_EXTI_LINE (0x1U << 28) /*!< USB FS EXTI Line WakeUp Interrupt */
369+
#define USB_WAKEUP_EXTI_LINE (0x1UL << 28) /*!< USB FS EXTI Line WakeUp Interrupt */
370370

371371

372372
/**
@@ -418,8 +418,8 @@ PCD_StateTypeDef HAL_PCD_GetState(PCD_HandleTypeDef const *hpcd);
418418
*/
419419

420420
/******************** Bit definition for USB_COUNTn_RX register *************/
421-
#define USB_CNTRX_NBLK_MSK (0x1FU << 10)
422-
#define USB_CNTRX_BLSIZE (0x1U << 15)
421+
#define USB_CNTRX_NBLK_MSK (0x1FUL << 10)
422+
#define USB_CNTRX_BLSIZE (0x1UL << 15)
423423

424424
/* SetENDPOINT */
425425
#define PCD_SET_ENDPOINT(USBx, bEpNum, wRegValue) \
@@ -808,7 +808,7 @@ PCD_StateTypeDef HAL_PCD_GetState(PCD_HandleTypeDef const *hpcd);
808808
\
809809
if ((wCount) == 0U) \
810810
{ \
811-
*(pdwReg) |= USB_CNTRX_BLSIZE; \
811+
*(pdwReg) |= (uint16_t)USB_CNTRX_BLSIZE; \
812812
} \
813813
else if ((wCount) <= 62U) \
814814
{ \

‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_pka.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,8 @@ void HAL_PKA_IRQHandler(PKA_HandleTypeDef *hpka);
541541
* @{
542542
*/
543543
/* Peripheral State and Error functions ***************************************/
544-
HAL_PKA_StateTypeDef HAL_PKA_GetState(PKA_HandleTypeDef *hpka);
545-
uint32_t HAL_PKA_GetError(PKA_HandleTypeDef *hpka);
544+
HAL_PKA_StateTypeDef HAL_PKA_GetState(const PKA_HandleTypeDef *hpka);
545+
uint32_t HAL_PKA_GetError(const PKA_HandleTypeDef *hpka);
546546
/**
547547
* @}
548548
*/

‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_tim.h‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2105,18 +2105,12 @@ mode.
21052105

21062106
#define TIM_CHANNEL_STATE_SET_ALL(__HANDLE__, __CHANNEL_STATE__)\
21072107
do {\
2108-
(__HANDLE__)->ChannelState[0] = \
2109-
(__CHANNEL_STATE__); \
2110-
(__HANDLE__)->ChannelState[1] = \
2111-
(__CHANNEL_STATE__); \
2112-
(__HANDLE__)->ChannelState[2] = \
2113-
(__CHANNEL_STATE__); \
2114-
(__HANDLE__)->ChannelState[3] = \
2115-
(__CHANNEL_STATE__); \
2116-
(__HANDLE__)->ChannelState[4] = \
2117-
(__CHANNEL_STATE__); \
2118-
(__HANDLE__)->ChannelState[5] = \
2119-
(__CHANNEL_STATE__); \
2108+
(__HANDLE__)->ChannelState[0] = (__CHANNEL_STATE__); \
2109+
(__HANDLE__)->ChannelState[1] = (__CHANNEL_STATE__); \
2110+
(__HANDLE__)->ChannelState[2] = (__CHANNEL_STATE__); \
2111+
(__HANDLE__)->ChannelState[3] = (__CHANNEL_STATE__); \
2112+
(__HANDLE__)->ChannelState[4] = (__CHANNEL_STATE__); \
2113+
(__HANDLE__)->ChannelState[5] = (__CHANNEL_STATE__); \
21202114
} while(0)
21212115

21222116
#define TIM_CHANNEL_N_STATE_GET(__HANDLE__, __CHANNEL__)\
@@ -2133,14 +2127,10 @@ mode.
21332127

21342128
#define TIM_CHANNEL_N_STATE_SET_ALL(__HANDLE__, __CHANNEL_STATE__)\
21352129
do {\
2136-
(__HANDLE__)->ChannelNState[0] = \
2137-
(__CHANNEL_STATE__); \
2138-
(__HANDLE__)->ChannelNState[1] = \
2139-
(__CHANNEL_STATE__); \
2140-
(__HANDLE__)->ChannelNState[2] = \
2141-
(__CHANNEL_STATE__); \
2142-
(__HANDLE__)->ChannelNState[3] = \
2143-
(__CHANNEL_STATE__); \
2130+
(__HANDLE__)->ChannelNState[0] = (__CHANNEL_STATE__); \
2131+
(__HANDLE__)->ChannelNState[1] = (__CHANNEL_STATE__); \
2132+
(__HANDLE__)->ChannelNState[2] = (__CHANNEL_STATE__); \
2133+
(__HANDLE__)->ChannelNState[3] = (__CHANNEL_STATE__); \
21442134
} while(0)
21452135

21462136
/**

‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_adc.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -435,11 +435,11 @@ extern "C" {
435435

436436
/* ADC internal channels related definitions */
437437
/* Internal voltage reference VrefInt */
438-
#define VREFINT_CAL_ADDR ((uint16_t*) (0x1FFF75AAUL)) /* Internal voltage reference, address of parameter VREFINT: VrefInt ADC raw data acquired at temperature 30 DegC (tolerance: +-5 DegC), Vref+ = 3.6 V (tolerance: +-10 mV). */
438+
#define VREFINT_CAL_ADDR ((const uint16_t*) (0x1FFF75AAUL)) /* Internal voltage reference, address of parameter VREFINT: VrefInt ADC raw data acquired at temperature 30 DegC (tolerance: +-5 DegC), Vref+ = 3.6 V (tolerance: +-10 mV). */
439439
#define VREFINT_CAL_VREF (3600UL) /* Analog voltage reference (Vref+) value with which temperature sensor has been calibrated in production (tolerance: +-10 mV) (unit: mV). */
440440
/* Temperature sensor */
441-
#define TEMPSENSOR_CAL1_ADDR ((uint16_t*) (0x1FFF75A8UL)) /* Internal temperature sensor, address of parameter TS_CAL1: On STM32WB, temperature sensor ADC raw data acquired at temperature 30 DegC (tolerance: +-5 DegC), Vref+ = 3.0 V (tolerance: +-10 mV). */
442-
#define TEMPSENSOR_CAL2_ADDR ((uint16_t*) (0x1FFF75CAUL)) /* Internal temperature sensor, address of parameter TS_CAL2: On STM32WB, temperature sensor ADC raw data acquired at temperature 130 DegC (tolerance: +-5 DegC), Vref+ = 3.0 V (tolerance: +-10 mV). */
441+
#define TEMPSENSOR_CAL1_ADDR ((const uint16_t*) (0x1FFF75A8UL)) /* Internal temperature sensor, address of parameter TS_CAL1: On STM32WB, temperature sensor ADC raw data acquired at temperature 30 DegC (tolerance: +-5 DegC), Vref+ = 3.0 V (tolerance: +-10 mV). */
442+
#define TEMPSENSOR_CAL2_ADDR ((const uint16_t*) (0x1FFF75CAUL)) /* Internal temperature sensor, address of parameter TS_CAL2: On STM32WB, temperature sensor ADC raw data acquired at temperature 130 DegC (tolerance: +-5 DegC), Vref+ = 3.0 V (tolerance: +-10 mV). */
443443
#define TEMPSENSOR_CAL1_TEMP (30L) /* Internal temperature sensor, temperature at which temperature sensor has been calibrated in production for data into TEMPSENSOR_CAL1_ADDR (tolerance: +-5 DegC) (unit: DegC). */
444444
#define TEMPSENSOR_CAL2_TEMP (130L) /* Internal temperature sensor, temperature at which temperature sensor has been calibrated in production for data into TEMPSENSOR_CAL2_ADDR (tolerance: +-5 DegC) (unit: DegC). */
445445
#define TEMPSENSOR_CAL_VREFANALOG (3000UL) /* Analog voltage reference (Vref+) voltage with which temperature sensor has been calibrated in production (+-10 mV) (unit: mV). */

0 commit comments

Comments
 (0)