Skip to content

Commit cec4ee1

Browse files
committed
[WB] Update STM32WBxx HAL Drivers to v1.3.0
Included in STM32CubeWB FW V1.3.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 23aded7 commit cec4ee1

30 files changed

+690
-431
lines changed

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

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,9 @@
460460
#define FLASH_FLAG_SNECCE_BANK2RR FLASH_FLAG_SNECCERR_BANK2
461461
#define FLASH_FLAG_DBECCE_BANK2RR FLASH_FLAG_DBECCERR_BANK2
462462
#define FLASH_FLAG_STRBER_BANK2R FLASH_FLAG_STRBERR_BANK2
463-
#endif
463+
#define FLASH_FLAG_WDW FLASH_FLAG_WBNE
464+
#define OB_WRP_SECTOR_All OB_WRP_SECTOR_ALL
465+
#endif /* STM32H7 */
464466

465467
/**
466468
* @}
@@ -735,6 +737,33 @@
735737
#define HRTIM_OUTPUTRESET_TIMFEV8_TIMECMP2 HRTIM_OUTPUTSET_TIMEV_8
736738
#define HRTIM_OUTPUTRESET_TIMFEV9_TIMECMP3 HRTIM_OUTPUTSET_TIMEV_9
737739
#endif /* STM32H7 */
740+
741+
#if defined(STM32F3)
742+
#define HRTIM_OUTPUTSET_TIMEV_1 HRTIM_OUTPUTSET_TIMAEV1_TIMBCMP1
743+
#define HRTIM_OUTPUTSET_TIMEV_2 HRTIM_OUTPUTSET_TIMAEV2_TIMBCMP2
744+
#define HRTIM_OUTPUTSET_TIMEV_3 HRTIM_OUTPUTSET_TIMAEV3_TIMBCMP4
745+
#define HRTIM_OUTPUTSET_TIMEV_4 HRTIM_OUTPUTSET_TIMAEV4_TIMCCMP2
746+
#define HRTIM_OUTPUTSET_TIMEV_5 HRTIM_OUTPUTSET_TIMAEV5_TIMCCMP3
747+
#define HRTIM_OUTPUTSET_TIMEV_6 HRTIM_OUTPUTSET_TIMAEV6_TIMDCMP1
748+
#define HRTIM_OUTPUTSET_TIMEV_7 HRTIM_OUTPUTSET_TIMAEV7_TIMDCMP2
749+
#define HRTIM_OUTPUTSET_TIMEV_8 HRTIM_OUTPUTSET_TIMAEV8_TIMECMP3
750+
#define HRTIM_OUTPUTSET_TIMEV_9 HRTIM_OUTPUTSET_TIMAEV9_TIMECMP4
751+
752+
#define HRTIM_OUTPUTRESET_TIMEV_1 HRTIM_OUTPUTRESET_TIMAEV1_TIMBCMP1
753+
#define HRTIM_OUTPUTRESET_TIMEV_2 HRTIM_OUTPUTRESET_TIMAEV2_TIMBCMP2
754+
#define HRTIM_OUTPUTRESET_TIMEV_3 HRTIM_OUTPUTRESET_TIMAEV3_TIMBCMP4
755+
#define HRTIM_OUTPUTRESET_TIMEV_4 HRTIM_OUTPUTRESET_TIMAEV4_TIMCCMP2
756+
#define HRTIM_OUTPUTRESET_TIMEV_5 HRTIM_OUTPUTRESET_TIMAEV5_TIMCCMP3
757+
#define HRTIM_OUTPUTRESET_TIMEV_6 HRTIM_OUTPUTRESET_TIMAEV6_TIMDCMP1
758+
#define HRTIM_OUTPUTRESET_TIMEV_7 HRTIM_OUTPUTRESET_TIMAEV7_TIMDCMP2
759+
#define HRTIM_OUTPUTRESET_TIMEV_8 HRTIM_OUTPUTRESET_TIMAEV8_TIMECMP3
760+
#define HRTIM_OUTPUTRESET_TIMEV_9 HRTIM_OUTPUTRESET_TIMAEV9_TIMECMP4
761+
762+
#define HRTIM_EVENTSRC_1 HRTIM_EEV1SRC_GPIO
763+
#define HRTIM_EVENTSRC_2 HRTIM_EEV2SRC_GPIO
764+
#define HRTIM_EVENTSRC_3 HRTIM_EEV3SRC_GPIO
765+
#define HRTIM_EVENTSRC_4 HRTIM_EEV4SRC_GPIO
766+
#endif /* STM32F3 */
738767
/**
739768
* @}
740769
*/
@@ -1380,6 +1409,13 @@
13801409
#endif
13811410
#define HAL_ADC_EnableBuffer_Cmd(cmd) (((cmd)==ENABLE) ? HAL_ADCEx_EnableVREFINT() : HAL_ADCEx_DisableVREFINT())
13821411
#define HAL_ADC_EnableBufferSensor_Cmd(cmd) (((cmd)==ENABLE) ? HAL_ADCEx_EnableVREFINTTempSensor() : HAL_ADCEx_DisableVREFINTTempSensor())
1412+
#if defined(STM32H7A3xx) || defined(STM32H7B3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xxQ)
1413+
#define HAL_EnableSRDomainDBGStopMode HAL_EnableDomain3DBGStopMode
1414+
#define HAL_DisableSRDomainDBGStopMode HAL_DisableDomain3DBGStopMode
1415+
#define HAL_EnableSRDomainDBGStandbyMode HAL_EnableDomain3DBGStandbyMode
1416+
#define HAL_DisableSRDomainDBGStandbyMode HAL_DisableDomain3DBGStandbyMode
1417+
#endif /* STM32H7A3xx || STM32H7B3xx || STM32H7A3xxQ || STM32H7B3xxQ */
1418+
13831419
/**
13841420
* @}
13851421
*/
@@ -3242,7 +3278,7 @@
32423278
/** @defgroup HAL_RTC_Aliased_Macros HAL RTC Aliased Macros maintained for legacy purpose
32433279
* @{
32443280
*/
3245-
#if defined (STM32G0) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32L4P5xx) || defined (STM32L4Q5xx) || defined STM32G4
3281+
#if defined (STM32G0) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32L4P5xx) || defined (STM32L4Q5xx) || defined (STM32G4)
32463282
#else
32473283
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
32483284
#endif
@@ -3606,12 +3642,12 @@
36063642
* @{
36073643
*/
36083644
#if defined (STM32H7) || defined (STM32G4) || defined (STM32F3)
3609-
#define HAL_HRTIM_WaveformCounterStart_IT HAL_HRTIM_WaveformCountStart_IT
3610-
#define HAL_HRTIM_WaveformCounterStart_DMA HAL_HRTIM_WaveformCountStart_DMA
3611-
#define HAL_HRTIM_WaveformCounterStart HAL_HRTIM_WaveformCountStart
3612-
#define HAL_HRTIM_WaveformCounterStop_IT HAL_HRTIM_WaveformCountStop_IT
3613-
#define HAL_HRTIM_WaveformCounterStop_DMA HAL_HRTIM_WaveformCountStop_DMA
3614-
#define HAL_HRTIM_WaveformCounterStop HAL_HRTIM_WaveformCountStop
3645+
#define HAL_HRTIM_WaveformCounterStart_IT HAL_HRTIM_WaveformCountStart_IT
3646+
#define HAL_HRTIM_WaveformCounterStart_DMA HAL_HRTIM_WaveformCountStart_DMA
3647+
#define HAL_HRTIM_WaveformCounterStart HAL_HRTIM_WaveformCountStart
3648+
#define HAL_HRTIM_WaveformCounterStop_IT HAL_HRTIM_WaveformCountStop_IT
3649+
#define HAL_HRTIM_WaveformCounterStop_DMA HAL_HRTIM_WaveformCountStop_DMA
3650+
#define HAL_HRTIM_WaveformCounterStop HAL_HRTIM_WaveformCountStop
36153651
#endif
36163652
/**
36173653
* @}

system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_cryp.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ typedef struct
182182

183183
uint32_t Key_saved[8]; /*!< copy of key registers */
184184

185-
uint32_t Size_saved; /*!< copy of input buffer size */
185+
uint16_t Size_saved; /*!< copy of input buffer size */
186186

187187
uint16_t CrypHeaderCount_saved; /*!< copy of CRYP header data counter when processing is suspended */
188188

@@ -565,6 +565,12 @@ uint32_t HAL_CRYP_GetError(CRYP_HandleTypeDef *hcryp);
565565
#define IS_CRYP_INIT(CONFIG)(((CONFIG) == CRYP_KEYIVCONFIG_ALWAYS) || \
566566
((CONFIG) == CRYP_KEYIVCONFIG_ONCE))
567567

