Skip to content

Commit 13ddfff

Browse files
fpistmfpistm
committed
system(wba) update STM32WBAxx HAL Drivers to v1.7.0
Included in STM32CubeWBA FW v1.7.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 8da0622 commit 13ddfff

File tree

99 files changed

+24543
-806
lines changed

Some content is hidden

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

99 files changed

+24543
-806
lines changed

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

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,9 @@ extern "C" {
472472
#define TYPEPROGRAMDATA_FASTBYTE FLASH_TYPEPROGRAMDATA_FASTBYTE
473473
#define TYPEPROGRAMDATA_FASTHALFWORD FLASH_TYPEPROGRAMDATA_FASTHALFWORD
474474
#define TYPEPROGRAMDATA_FASTWORD FLASH_TYPEPROGRAMDATA_FASTWORD
475-
#if !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32H7)
475+
#if !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32H7) && !defined(STM32H5)
476476
#define PAGESIZE FLASH_PAGE_SIZE
477-
#endif /* STM32F2 && STM32F4 && STM32F7 && STM32H7 */
477+
#endif /* STM32F2 && STM32F4 && STM32F7 && STM32H7 && STM32H5 */
478478
#define TYPEPROGRAM_FASTBYTE FLASH_TYPEPROGRAM_BYTE
479479
#define TYPEPROGRAM_FASTHALFWORD FLASH_TYPEPROGRAM_HALFWORD
480480
#define TYPEPROGRAM_FASTWORD FLASH_TYPEPROGRAM_WORD
@@ -538,6 +538,10 @@ extern "C" {
538538
#define FLASH_FLAG_WDW FLASH_FLAG_WBNE
539539
#define OB_WRP_SECTOR_All OB_WRP_SECTOR_ALL
540540
#endif /* STM32H7 */
541+
#if defined(STM32H7RS)
542+
#define FLASH_OPTKEY1 FLASH_OPT_KEY1
543+
#define FLASH_OPTKEY2 FLASH_OPT_KEY2
544+
#endif /* STM32H7RS */
541545
#if defined(STM32U5)
542546
#define OB_USER_nRST_STOP OB_USER_NRST_STOP
543547
#define OB_USER_nRST_STDBY OB_USER_NRST_STDBY
@@ -560,6 +564,9 @@ extern "C" {
560564
#define OB_nBOOT0_RESET OB_NBOOT0_RESET
561565
#define OB_nBOOT0_SET OB_NBOOT0_SET
562566
#endif /* STM32U0 */
567+
#if defined(STM32H5)
568+
#define FLASH_ECC_AREA_EDATA FLASH_ECC_AREA_EDATA_BANK1
569+
#endif /* STM32H5 */
563570

564571
/**
565572
* @}
@@ -1279,10 +1286,10 @@ extern "C" {
12791286
#define RTC_TAMPERPIN_PA0 RTC_TAMPERPIN_POS1
12801287
#define RTC_TAMPERPIN_PI8 RTC_TAMPERPIN_POS1
12811288

1282-
#if defined(STM32H5) || defined(STM32H7RS)
1289+
#if defined(STM32H5) || defined(STM32H7RS) || defined(STM32N6)
12831290
#define TAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
12841291
#define TAMP_SECRETDEVICE_ERASE_BKP_SRAM TAMP_DEVICESECRETS_ERASE_BKPSRAM
1285-
#endif /* STM32H5 || STM32H7RS */
1292+
#endif /* STM32H5 || STM32H7RS || STM32N6 */
12861293

12871294
#if defined(STM32WBA)
12881295
#define TAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
@@ -1294,27 +1301,27 @@ extern "C" {
12941301
#define TAMP_SECRETDEVICE_ERASE_ALL TAMP_DEVICESECRETS_ERASE_ALL
12951302
#endif /* STM32WBA */
12961303

1297-
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS)
1304+
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS) || defined(STM32N6)
12981305
#define TAMP_SECRETDEVICE_ERASE_DISABLE TAMP_DEVICESECRETS_ERASE_NONE
12991306
#define TAMP_SECRETDEVICE_ERASE_ENABLE TAMP_SECRETDEVICE_ERASE_ALL
1300-
#endif /* STM32H5 || STM32WBA || STM32H7RS */
1307+
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
13011308

1302-
#if defined(STM32F7)
1309+
#if defined(STM32F7) || defined(STM32WB)
13031310
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_ENABLE_BITS_MASK
13041311
#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_IT_ENABLE_BITS_MASK
1305-
#endif /* STM32F7 */
1312+
#endif /* STM32F7 || STM32WB */
13061313

13071314
#if defined(STM32H7)
13081315
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_X
13091316
#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_X_INTERRUPT
13101317
#endif /* STM32H7 */
13111318

1312-
#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0)
1319+
#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0) || defined(STM32WB)
13131320
#define RTC_TAMPER1_INTERRUPT RTC_IT_TAMP1
13141321
#define RTC_TAMPER2_INTERRUPT RTC_IT_TAMP2
13151322
#define RTC_TAMPER3_INTERRUPT RTC_IT_TAMP3
13161323
#define RTC_ALL_TAMPER_INTERRUPT RTC_IT_TAMP
1317-
#endif /* STM32F7 || STM32H7 || STM32L0 */
1324+
#endif /* STM32F7 || STM32H7 || STM32L0 || STM32WB */
13181325

13191326
/**
13201327
* @}
@@ -1481,7 +1488,7 @@ extern "C" {
14811488
#define TIM_TIM3_TI1_COMP1COMP2_OUT TIM_TIM3_TI1_COMP1_COMP2
14821489
#endif
14831490

1484-
#if defined(STM32U5)
1491+
#if defined(STM32U5) || defined(STM32MP2)
14851492
#define OCREF_CLEAR_SELECT_Pos OCREF_CLEAR_SELECT_POS
14861493
#define OCREF_CLEAR_SELECT_Msk OCREF_CLEAR_SELECT_MSK
14871494
#endif
@@ -2029,12 +2036,12 @@ extern "C" {
20292036
/** @defgroup HAL_RTC_Aliased_Functions HAL RTC Aliased Functions maintained for legacy purpose
20302037
* @{
20312038
*/
2032-
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS)
2039+
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS) || defined(STM32N6)
20332040
#define HAL_RTCEx_SetBoothardwareKey HAL_RTCEx_LockBootHardwareKey
20342041
#define HAL_RTCEx_BKUPBlock_Enable HAL_RTCEx_BKUPBlock
20352042
#define HAL_RTCEx_BKUPBlock_Disable HAL_RTCEx_BKUPUnblock
20362043
#define HAL_RTCEx_Erase_SecretDev_Conf HAL_RTCEx_ConfigEraseDeviceSecrets
2037-
#endif /* STM32H5 || STM32WBA || STM32H7RS */
2044+
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
20382045

