Skip to content

Commit feb0921

Browse files
fpistmfpistm
committed
system(WB) update STM32WBxx HAL Drivers to v1.14.5
Included in STM32CubeWB FW v1.22.0 Signed-off-by: Frederic Pillon <[email protected]>
1 parent 2801e70 commit feb0921

18 files changed

+2580
-2639
lines changed

Diff for: ‎system/Drivers/STM32WBxx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

+13-9
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
@@ -1299,22 +1303,22 @@ extern "C" {
12991303
#define TAMP_SECRETDEVICE_ERASE_ENABLE TAMP_SECRETDEVICE_ERASE_ALL
13001304
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
13011305

1302-
#if defined(STM32F7)
1306+
#if defined(STM32F7) || defined(STM32WB)
13031307
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_ENABLE_BITS_MASK
13041308
#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_IT_ENABLE_BITS_MASK
1305-
#endif /* STM32F7 */
1309+
#endif /* STM32F7 || STM32WB */
13061310

13071311
#if defined(STM32H7)
13081312
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_X
13091313
#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_X_INTERRUPT
13101314
#endif /* STM32H7 */
13111315

1312-
#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0)
1316+
#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0) || defined(STM32WB)
13131317
#define RTC_TAMPER1_INTERRUPT RTC_IT_TAMP1
13141318
#define RTC_TAMPER2_INTERRUPT RTC_IT_TAMP2
13151319
#define RTC_TAMPER3_INTERRUPT RTC_IT_TAMP3
13161320
#define RTC_ALL_TAMPER_INTERRUPT RTC_IT_TAMP
1317-
#endif /* STM32F7 || STM32H7 || STM32L0 */
1321+
#endif /* STM32F7 || STM32H7 || STM32L0 || STM32WB */
13181322

13191323
/**
13201324
* @}
@@ -1481,7 +1485,7 @@ extern "C" {
14811485
#define TIM_TIM3_TI1_COMP1COMP2_OUT TIM_TIM3_TI1_COMP1_COMP2
14821486
#endif
14831487

1484-
#if defined(STM32U5)
1488+
#if defined(STM32U5) || defined(STM32MP2)
14851489
#define OCREF_CLEAR_SELECT_Pos OCREF_CLEAR_SELECT_POS
14861490
#define OCREF_CLEAR_SELECT_Msk OCREF_CLEAR_SELECT_MSK
14871491
#endif
@@ -3948,8 +3952,8 @@ extern "C" {
39483952
*/
39493953
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \
39503954
defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
3951-
defined (STM32WBA) || defined (STM32H5) || \
3952-
defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || defined (STM32U0) || defined (STM32U3)
3955+
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || \
3956+
defined (STM32U0) || defined (STM32U3)
39533957
#else
39543958
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39553959
#endif

Diff for: ‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_hsem.h

+1-21
Original file line numberDiff line numberDiff line change
@@ -52,64 +52,44 @@ extern "C" {
5252
* @param __SEM_MASK__: semaphores Mask
5353
* @retval None.
5454
*/
55-
#if defined(DUAL_CORE)
5655
#define __HAL_HSEM_ENABLE_IT(__SEM_MASK__) ((((SCB->CPUID & 0x000000F0) >> 4 )== 0x7) ? \
5756
(HSEM->C1IER |= (__SEM_MASK__)) : \
5857
(HSEM->C2IER |= (__SEM_MASK__)))
59-
#else
60-
#define __HAL_HSEM_ENABLE_IT(__SEM_MASK__) (HSEM->IER |= (__SEM_MASK__))
61-
#endif /* DUAL_CORE */
6258
/**
6359
* @brief Disables the specified HSEM interrupts.
6460
* @param __SEM_MASK__: semaphores Mask
6561
* @retval None.
6662
*/
67-
#if defined(DUAL_CORE)
6863
#define __HAL_HSEM_DISABLE_IT(__SEM_MASK__) ((((SCB->CPUID & 0x000000F0) >> 4 )== 0x7) ? \
6964
(HSEM->C1IER &= ~(__SEM_MASK__)) : \
7065
(HSEM->C2IER &= ~(__SEM_MASK__)))
71-
#else
72-
#define __HAL_HSEM_DISABLE_IT(__SEM_MASK__) (HSEM->IER &= ~(__SEM_MASK__))
73-
#endif /* DUAL_CORE */
7466

7567
/**
7668
* @brief Checks whether interrupt has occurred or not for semaphores specified by a mask.
7769
* @param __SEM_MASK__: semaphores Mask
7870
* @retval semaphores Mask : Semaphores where an interrupt occurred.
7971
*/
80-
#if defined(DUAL_CORE)
8172
#define __HAL_HSEM_GET_IT(__SEM_MASK__) ((((SCB->CPUID & 0x000000F0) >> 4 )== 0x7) ? \
8273
((__SEM_MASK__) & HSEM->C1MISR) : \
83-
((__SEM_MASK__) & HSEM->C2MISR1))
84-
#else
85-
#define __HAL_HSEM_GET_IT(__SEM_MASK__) ((__SEM_MASK__) & HSEM->MISR)
86-
#endif /* DUAL_CORE */
74+
((__SEM_MASK__) & HSEM->C2MISR))
8775

8876
/**
8977
* @brief Get the semaphores release status flags.
9078
* @param __SEM_MASK__: semaphores Mask
9179
* @retval semaphores Mask : Semaphores where Release flags rise.
9280
*/
93-
#if defined(DUAL_CORE)
9481
#define __HAL_HSEM_GET_FLAG(__SEM_MASK__) ((((SCB->CPUID & 0x000000F0) >> 4 )== 0x7) ? \
9582
(__SEM_MASK__) & HSEM->C1ISR : \
9683
(__SEM_MASK__) & HSEM->C2ISR)
97-
#else
98-
#define __HAL_HSEM_GET_FLAG(__SEM_MASK__) ((__SEM_MASK__) & HSEM->ISR)
99-
#endif /* DUAL_CORE */
10084

10185
/**
10286
* @brief Clears the HSEM Interrupt flags.
10387
* @param __SEM_MASK__: semaphores Mask
10488
* @retval None.
10589
*/
106-
#if defined(DUAL_CORE)
10790
#define __HAL_HSEM_CLEAR_FLAG(__SEM_MASK__) ((((SCB->CPUID & 0x000000F0) >> 4 )== 0x7) ? \
10891
(HSEM->C1ICR |= (__SEM_MASK__)) : \
10992
(HSEM->C2ICR |= (__SEM_MASK__)))
110-
#else
111-
#define __HAL_HSEM_CLEAR_FLAG(__SEM_MASK__) (HSEM->ICR |= (__SEM_MASK__))
112-
#endif /* DUAL_CORE */
11393

11494
/**
11595
* @}

0 commit comments

Comments
 (0)