568+
#define IS_CRYP_BUFFERSIZE(ALGO, DATAWIDTH, SIZE) \
569+
(((((ALGO) == CRYP_AES_ECB) || ((ALGO) == CRYP_AES_CBC) || ((ALGO) == CRYP_AES_CTR)) && \
570+
((((DATAWIDTH) == CRYP_DATAWIDTHUNIT_WORD) && (((SIZE) % 4U) == 0U)) || \
571+
(((DATAWIDTH) == CRYP_DATAWIDTHUNIT_BYTE) && (((SIZE) % 16U) == 0U)))) || \
572+
(((ALGO)== CRYP_AES_GCM_GMAC) || ((ALGO) == CRYP_AES_CCM)))
573+
568574
/**
569575
* @}
570576
*/

system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_dma.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,10 @@ typedef struct __DMA_HandleTypeDef
204204
#define DMA_REQUEST_LPUART1_RX LL_DMAMUX_REQ_LPUART1_RX /*!< DMAMUX LP_UART1_RX request */
205205
#define DMA_REQUEST_LPUART1_TX LL_DMAMUX_REQ_LPUART1_TX /*!< DMAMUX LP_UART1_RX request */
206206

207+
#if defined (SAI1)
207208
#define DMA_REQUEST_SAI1_A LL_DMAMUX_REQ_SAI1_A /*!< DMAMUX SAI1 A request */
208209
#define DMA_REQUEST_SAI1_B LL_DMAMUX_REQ_SAI1_B /*!< DMAMUX SAI1 B request */
210+
#endif /* SAI1 */
209211

210212
#define DMA_REQUEST_QUADSPI LL_DMAMUX_REQ_QUADSPI /*!< DMAMUX QUADSPI request */
211213

0 commit comments

Comments
 (0)