@@ -473,7 +473,7 @@ extern "C" {
473473#define TYPEPROGRAMDATA_FASTHALFWORD FLASH_TYPEPROGRAMDATA_FASTHALFWORD
474474#define TYPEPROGRAMDATA_FASTWORD FLASH_TYPEPROGRAMDATA_FASTWORD
475475#if !defined(STM32F2 ) && !defined(STM32F4 ) && !defined(STM32F7 ) && !defined(STM32H7 ) && !defined(STM32H5 )
476- #define PAGESIZE FLASH_PAGE_SIZE
476+ /* #define PAGESIZE FLASH_PAGE_SIZE */
477477#endif /* STM32F2 && STM32F4 && STM32F7 && STM32H7 && STM32H5 */
478478#define TYPEPROGRAM_FASTBYTE FLASH_TYPEPROGRAM_BYTE
479479#define TYPEPROGRAM_FASTHALFWORD FLASH_TYPEPROGRAM_HALFWORD
@@ -542,6 +542,10 @@ extern "C" {
542542#define FLASH_OPTKEY1 FLASH_OPT_KEY1
543543#define FLASH_OPTKEY2 FLASH_OPT_KEY2
544544#endif /* STM32H7RS */
545+ #if defined(STM32H7RS )
546+ #define FLASH_OPTKEY1 FLASH_OPT_KEY1
547+ #define FLASH_OPTKEY2 FLASH_OPT_KEY2
548+ #endif /* STM32H7RS */
545549#if defined(STM32U5 )
546550#define OB_USER_nRST_STOP OB_USER_NRST_STOP
547551#define OB_USER_nRST_STDBY OB_USER_NRST_STDBY
@@ -616,6 +620,15 @@ extern "C" {
616620
617621#endif /* STM32U5 */
618622
623+ #if defined(STM32U5 )
624+
625+ #define HAL_SYSCFG_EnableIOAnalogSwitchBooster HAL_SYSCFG_EnableIOAnalogBooster
626+ #define HAL_SYSCFG_DisableIOAnalogSwitchBooster HAL_SYSCFG_DisableIOAnalogBooster
627+ #define HAL_SYSCFG_EnableIOAnalogSwitchVoltageSelection HAL_SYSCFG_EnableIOAnalogVoltageSelection
628+ #define HAL_SYSCFG_DisableIOAnalogSwitchVoltageSelection HAL_SYSCFG_DisableIOAnalogVoltageSelection
629+
630+ #endif /* STM32U5 */
631+
619632#if defined(STM32H5 )
620633#define SYSCFG_IT_FPU_IOC SBS_IT_FPU_IOC
621634#define SYSCFG_IT_FPU_DZC SBS_IT_FPU_DZC
@@ -894,6 +907,10 @@ extern "C" {
894907#define HRTIMInterruptResquests HRTIMInterruptRequests
895908#endif /* STM32F3 || STM32G4 || STM32H7 */
896909
910+ #if defined(STM32F3 ) || defined(STM32G4 ) || defined(STM32H7 )
911+ #define HRTIMInterruptResquests HRTIMInterruptRequests
912+ #endif /* STM32F3 || STM32G4 || STM32H7 */
913+
897914#if defined(STM32G4 )
898915#define HAL_HRTIM_ExternalEventCounterConfig HAL_HRTIM_ExtEventCounterConfig
899916#define HAL_HRTIM_ExternalEventCounterEnable HAL_HRTIM_ExtEventCounterEnable
@@ -1033,6 +1050,7 @@ extern "C" {
10331050#define HRTIM_CALIBRATIONRATE_14 (HRTIM_DLLCR_CALRTE_1 | HRTIM_DLLCR_CALRTE_0)
10341051#endif /* STM32F3 */
10351052
1053+
10361054/**
10371055 * @}
10381056 */
@@ -1283,10 +1301,12 @@ extern "C" {
12831301#define RTC_TAMPERPIN_PA0 RTC_TAMPERPIN_POS1
12841302#define RTC_TAMPERPIN_PI8 RTC_TAMPERPIN_POS1
12851303
1304+ #if defined(STM32H5 ) || defined(STM32H7RS ) || defined(STM32N6 )
12861305#if defined(STM32H5 ) || defined(STM32H7RS ) || defined(STM32N6 )
12871306#define TAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
12881307#define TAMP_SECRETDEVICE_ERASE_BKP_SRAM TAMP_DEVICESECRETS_ERASE_BKPSRAM
12891308#endif /* STM32H5 || STM32H7RS || STM32N6 */
1309+ #endif /* STM32H5 || STM32H7RS || STM32N6 */
12901310
12911311#if defined(STM32WBA )
12921312#define TAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
@@ -1298,27 +1318,33 @@ extern "C" {
12981318#define TAMP_SECRETDEVICE_ERASE_ALL TAMP_DEVICESECRETS_ERASE_ALL
12991319#endif /* STM32WBA */
13001320
1321+ #if defined(STM32H5 ) || defined(STM32WBA ) || defined(STM32H7RS ) || defined(STM32N6 )
13011322#if defined(STM32H5 ) || defined(STM32WBA ) || defined(STM32H7RS ) || defined(STM32N6 )
13021323#define TAMP_SECRETDEVICE_ERASE_DISABLE TAMP_DEVICESECRETS_ERASE_NONE
13031324#define TAMP_SECRETDEVICE_ERASE_ENABLE TAMP_SECRETDEVICE_ERASE_ALL
13041325#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
1326+ #endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
13051327
1328+ #if defined(STM32F7 ) || defined(STM32WB )
13061329#if defined(STM32F7 ) || defined(STM32WB )
13071330#define RTC_TAMPCR_TAMPXE RTC_TAMPER_ENABLE_BITS_MASK
13081331#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_IT_ENABLE_BITS_MASK
13091332#endif /* STM32F7 || STM32WB */
1333+ #endif /* STM32F7 || STM32WB */
13101334
13111335#if defined(STM32H7 )
13121336#define RTC_TAMPCR_TAMPXE RTC_TAMPER_X
13131337#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_X_INTERRUPT
13141338#endif /* STM32H7 */
13151339
1340+ #if defined(STM32F7 ) || defined(STM32H7 ) || defined(STM32L0 ) || defined(STM32WB )
13161341#if defined(STM32F7 ) || defined(STM32H7 ) || defined(STM32L0 ) || defined(STM32WB )
13171342#define RTC_TAMPER1_INTERRUPT RTC_IT_TAMP1
13181343#define RTC_TAMPER2_INTERRUPT RTC_IT_TAMP2
13191344#define RTC_TAMPER3_INTERRUPT RTC_IT_TAMP3
13201345#define RTC_ALL_TAMPER_INTERRUPT RTC_IT_TAMP
13211346#endif /* STM32F7 || STM32H7 || STM32L0 || STM32WB */
1347+ #endif /* STM32F7 || STM32H7 || STM32L0 || STM32WB */
13221348
13231349/**
13241350 * @}
@@ -2034,11 +2060,13 @@ extern "C" {
20342060 * @{
20352061 */
20362062#if defined(STM32H5 ) || defined(STM32WBA ) || defined(STM32H7RS ) || defined(STM32N6 )
2063+ #if defined(STM32H5 ) || defined(STM32WBA ) || defined(STM32H7RS ) || defined(STM32N6 )
20372064#define HAL_RTCEx_SetBoothardwareKey HAL_RTCEx_LockBootHardwareKey
20382065#define HAL_RTCEx_BKUPBlock_Enable HAL_RTCEx_BKUPBlock
20392066#define HAL_RTCEx_BKUPBlock_Disable HAL_RTCEx_BKUPUnblock
20402067#define HAL_RTCEx_Erase_SecretDev_Conf HAL_RTCEx_ConfigEraseDeviceSecrets
20412068#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
2069+ #endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
20422070
20432071/**
20442072 * @}
@@ -3700,6 +3728,7 @@ extern "C" {
37003728
37013729#if defined(STM32L4 ) || defined(STM32WB ) || defined(STM32G0 ) || defined(STM32G4 ) || defined(STM32L5 ) || \
37023730 defined(STM32WL ) || defined(STM32C0 ) || defined(STM32N6 ) || defined(STM32H7RS ) || defined(STM32U0 )
3731+ defined (STM32WL ) || defined (STM32C0 ) || defined (STM32N6 ) || defined (STM32H7RS ) || defined (STM32U0 )
37033732#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
37043733#else
37053734#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
@@ -3952,6 +3981,8 @@ extern "C" {
39523981 defined (STM32L4P5xx )|| defined (STM32L4Q5xx ) || defined (STM32G4 ) || defined (STM32WL ) || defined (STM32U5 ) || \
39533982 defined (STM32WBA ) || defined (STM32H5 ) || defined (STM32C0 ) || defined (STM32N6 ) || defined (STM32H7RS ) || \
39543983 defined (STM32U0 ) || defined (STM32U3 )
3984+ defined (STM32WBA ) || defined (STM32H5 ) || defined (STM32C0 ) || defined (STM32N6 ) || defined (STM32H7RS ) || \
3985+ defined (STM32U0 ) || defined (STM32U3 )
39553986#else
39563987#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39573988#endif
@@ -4272,6 +4303,33 @@ extern "C" {
42724303#define USB_OTG_PCGCCTL_STOPCLK USB_OTG_PCGCCTL_STPPCLK
42734304#define USB_OTG_PCGCCTL_GATECLK USB_OTG_PCGCCTL_GATEHCLK
42744305#endif
4306+ #if defined(STM32U5 )
4307+ #define USB_OTG_GOTGCTL_BSESVLD USB_OTG_GOTGCTL_BSVLD
4308+ #define USB_OTG_GAHBCFG_GINT USB_OTG_GAHBCFG_GINTMSK
4309+ #define USB_OTG_GUSBCFG_PHYLPCS USB_OTG_GUSBCFG_PHYLPC
4310+ #define USB_OTG_GRSTCTL_HSRST USB_OTG_GRSTCTL_PSRST
4311+ #define USB_OTG_GINTSTS_BOUTNAKEFF USB_OTG_GINTSTS_GONAKEFF
4312+ #define USB_OTG_GINTSTS_WKUINT USB_OTG_GINTSTS_WKUPINT
4313+ #define USB_OTG_GINTMSK_PXFRM_IISOOXFRM USB_OTG_GINTMSK_IPXFRM_IISOOXFRM
4314+ #define USB_OTG_GRXSTSP_EPNUM USB_OTG_GRXSTSP_EPNUM_CHNUM
4315+ #define USB_OTG_GLPMCFG_L1ResumeOK USB_OTG_GLPMCFG_L1RSMOK
4316+ #define USB_OTG_HPTXFSIZ_PTXFD USB_OTG_HPTXFSIZ_PTXFSIZ
4317+ #define USB_OTG_HCCHAR_MC USB_OTG_HCCHAR_MCNT
4318+ #define USB_OTG_HCCHAR_MC_0 USB_OTG_HCCHAR_MCNT_0
4319+ #define USB_OTG_HCCHAR_MC_1 USB_OTG_HCCHAR_MCNT_1
4320+ #define USB_OTG_HCINTMSK_AHBERR USB_OTG_HCINTMSK_AHBERRM
4321+ #define USB_OTG_HCTSIZ_DOPING USB_OTG_HCTSIZ_DOPNG
4322+ #define USB_OTG_DOEPMSK_OPEM USB_OTG_DOEPMSK_OUTPKTERRM
4323+ #define USB_OTG_DIEPCTL_SODDFRM USB_OTG_DIEPCTL_SD1PID_SODDFRM
4324+ #define USB_OTG_DIEPTSIZ_MULCNT USB_OTG_DIEPTSIZ_MCNT
4325+ #define USB_OTG_DOEPCTL_SODDFRM USB_OTG_DOEPCTL_SD1PID_SODDFRM
4326+ #define USB_OTG_DOEPCTL_DPID USB_OTG_DOEPCTL_DPID_EONUM
4327+ #define USB_OTG_DOEPTSIZ_STUPCNT USB_OTG_DOEPTSIZ_RXDPID
4328+ #define USB_OTG_DOEPTSIZ_STUPCNT_0 USB_OTG_DOEPTSIZ_RXDPID_0
4329+ #define USB_OTG_DOEPTSIZ_STUPCNT_1 USB_OTG_DOEPTSIZ_RXDPID_1
4330+ #define USB_OTG_PCGCCTL_STOPCLK USB_OTG_PCGCCTL_STPPCLK
4331+ #define USB_OTG_PCGCCTL_GATECLK USB_OTG_PCGCCTL_GATEHCLK
4332+ #endif
42754333/**
42764334 * @}
42774335 */
0 commit comments