20392046
/**
20402047
* @}
@@ -3695,7 +3702,7 @@ extern "C" {
36953702
#endif
36963703

36973704
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || \
3698-
defined(STM32WL) || defined(STM32C0) || defined(STM32H7RS) || defined(STM32U0)
3705+
defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) || defined(STM32U0)
36993706
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
37003707
#else
37013708
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
@@ -3946,7 +3953,8 @@ extern "C" {
39463953
*/
39473954
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \
39483955
defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
3949-
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32H7RS) || defined (STM32U0)
3956+
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32N6) || \
3957+
defined (STM32H7RS) || defined (STM32U0) || defined (STM32U3)
39503958
#else
39513959
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39523960
#endif

‎system/Drivers/STM32WBAxx_HAL_Driver/Inc/stm32wbaxx_hal.h

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ extern HAL_TickFreqTypeDef uwTickFreq;
7878
/**
7979
* @brief STM32WBAxx HAL Driver version number
8080
*/
81-
#define __STM32WBAxx_HAL_VERSION_MAIN (0x01U) /*!< [31:24] main version */
82-
#define __STM32WBAxx_HAL_VERSION_SUB1 (0x05U) /*!< [23:16] sub1 version */
83-
#define __STM32WBAxx_HAL_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
84-
#define __STM32WBAxx_HAL_VERSION_RC (0x00U) /*!< [7:0] release candidate */
81+
#define __STM32WBAxx_HAL_VERSION_MAIN (0x01UL) /*!< [31:24] main version */
82+
#define __STM32WBAxx_HAL_VERSION_SUB1 (0x07UL) /*!< [23:16] sub1 version */
83+
#define __STM32WBAxx_HAL_VERSION_SUB2 (0x00UL) /*!< [15:8] sub2 version */
84+
#define __STM32WBAxx_HAL_VERSION_RC (0x00UL) /*!< [7:0] release candidate */
8585
#define __STM32WBAxx_HAL_VERSION ((__STM32WBAxx_HAL_VERSION_MAIN << 24U)\
8686
|(__STM32WBAxx_HAL_VERSION_SUB1 << 16U)\
8787
|(__STM32WBAxx_HAL_VERSION_SUB2 << 8U )\
@@ -150,6 +150,27 @@ extern HAL_TickFreqTypeDef uwTickFreq;
150150
* @}
151151
*/
152152

