Skip to content

Commit 6313937

Browse files
fpistmfpistm
committed
system(l4) update STM32L4xx HAL Drivers to v1.13.6
Included in STM32CubeL4 FW v1.18.2 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 27aca29 commit 6313937

File tree

87 files changed

+4805
-4362
lines changed

Some content is hidden

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

87 files changed

+4805
-4362
lines changed

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

Lines changed: 75 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,9 @@ 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+
#endif /* STM32L4R5xx || STM32L4R9xx || STM32L4R9xx || STM32L4S5xx || STM32L4S7xx || STM32L4S9xx */
365367

366368
#endif /* STM32L4 */
367369

@@ -472,7 +474,9 @@ extern "C" {
472474
#define TYPEPROGRAMDATA_FASTBYTE FLASH_TYPEPROGRAMDATA_FASTBYTE
473475
#define TYPEPROGRAMDATA_FASTHALFWORD FLASH_TYPEPROGRAMDATA_FASTHALFWORD
474476
#define TYPEPROGRAMDATA_FASTWORD FLASH_TYPEPROGRAMDATA_FASTWORD
477+
#if !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32H7) && !defined(STM32H5)
475478
#define PAGESIZE FLASH_PAGE_SIZE
479+
#endif /* STM32F2 && STM32F4 && STM32F7 && STM32H7 && STM32H5 */
476480
#define TYPEPROGRAM_FASTBYTE FLASH_TYPEPROGRAM_BYTE
477481
#define TYPEPROGRAM_FASTHALFWORD FLASH_TYPEPROGRAM_HALFWORD
478482
#define TYPEPROGRAM_FASTWORD FLASH_TYPEPROGRAM_WORD
@@ -536,6 +540,10 @@ extern "C" {
536540
#define FLASH_FLAG_WDW FLASH_FLAG_WBNE
537541
#define OB_WRP_SECTOR_All OB_WRP_SECTOR_ALL
538542
#endif /* STM32H7 */
543+
#if defined(STM32H7RS)
544+
#define FLASH_OPTKEY1 FLASH_OPT_KEY1
545+
#define FLASH_OPTKEY2 FLASH_OPT_KEY2
546+
#endif /* STM32H7RS */
539547
#if defined(STM32U5)
540548
#define OB_USER_nRST_STOP OB_USER_NRST_STOP
541549
#define OB_USER_nRST_STDBY OB_USER_NRST_STDBY
@@ -558,6 +566,9 @@ extern "C" {
558566
#define OB_nBOOT0_RESET OB_NBOOT0_RESET
559567
#define OB_nBOOT0_SET OB_NBOOT0_SET
560568
#endif /* STM32U0 */
569+
#if defined(STM32H5)
570+
#define FLASH_ECC_AREA_EDATA FLASH_ECC_AREA_EDATA_BANK1
571+
#endif /* STM32H5 */
561572

562573
/**
563574
* @}
@@ -601,6 +612,15 @@ extern "C" {
601612
#define HAL_SYSCFG_DisableIOAnalogSwitchVDD HAL_SYSCFG_DisableIOSwitchVDD
602613
#endif /* STM32G4 */
603614

615+
#if defined(STM32U5)
616+
617+
#define HAL_SYSCFG_EnableIOAnalogSwitchBooster HAL_SYSCFG_EnableIOAnalogBooster
618+
#define HAL_SYSCFG_DisableIOAnalogSwitchBooster HAL_SYSCFG_DisableIOAnalogBooster
619+
#define HAL_SYSCFG_EnableIOAnalogSwitchVoltageSelection HAL_SYSCFG_EnableIOAnalogVoltageSelection
620+
#define HAL_SYSCFG_DisableIOAnalogSwitchVoltageSelection HAL_SYSCFG_DisableIOAnalogVoltageSelection
621+
622+
#endif /* STM32U5 */
623+
604624
#if defined(STM32H5)
605625
#define SYSCFG_IT_FPU_IOC SBS_IT_FPU_IOC
606626
#define SYSCFG_IT_FPU_DZC SBS_IT_FPU_DZC
@@ -875,6 +895,10 @@ extern "C" {
875895
#define __HAL_HRTIM_SetCompare __HAL_HRTIM_SETCOMPARE
876896
#define __HAL_HRTIM_GetCompare __HAL_HRTIM_GETCOMPARE
877897

898+
#if defined(STM32F3) || defined(STM32G4) || defined(STM32H7)
899+
#define HRTIMInterruptResquests HRTIMInterruptRequests
900+
#endif /* STM32F3 || STM32G4 || STM32H7 */
901+
878902
#if defined(STM32G4)
879903
#define HAL_HRTIM_ExternalEventCounterConfig HAL_HRTIM_ExtEventCounterConfig
880904
#define HAL_HRTIM_ExternalEventCounterEnable HAL_HRTIM_ExtEventCounterEnable
@@ -1012,8 +1036,8 @@ extern "C" {
10121036
#define HRTIM_CALIBRATIONRATE_910 (HRTIM_DLLCR_CALRTE_0)
10131037
#define HRTIM_CALIBRATIONRATE_114 (HRTIM_DLLCR_CALRTE_1)
10141038
#define HRTIM_CALIBRATIONRATE_14 (HRTIM_DLLCR_CALRTE_1 | HRTIM_DLLCR_CALRTE_0)
1015-
10161039
#endif /* STM32F3 */
1040+
10171041
/**
10181042
* @}
10191043
*/
@@ -1264,10 +1288,10 @@ extern "C" {
12641288
#define RTC_TAMPERPIN_PA0 RTC_TAMPERPIN_POS1
12651289
#define RTC_TAMPERPIN_PI8 RTC_TAMPERPIN_POS1
12661290

1267-
#if defined(STM32H5) || defined(STM32H7RS)
1291+
#if defined(STM32H5) || defined(STM32H7RS) || defined(STM32N6)
12681292
#define TAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
12691293
#define TAMP_SECRETDEVICE_ERASE_BKP_SRAM TAMP_DEVICESECRETS_ERASE_BKPSRAM
1270-
#endif /* STM32H5 || STM32H7RS */
1294+
#endif /* STM32H5 || STM32H7RS || STM32N6 */
12711295

12721296
#if defined(STM32WBA)
12731297
#define TAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
@@ -1279,27 +1303,27 @@ extern "C" {
12791303
#define TAMP_SECRETDEVICE_ERASE_ALL TAMP_DEVICESECRETS_ERASE_ALL
12801304
#endif /* STM32WBA */
12811305

1282-
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS)
1306+
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS) || defined(STM32N6)
12831307
#define TAMP_SECRETDEVICE_ERASE_DISABLE TAMP_DEVICESECRETS_ERASE_NONE
12841308
#define TAMP_SECRETDEVICE_ERASE_ENABLE TAMP_SECRETDEVICE_ERASE_ALL
1285-
#endif /* STM32H5 || STM32WBA || STM32H7RS */
1309+
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
12861310

1287-
#if defined(STM32F7)
1311+
#if defined(STM32F7) || defined(STM32WB)
12881312
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_ENABLE_BITS_MASK
12891313
#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_IT_ENABLE_BITS_MASK
1290-
#endif /* STM32F7 */
1314+
#endif /* STM32F7 || STM32WB */
12911315

12921316
#if defined(STM32H7)
12931317
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_X
12941318
#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_X_INTERRUPT
12951319
#endif /* STM32H7 */
12961320

1297-
#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0)
1321+
#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0) || defined(STM32WB)
12981322
#define RTC_TAMPER1_INTERRUPT RTC_IT_TAMP1
12991323
#define RTC_TAMPER2_INTERRUPT RTC_IT_TAMP2
13001324
#define RTC_TAMPER3_INTERRUPT RTC_IT_TAMP3
13011325
#define RTC_ALL_TAMPER_INTERRUPT RTC_IT_TAMP
1302-
#endif /* STM32F7 || STM32H7 || STM32L0 */
1326+
#endif /* STM32F7 || STM32H7 || STM32L0 || STM32WB */
13031327

13041328
/**
13051329
* @}
@@ -1466,7 +1490,7 @@ extern "C" {
14661490
#define TIM_TIM3_TI1_COMP1COMP2_OUT TIM_TIM3_TI1_COMP1_COMP2
14671491
#endif
14681492

1469-
#if defined(STM32U5)
1493+
#if defined(STM32U5) || defined(STM32MP2)
14701494
#define OCREF_CLEAR_SELECT_Pos OCREF_CLEAR_SELECT_POS
14711495
#define OCREF_CLEAR_SELECT_Msk OCREF_CLEAR_SELECT_MSK
14721496
#endif
@@ -2014,12 +2038,12 @@ extern "C" {
20142038
/** @defgroup HAL_RTC_Aliased_Functions HAL RTC Aliased Functions maintained for legacy purpose
20152039
* @{
20162040
*/
2017-
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS)
2041+
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS) || defined(STM32N6)
20182042
#define HAL_RTCEx_SetBoothardwareKey HAL_RTCEx_LockBootHardwareKey
20192043
#define HAL_RTCEx_BKUPBlock_Enable HAL_RTCEx_BKUPBlock
20202044
#define HAL_RTCEx_BKUPBlock_Disable HAL_RTCEx_BKUPUnblock
20212045
#define HAL_RTCEx_Erase_SecretDev_Conf HAL_RTCEx_ConfigEraseDeviceSecrets
2022-
#endif /* STM32H5 || STM32WBA || STM32H7RS */
2046+
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
20232047

20242048
/**
20252049
* @}
@@ -2127,6 +2151,13 @@ extern "C" {
21272151
#define UFB_MODE_BitNumber UFB_MODE_BIT_NUMBER
21282152
#define CMP_PD_BitNumber CMP_PD_BIT_NUMBER
21292153

2154+
#if defined(STM32H7RS) || defined(STM32N6)
2155+
#define FMC_SWAPBMAP_DISABLE FMC_SWAPBANK_MODE0
2156+
#define FMC_SWAPBMAP_SDRAM_SRAM FMC_SWAPBANK_MODE1
2157+
#define HAL_SetFMCMemorySwappingConfig HAL_FMC_SetBankSwapConfig
2158+
#define HAL_GetFMCMemorySwappingConfig HAL_FMC_GetBankSwapConfig
2159+
#endif /* STM32H7RS || STM32N6 */
2160+
21302161
/**
21312162
* @}
21322163
*/
@@ -3680,7 +3711,8 @@ extern "C" {
36803711
#endif
36813712

36823713
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || \
3683-
defined(STM32WL) || defined(STM32C0) || defined(STM32H7RS) || defined(STM32U0)
3714+
defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) || \
3715+
defined(STM32U0)
36843716
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
36853717
#else
36863718
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
@@ -3931,7 +3963,8 @@ extern "C" {
39313963
*/
39323964
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \
39333965
defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
3934-
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32H7RS) || defined (STM32U0)
3966+
defined (STM32WBA) || defined (STM32H5) || \
3967+
defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || defined (STM32U0) || defined (STM32U3)
39353968
#else
39363969
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39373970
#endif
@@ -4225,6 +4258,33 @@ extern "C" {
42254258

42264259
#define HAL_PCD_SetTxFiFo HAL_PCDEx_SetTxFiFo
42274260
#define HAL_PCD_SetRxFiFo HAL_PCDEx_SetRxFiFo
4261+
#if defined(STM32U5)
4262+
#define USB_OTG_GOTGCTL_BSESVLD USB_OTG_GOTGCTL_BSVLD
4263+
#define USB_OTG_GAHBCFG_GINT USB_OTG_GAHBCFG_GINTMSK
4264+
#define USB_OTG_GUSBCFG_PHYLPCS USB_OTG_GUSBCFG_PHYLPC
4265+
#define USB_OTG_GRSTCTL_HSRST USB_OTG_GRSTCTL_PSRST
4266+
#define USB_OTG_GINTSTS_BOUTNAKEFF USB_OTG_GINTSTS_GONAKEFF
4267+
#define USB_OTG_GINTSTS_WKUINT USB_OTG_GINTSTS_WKUPINT
4268+
#define USB_OTG_GINTMSK_PXFRM_IISOOXFRM USB_OTG_GINTMSK_IPXFRM_IISOOXFRM
4269+
#define USB_OTG_GRXSTSP_EPNUM USB_OTG_GRXSTSP_EPNUM_CHNUM
4270+
#define USB_OTG_GLPMCFG_L1ResumeOK USB_OTG_GLPMCFG_L1RSMOK
4271+
#define USB_OTG_HPTXFSIZ_PTXFD USB_OTG_HPTXFSIZ_PTXFSIZ
4272+
#define USB_OTG_HCCHAR_MC USB_OTG_HCCHAR_MCNT
4273+
#define USB_OTG_HCCHAR_MC_0 USB_OTG_HCCHAR_MCNT_0
4274+
#define USB_OTG_HCCHAR_MC_1 USB_OTG_HCCHAR_MCNT_1
4275+
#define USB_OTG_HCINTMSK_AHBERR USB_OTG_HCINTMSK_AHBERRM
4276+
#define USB_OTG_HCTSIZ_DOPING USB_OTG_HCTSIZ_DOPNG
4277+
#define USB_OTG_DOEPMSK_OPEM USB_OTG_DOEPMSK_OUTPKTERRM
4278+
#define USB_OTG_DIEPCTL_SODDFRM USB_OTG_DIEPCTL_SD1PID_SODDFRM
4279+
#define USB_OTG_DIEPTSIZ_MULCNT USB_OTG_DIEPTSIZ_MCNT
4280+
#define USB_OTG_DOEPCTL_SODDFRM USB_OTG_DOEPCTL_SD1PID_SODDFRM
4281+
#define USB_OTG_DOEPCTL_DPID USB_OTG_DOEPCTL_DPID_EONUM
4282+
#define USB_OTG_DOEPTSIZ_STUPCNT USB_OTG_DOEPTSIZ_RXDPID
4283+
#define USB_OTG_DOEPTSIZ_STUPCNT_0 USB_OTG_DOEPTSIZ_RXDPID_0
4284+
#define USB_OTG_DOEPTSIZ_STUPCNT_1 USB_OTG_DOEPTSIZ_RXDPID_1
4285+
#define USB_OTG_PCGCCTL_STOPCLK USB_OTG_PCGCCTL_STPPCLK
4286+
#define USB_OTG_PCGCCTL_GATECLK USB_OTG_PCGCCTL_GATEHCLK
4287+
#endif
42284288
/**
42294289
* @}
42304290
*/

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_can.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -626,10 +626,10 @@ typedef void (*pCAN_CallbackTypeDef)(CAN_HandleTypeDef *hcan); /*!< pointer to
626626
* @retval None
627627
*/
628628
#define __HAL_CAN_CLEAR_FLAG(__HANDLE__, __FLAG__) \
629-
((((__FLAG__) >> 8U) == 5U)? (((__HANDLE__)->Instance->TSR) = (1U << ((__FLAG__) & CAN_FLAG_MASK))): \
630-
(((__FLAG__) >> 8U) == 2U)? (((__HANDLE__)->Instance->RF0R) = (1U << ((__FLAG__) & CAN_FLAG_MASK))): \
631-
(((__FLAG__) >> 8U) == 4U)? (((__HANDLE__)->Instance->RF1R) = (1U << ((__FLAG__) & CAN_FLAG_MASK))): \
632-
(((__FLAG__) >> 8U) == 1U)? (((__HANDLE__)->Instance->MSR) = (1U << ((__FLAG__) & CAN_FLAG_MASK))): 0U)
629+
((((__FLAG__) >> 8U) == 5U)? (((__HANDLE__)->Instance->TSR) = (1UL << ((__FLAG__) & CAN_FLAG_MASK))): \
630+
(((__FLAG__) >> 8U) == 2U)? (((__HANDLE__)->Instance->RF0R) = (1UL << ((__FLAG__) & CAN_FLAG_MASK))): \
631+
(((__FLAG__) >> 8U) == 4U)? (((__HANDLE__)->Instance->RF1R) = (1UL << ((__FLAG__) & CAN_FLAG_MASK))): \
632+
(((__FLAG__) >> 8U) == 1U)? (((__HANDLE__)->Instance->MSR) = (1UL << ((__FLAG__) & CAN_FLAG_MASK))): 0U)
633633

634634
/**
635635
* @}

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_cryp.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -705,8 +705,8 @@ void HAL_CRYP_IRQHandler(CRYP_HandleTypeDef *hcryp);
705705
*/
706706

707707
/* Peripheral State functions ************************************************/
708-
HAL_CRYP_STATETypeDef HAL_CRYP_GetState(CRYP_HandleTypeDef *hcryp);
709-
uint32_t HAL_CRYP_GetError(CRYP_HandleTypeDef *hcryp);
708+
HAL_CRYP_STATETypeDef HAL_CRYP_GetState(const CRYP_HandleTypeDef *hcryp);
709+
uint32_t HAL_CRYP_GetError(const CRYP_HandleTypeDef *hcryp);
710710

711711
/**
712712
* @}

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_cryp_ex.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ void HAL_CRYPEx_ComputationCpltCallback(CRYP_HandleTypeDef *hcryp);
6262
/* AES encryption/decryption processing functions ****************************/
6363
HAL_StatusTypeDef HAL_CRYPEx_AES(CRYP_HandleTypeDef *hcryp, uint8_t *pInputData, uint16_t Size, uint8_t *pOutputData, uint32_t Timeout);
6464
HAL_StatusTypeDef HAL_CRYPEx_AES_IT(CRYP_HandleTypeDef *hcryp, uint8_t *pInputData, uint16_t Size, uint8_t *pOutputData);
65-
HAL_StatusTypeDef HAL_CRYPEx_AES_DMA(CRYP_HandleTypeDef *hcryp, uint8_t *pInputData, uint16_t Size, uint8_t *pOutputData);
65+
HAL_StatusTypeDef HAL_CRYPEx_AES_DMA(CRYP_HandleTypeDef *hcryp, const uint8_t *pInputData, uint16_t Size, const uint8_t *pOutputData);
6666

6767
/* AES encryption/decryption/authentication processing functions *************/
68-
HAL_StatusTypeDef HAL_CRYPEx_AES_Auth(CRYP_HandleTypeDef *hcryp, uint8_t *pInputData, uint64_t Size, uint8_t *pOutputData, uint32_t Timeout);
68+
HAL_StatusTypeDef HAL_CRYPEx_AES_Auth(CRYP_HandleTypeDef *hcryp, const uint8_t *pInputData, uint64_t Size, uint8_t *pOutputData, uint32_t Timeout);
6969
HAL_StatusTypeDef HAL_CRYPEx_AES_Auth_IT(CRYP_HandleTypeDef *hcryp, uint8_t *pInputData, uint64_t Size, uint8_t *pOutputData);
7070
HAL_StatusTypeDef HAL_CRYPEx_AES_Auth_DMA(CRYP_HandleTypeDef *hcryp, uint8_t *pInputData, uint64_t Size, uint8_t *pOutputData);
7171

@@ -78,11 +78,11 @@ HAL_StatusTypeDef HAL_CRYPEx_AES_Auth_DMA(CRYP_HandleTypeDef *hcryp, uint8_t *pI
7878
*/
7979

8080
/* AES suspension/resumption functions ***************************************/
81-
void HAL_CRYPEx_Read_IVRegisters(CRYP_HandleTypeDef *hcryp, uint8_t* Output);
82-
void HAL_CRYPEx_Write_IVRegisters(CRYP_HandleTypeDef *hcryp, uint8_t* Input);
81+
void HAL_CRYPEx_Read_IVRegisters(const CRYP_HandleTypeDef *hcryp, uint8_t* Output);
82+
void HAL_CRYPEx_Write_IVRegisters(CRYP_HandleTypeDef *hcryp, const uint8_t* Input);
8383
void HAL_CRYPEx_Read_SuspendRegisters(CRYP_HandleTypeDef *hcryp, uint8_t* Output);
84-
void HAL_CRYPEx_Write_SuspendRegisters(CRYP_HandleTypeDef *hcryp, uint8_t* Input);
85-
void HAL_CRYPEx_Read_KeyRegisters(CRYP_HandleTypeDef *hcryp, uint8_t* Output, uint32_t KeySize);
84+
void HAL_CRYPEx_Write_SuspendRegisters(CRYP_HandleTypeDef *hcryp, const uint8_t* Input);
85+
void HAL_CRYPEx_Read_KeyRegisters(const CRYP_HandleTypeDef *hcryp, uint8_t* Output, uint32_t KeySize);
8686
void HAL_CRYPEx_Write_KeyRegisters(CRYP_HandleTypeDef *hcryp, uint8_t* Input, uint32_t KeySize);
8787
void HAL_CRYPEx_Read_ControlRegister(CRYP_HandleTypeDef *hcryp, uint8_t* Output);
8888
void HAL_CRYPEx_Write_ControlRegister(CRYP_HandleTypeDef *hcryp, uint8_t* Input);

0 commit comments

Comments
 (0)