153+
#if defined(VREFBUF)
154+
/** @defgroup SYSCFG_VREFBUF_VoltageScale VREFBUF Voltage Scale
155+
* @{
156+
*/
157+
#define SYSCFG_VREFBUF_VOLTAGE_SCALE0 VREFBUF_CSR_VRS_OUT1 /*!< Voltage reference scale 0 (VREF_OUT1) */
158+
#define SYSCFG_VREFBUF_VOLTAGE_SCALE1 VREFBUF_CSR_VRS_OUT2 /*!< Voltage reference scale 1 (VREF_OUT2) */
159+
#define SYSCFG_VREFBUF_VOLTAGE_SCALE2 VREFBUF_CSR_VRS_OUT3 /*!< Voltage reference scale 2 (VREF_OUT3) */
160+
#define SYSCFG_VREFBUF_VOLTAGE_SCALE3 VREFBUF_CSR_VRS_OUT4 /*!< Voltage reference scale 3 (VREF_OUT4) */
161+
/**
162+
* @}
163+
*/
164+
165+
/** @defgroup SYSCFG_VREFBUF_HighImpedance VREFBUF High Impedance
166+
* @{
167+
*/
168+
#define SYSCFG_VREFBUF_HIGH_IMPEDANCE_DISABLE 0x00000000U /*!< VREF_plus pin is internally connected to Voltage reference buffer output */
169+
#define SYSCFG_VREFBUF_HIGH_IMPEDANCE_ENABLE VREFBUF_CSR_HIZ /*!< VREF_plus pin is high impedance */
170+
/**
171+
* @}
172+
*/
173+
#endif /* VREFBUF */
153174

154175
/** @defgroup SYSCFG_Flags_Definition Flags
155176
* @{
@@ -524,6 +545,17 @@ extern HAL_TickFreqTypeDef uwTickFreq;
524545
((__CONFIG__) == SYSCFG_BREAK_SRAM2_PARITY) || \
525546
((__CONFIG__) == SYSCFG_BREAK_LOCKUP))
526547

548+
#if defined(VREFBUF)
549+
#define IS_SYSCFG_VREFBUF_VOLTAGE_SCALE(__SCALE__) (((__SCALE__) == SYSCFG_VREFBUF_VOLTAGE_SCALE0) || \
550+
((__SCALE__) == SYSCFG_VREFBUF_VOLTAGE_SCALE1) || \
551+
((__SCALE__) == SYSCFG_VREFBUF_VOLTAGE_SCALE2) || \
552+
((__SCALE__) == SYSCFG_VREFBUF_VOLTAGE_SCALE3))
553+
554+
#define IS_SYSCFG_VREFBUF_HIGH_IMPEDANCE(__VALUE__) (((__VALUE__) == SYSCFG_VREFBUF_HIGH_IMPEDANCE_DISABLE) || \
555+
((__VALUE__) == SYSCFG_VREFBUF_HIGH_IMPEDANCE_ENABLE))
556+
557+
#define IS_SYSCFG_VREFBUF_TRIMMING(__VALUE__) (((__VALUE__) > 0U) && ((__VALUE__) <= VREFBUF_CCR_TRIM))
558+
#endif /* VREFBUF */
527559

528560
#define IS_SYSCFG_FASTMODEPLUS(__PIN__) ((((__PIN__) & SYSCFG_FASTMODEPLUS_ALL) != 0x00U) && \
529561
(((__PIN__) & ~SYSCFG_FASTMODEPLUS_ALL) == 0x00U))
@@ -646,6 +678,13 @@ void HAL_SYSCFG_DisableIOAnalogSwitchBooster(void);
646678
void HAL_SYSCFG_EnableIOAnalogSwitchVdd(void);
647679
void HAL_SYSCFG_DisableIOAnalogSwitchVdd(void);
648680

681+
#ifdef VREFBUF
682+
void HAL_SYSCFG_VREFBUF_VoltageScalingConfig(uint32_t VoltageScaling);
683+
void HAL_SYSCFG_VREFBUF_HighImpedanceConfig(uint32_t Mode);
684+
void HAL_SYSCFG_VREFBUF_TrimmingConfig(uint32_t TrimmingValue);
685+
HAL_StatusTypeDef HAL_SYSCFG_EnableVREFBUF(void);
686+
void HAL_SYSCFG_DisableVREFBUF(void);
687+
#endif /* VREFBUF */
649688

650689
#ifdef SYSCFG_OTGHSPHYCR_EN
651690
void HAL_SYSCFG_SetOTGPHYReferenceClockSelection(uint32_t RefClockSelection);

‎system/Drivers/STM32WBAxx_HAL_Driver/Inc/stm32wbaxx_hal_conf_template.h

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ extern "C" {
4545
#define HAL_GPIO_MODULE_ENABLED
4646
#define HAL_GTZC_MODULE_ENABLED
4747
#define HAL_HASH_MODULE_ENABLED
48+
#define HAL_HCD_MODULE_ENABLED
4849
#define HAL_HSEM_MODULE_ENABLED
4950
#define HAL_I2C_MODULE_ENABLED
5051
#define HAL_ICACHE_MODULE_ENABLED
5152
#define HAL_IRDA_MODULE_ENABLED
5253
#define HAL_IWDG_MODULE_ENABLED
5354
#define HAL_LPTIM_MODULE_ENABLED
55+
#define HAL_PCD_MODULE_ENABLED
5456
#define HAL_PKA_MODULE_ENABLED
5557
#define HAL_PWR_MODULE_ENABLED
5658
#define HAL_RAMCFG_MODULE_ENABLED
@@ -66,6 +68,7 @@ extern "C" {
6668
#define HAL_UART_MODULE_ENABLED
6769
#define HAL_USART_MODULE_ENABLED
6870
#define HAL_WWDG_MODULE_ENABLED
71+
#define HAL_XSPI_MODULE_ENABLED
6972

7073
/* ########################## Oscillator Values adaptation ####################*/
7174
/**
@@ -159,10 +162,12 @@ extern "C" {
159162
#define USE_HAL_COMP_REGISTER_CALLBACKS 0U /* COMP register callback disabled */
160163
#define USE_HAL_CRYP_REGISTER_CALLBACKS 0U /* CRYP register callback disabled */
161164
#define USE_HAL_HASH_REGISTER_CALLBACKS 0U /* HASH register callback disabled */
165+
#define USE_HAL_HCD_REGISTER_CALLBACKS 0U /* HCD register callback disabled */
162166
#define USE_HAL_I2C_REGISTER_CALLBACKS 0U /* I2C register callback disabled */
163167
#define USE_HAL_IRDA_REGISTER_CALLBACKS 0U /* IRDA register callback disabled */
164168
#define USE_HAL_IWDG_REGISTER_CALLBACKS 0U /* IWDG register callback disabled */
165169
#define USE_HAL_LPTIM_REGISTER_CALLBACKS 0U /* LPTIM register callback disabled */
170+
#define USE_HAL_PCD_REGISTER_CALLBACKS 0U /* PCD register callback disabled */
166171
#define USE_HAL_PKA_REGISTER_CALLBACKS 0U /* PKA register callback disabled */
167172
#define USE_HAL_RAMCFG_REGISTER_CALLBACKS 0U /* RAMCFG register callback disabled */
168173
#define USE_HAL_RNG_REGISTER_CALLBACKS 0U /* RNG register callback disabled */
@@ -176,6 +181,7 @@ extern "C" {
176181
#define USE_HAL_UART_REGISTER_CALLBACKS 0U /* UART register callback disabled */
177182
#define USE_HAL_USART_REGISTER_CALLBACKS 0U /* USART register callback disabled */
178183
#define USE_HAL_WWDG_REGISTER_CALLBACKS 0U /* WWDG register callback disabled */
184+
#define USE_HAL_XSPI_REGISTER_CALLBACKS 0U /* XSPI register callback disabled */
179185

180186
/* ################## SPI peripheral configuration ########################## */
181187

@@ -201,6 +207,10 @@ extern "C" {
201207
#include "stm32wbaxx_hal_dma.h"
202208
#endif /* HAL_DMA_MODULE_ENABLED */
203209

210+
#ifdef HAL_RCC_MODULE_ENABLED
211+
#include "stm32wbaxx_hal_rcc.h"
212+
#endif /* HAL_RCC_MODULE_ENABLED */
213+
204214
#ifdef HAL_ADC_MODULE_ENABLED
205215
#include "stm32wbaxx_hal_adc.h"
206216
#endif /* HAL_ADC_MODULE_ENABLED */
@@ -241,6 +251,10 @@ extern "C" {
241251
#include "stm32wbaxx_hal_hash.h"
242252
#endif /* HAL_HASH_MODULE_ENABLED */
243253

254+
#ifdef HAL_HCD_MODULE_ENABLED
255+
#include "stm32wbaxx_hal_hcd.h"
256+
#endif /* HAL_HCD_MODULE_ENABLED */
257+
244258
#ifdef HAL_HSEM_MODULE_ENABLED
245259
#include "stm32wbaxx_hal_hsem.h"
246260
#endif /* HAL_HSEM_MODULE_ENABLED */
@@ -265,6 +279,10 @@ extern "C" {
265279
#include "stm32wbaxx_hal_lptim.h"
266280
#endif /* HAL_LPTIM_MODULE_ENABLED */
267281

282+
#ifdef HAL_PCD_MODULE_ENABLED
283+
#include "stm32wbaxx_hal_pcd.h"
284+
#endif /* HAL_PCD_MODULE_ENABLED */
285+
268286
#ifdef HAL_PKA_MODULE_ENABLED
269287
#include "stm32wbaxx_hal_pka.h"
270288
#endif /* HAL_PKA_MODULE_ENABLED */
@@ -277,10 +295,6 @@ extern "C" {
277295
#include "stm32wbaxx_hal_ramcfg.h"
278296
#endif /* HAL_RAMCFG_MODULE_ENABLED */
279297

280-
#ifdef HAL_RCC_MODULE_ENABLED
281-
#include "stm32wbaxx_hal_rcc.h"
282-
#endif /* HAL_RCC_MODULE_ENABLED */
283-
284298
#ifdef HAL_RNG_MODULE_ENABLED
285299
#include "stm32wbaxx_hal_rng.h"
286300
#endif /* HAL_RNG_MODULE_ENABLED */
@@ -325,6 +339,9 @@ extern "C" {
325339
#include "stm32wbaxx_hal_wwdg.h"
326340
#endif /* HAL_WWDG_MODULE_ENABLED */
327341

342+
#ifdef HAL_XSPI_MODULE_ENABLED
343+
#include "stm32wbaxx_hal_xspi.h"
344+
#endif /* HAL_XSPI_MODULE_ENABLED */
328345

329346
/* Exported macro ------------------------------------------------------------*/
330347
#ifdef USE_FULL_ASSERT

‎system/Drivers/STM32WBAxx_HAL_Driver/Inc/stm32wbaxx_hal_cortex.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ typedef struct
114114
#define SYSTICK_CLKSOURCE_LSI 0x00000001U /*!< LSI clock selected as SysTick clock source */
115115
#define SYSTICK_CLKSOURCE_LSE 0x00000002U /*!< LSE clock selected as SysTick clock source */
116116
#define SYSTICK_CLKSOURCE_HCLK 0x00000004U /*!< AHB clock selected as SysTick clock source */
117+
#if !defined (STM32WBA50xx) && !defined (STM32WBA52xx) && !defined (STM32WBA54xx) && !defined (STM32WBA55xx) && !defined (STM32WBA5Mxx)
118+
#define SYSTICK_CLKSOURCE_HSI_DIV4 0x00000008U /*!< HSI clock divided by 4 selected as SysTick clock source */
119+
#endif
117120
/**
118121
* @}
119122
*/
@@ -333,10 +336,18 @@ void HAL_MPU_ConfigMemoryAttributes_NS(MPU_Attributes_InitTypeDef *MPU_Attribute
333336

334337
#define IS_NVIC_DEVICE_IRQ(IRQ) ((IRQ) > SysTick_IRQn)
335338

339+
#if !defined (STM32WBA50xx) && !defined (STM32WBA52xx) && !defined (STM32WBA54xx) && !defined (STM32WBA55xx) && !defined (STM32WBA5Mxx)
340+
#define IS_SYSTICK_CLK_SOURCE(SOURCE) (((SOURCE) == SYSTICK_CLKSOURCE_LSI) || \
341+
((SOURCE) == SYSTICK_CLKSOURCE_LSE) || \
342+
((SOURCE) == SYSTICK_CLKSOURCE_HCLK) || \
343+
((SOURCE) == SYSTICK_CLKSOURCE_HCLK_DIV8)|| \
344+
((SOURCE) == SYSTICK_CLKSOURCE_HSI_DIV4))
345+
#else
336346
#define IS_SYSTICK_CLK_SOURCE(SOURCE) (((SOURCE) == SYSTICK_CLKSOURCE_LSI) || \
337347
((SOURCE) == SYSTICK_CLKSOURCE_LSE) || \
338348
((SOURCE) == SYSTICK_CLKSOURCE_HCLK)|| \
339349
((SOURCE) == SYSTICK_CLKSOURCE_HCLK_DIV8))
350+
#endif
340351

341352
#define IS_MPU_REGION_ENABLE(STATE) (((STATE) == MPU_REGION_ENABLE) || \
342353
((STATE) == MPU_REGION_DISABLE))

‎system/Drivers/STM32WBAxx_HAL_Driver/Inc/stm32wbaxx_hal_cryp.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -484,25 +484,25 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
484484
* @arg @ref CRYP_FLAG_KEIF Key error flag
485485
* @arg @ref CRYP_FLAG_RWEIF Read/write Error flag
486486
487-
* @retval The state of __FLAG__ (TRUE or FALSE).
487+
* @retval The state of __FLAG__ (FlagStatus).
488488
*/
489489

490490
#define __HAL_CRYP_GET_FLAG(__HANDLE__, __FLAG__) (\
491-
((__FLAG__) == CRYP_FLAG_KEYVALID )?(((__HANDLE__)->Instance->SR \
492-
& (CRYP_FLAG_KEYVALID)) == (CRYP_FLAG_KEYVALID)) : \
493-
((__FLAG__) == CRYP_FLAG_BUSY )?(((__HANDLE__)->Instance->SR \
494-
& (CRYP_FLAG_BUSY)) == (CRYP_FLAG_BUSY)) : \
495-
((__FLAG__) == CRYP_FLAG_WRERR )?(((__HANDLE__)->Instance->SR \
491+
((__FLAG__) == CRYP_FLAG_KEYVALID )?((((__HANDLE__)->Instance->SR \
492+
& (CRYP_FLAG_KEYVALID)) == (CRYP_FLAG_KEYVALID))?SET:RESET) : \
493+
((__FLAG__) == CRYP_FLAG_BUSY )?((((__HANDLE__)->Instance->SR \
494+
& (CRYP_FLAG_BUSY)) == (CRYP_FLAG_BUSY))?SET:RESET) : \
495+
((__FLAG__) == CRYP_FLAG_WRERR )?((((__HANDLE__)->Instance->SR \
496496
& (CRYP_FLAG_WRERR & 0x7FFFFFFFU)) == \
497-
(CRYP_FLAG_WRERR & 0x7FFFFFFFU)) : \
498-
((__FLAG__) == CRYP_FLAG_RDERR )?(((__HANDLE__)->Instance->SR \
497+
(CRYP_FLAG_WRERR & 0x7FFFFFFFU))?SET:RESET) : \
498+
((__FLAG__) == CRYP_FLAG_RDERR )?((((__HANDLE__)->Instance->SR \
499499
& (CRYP_FLAG_RDERR & 0x7FFFFFFFU)) == \
500-
(CRYP_FLAG_RDERR & 0x7FFFFFFFU)) : \
501-
((__FLAG__) == CRYP_FLAG_KEIF )?(((__HANDLE__)->Instance->ISR \
502-
& (CRYP_FLAG_KEIF)) == (CRYP_FLAG_KEIF)) : \
503-
((__FLAG__) == CRYP_FLAG_RWEIF )?(((__HANDLE__)->Instance->ISR \
504-
& (CRYP_FLAG_RWEIF)) == (CRYP_FLAG_RWEIF)) : \
505-
(((__HANDLE__)->Instance->ISR & (CRYP_FLAG_CCF)) == (CRYP_FLAG_CCF)))
500+
(CRYP_FLAG_RDERR & 0x7FFFFFFFU))?SET:RESET) : \
501+
((__FLAG__) == CRYP_FLAG_KEIF )?((((__HANDLE__)->Instance->ISR \
502+
& (CRYP_FLAG_KEIF)) == (CRYP_FLAG_KEIF))?SET:RESET) : \
503+
((__FLAG__) == CRYP_FLAG_RWEIF )?((((__HANDLE__)->Instance->ISR \
504+
& (CRYP_FLAG_RWEIF)) == (CRYP_FLAG_RWEIF))?SET:RESET) : \
505+
((((__HANDLE__)->Instance->ISR & (CRYP_FLAG_CCF)) == (CRYP_FLAG_CCF)))?SET:RESET)
506506

507507
/** @brief Clear the CRYP pending status flag.
508508
* @param __HANDLE__ specifies the CRYP handle.

0 commit comments

Comments
 (0)