system(u5) update STM32U5xx HAL Drivers to v1.6.3

Included in STM32CubeU5 FW v1.9.0

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

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

@@ -361,7 +361,9 @@ extern "C" {
 #if defined(STM32L4R5xx) || defined(STM32L4R9xx) || defined(STM32L4R9xx) || defined(STM32L4S5xx) || \
     defined(STM32L4S7xx) || defined(STM32L4S9xx)
 #define DMA_REQUEST_DCMI_PSSI                    DMA_REQUEST_DCMI
-#endif
+#elif defined(STM32L4P5xx) || defined(STM32L4Q5xx)
+#define DMA_REQUEST_PSSI                    DMA_REQUEST_DCMI_PSSI
+#endif /* STM32L4R5xx || STM32L4R9xx || STM32L4R9xx || STM32L4S5xx || STM32L4S7xx || STM32L4S9xx */
 
 #endif /* STM32L4 */
 
@@ -1915,7 +1917,11 @@ extern "C" {
 #define HAL_PWREx_DisableSDADCAnalog                  HAL_PWREx_DisableSDADC
 #define HAL_PWREx_EnableSDADCAnalog                   HAL_PWREx_EnableSDADC
 #define HAL_PWREx_PVMConfig                           HAL_PWREx_ConfigPVM
-
+#if defined(STM32G0C1xx) || defined(STM32G0B1xx)
+#define PWR_PVM_USB                                   PWR_PVM_ENABLE
+#define PWR_FLAG_PVMOUSB                              PWR_FLAG_PVMOVDDIO2
+#define PWR_FLAG_PVMO_USB                             PWR_FLAG_PVMO_VDDIO2
+#endif /* STM32G0C1xx || STM32G0B1xx */
 #define PWR_MODE_NORMAL                               PWR_PVD_MODE_NORMAL
 #define PWR_MODE_IT_RISING                            PWR_PVD_MODE_IT_RISING
 #define PWR_MODE_IT_FALLING                           PWR_PVD_MODE_IT_FALLING
@@ -2028,6 +2034,9 @@ extern "C" {
 
 #define PWR_ALL_RAM_RUN_RETENTION_MASK                PWR_ALL_RAM_RUN_MASK
 #endif
+#if defined (STM32H7RS)
+#define PWR_SMPS_1V8_SUPPLIES_EXT_AND_LDO             PWR_SMPS_1V8_SUPPLIES_EXT_VDD_SUPPLIES_LDO
+#endif
 
 /**
   * @}
@@ -2149,6 +2158,20 @@ extern "C" {
 #define UFB_MODE_BitNumber                    UFB_MODE_BIT_NUMBER
 #define CMP_PD_BitNumber                      CMP_PD_BIT_NUMBER
 
+#if defined(STM32H7RS) || defined(STM32N6)
+#define FMC_SWAPBMAP_DISABLE                  FMC_SWAPBANK_MODE0
+#define FMC_SWAPBMAP_SDRAM_SRAM               FMC_SWAPBANK_MODE1
+#define HAL_SetFMCMemorySwappingConfig        HAL_FMC_SetBankSwapConfig
+#define HAL_GetFMCMemorySwappingConfig        HAL_FMC_GetBankSwapConfig
+#endif /* STM32H7RS || STM32N6 */
+
+#if defined(STM32N6)
+/* alias CMSIS */
+#define CSI_PCR_PWRDOWN_Pos             CSI_PCR_NPWRDOWN_Pos
+#define CSI_PCR_PWRDOWN_Msk             CSI_PCR_NPWRDOWN_Msk
+#define CSI_PCR_PWRDOWN                 CSI_PCR_NPWRDOWN
+#endif /* STM32N6 */
+
 /**
   * @}
   */
@@ -3701,9 +3724,7 @@ extern "C" {
 #define RCC_SYSCLKSOURCE_STATUS_PLLR   RCC_SYSCLKSOURCE_STATUS_PLLCLK
 #endif
 
-#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || \
-      defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) || \
-      defined(STM32U0)
+#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) ||  defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) ||  defined(STM32U0)
 #define RCC_RTCCLKSOURCE_NO_CLK     RCC_RTCCLKSOURCE_NONE
 #else
 #define RCC_RTCCLKSOURCE_NONE       RCC_RTCCLKSOURCE_NO_CLK
@@ -3952,10 +3973,7 @@ extern "C" {
 /** @defgroup HAL_RTC_Aliased_Macros HAL RTC Aliased Macros maintained for legacy purpose
   * @{
   */
-#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \
-    defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
-    defined (STM32WBA) || defined (STM32H5) || \
-    defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) ||  defined (STM32U0) || defined (STM32U3)
+#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) ||  defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || defined (STM32WBA) || defined (STM32H5) ||  defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || defined (STM32U0) || defined (STM32U3)
 #else
 #define __HAL_RTC_CLEAR_FLAG                      __HAL_RTC_EXTI_CLEAR_FLAG
 #endif

system/Drivers/STM32U5xx_HAL_Driver/Inc/stm32u5xx_hal_adc.h

@@ -2055,6 +2055,7 @@ typedef  void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
   * @note   ADC conversion data full-scale corresponds to voltage range
   *         determined by analog voltage references Vref+ and Vref-
   *         (refer to reference manual).
+  * @param  __ADC_INSTANCE__ ADC instance
   * @param  __ADC_RESOLUTION__ This parameter can be one of the following values:
   *         @arg @ref ADC_RESOLUTION_14B
   *         @arg @ref ADC_RESOLUTION_12B
@@ -2066,8 +2067,8 @@ typedef  void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
   *         (2) On STM32U5, parameter available only on ADC instance: ADC4.\n
   * @retval ADC conversion data full-scale digital value
   */
-#define __HAL_ADC_DIGITAL_SCALE(__ADC_RESOLUTION__)                             \
-  __LL_ADC_DIGITAL_SCALE((__ADC_RESOLUTION__))
+#define __HAL_ADC_DIGITAL_SCALE(__ADC_INSTANCE__, __ADC_RESOLUTION__)           \
+  __LL_ADC_DIGITAL_SCALE((__ADC_INSTANCE__), (__ADC_RESOLUTION__))
 
 /**
   * @brief  Helper macro to convert the ADC conversion data from

system/Drivers/STM32U5xx_HAL_Driver/Inc/stm32u5xx_hal_crc.h

@@ -308,8 +308,8 @@ void HAL_CRC_MspDeInit(CRC_HandleTypeDef *hcrc);
 /** @defgroup CRC_Exported_Functions_Group2 Peripheral Control functions
   * @{
   */
-uint32_t HAL_CRC_Accumulate(CRC_HandleTypeDef *hcrc, uint32_t pBuffer[], uint32_t BufferLength);
-uint32_t HAL_CRC_Calculate(CRC_HandleTypeDef *hcrc, uint32_t pBuffer[], uint32_t BufferLength);
+uint32_t HAL_CRC_Accumulate(CRC_HandleTypeDef *hcrc, const uint32_t pBuffer[], uint32_t BufferLength);
+uint32_t HAL_CRC_Calculate(CRC_HandleTypeDef *hcrc, const uint32_t pBuffer[], uint32_t BufferLength);
 /**
   * @}
   */

system/Drivers/STM32U5xx_HAL_Driver/Inc/stm32u5xx_hal_cryp.h

@@ -502,7 +502,8 @@ typedef  void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp);    /*!< point
                                                        & (CRYP_FLAG_KEIF)) == (CRYP_FLAG_KEIF))?SET:RESET) : \
                                                    ((__FLAG__) == CRYP_FLAG_RWEIF )?((((__HANDLE__)->Instance->ISR \
                                                        & (CRYP_FLAG_RWEIF)) == (CRYP_FLAG_RWEIF))?SET:RESET) : \
-                                                   ((((__HANDLE__)->Instance->ISR & (CRYP_FLAG_CCF)) == (CRYP_FLAG_CCF)))?SET:RESET)
+                                                   ((((__HANDLE__)->Instance->ISR & (CRYP_FLAG_CCF)) == \
+                                                     (CRYP_FLAG_CCF)))?SET:RESET)
 
 /** @brief  Clear the CRYP pending status flag.
   * @param  __HANDLE__ specifies the CRYP handle.

system/Drivers/STM32U5xx_HAL_Driver/Inc/stm32u5xx_hal_dma2d.h

@@ -658,7 +658,7 @@ uint32_t               HAL_DMA2D_GetError(const DMA2D_HandleTypeDef *hdma2d);
 #define IS_DMA2D_PIXEL(PIXEL)                 ((PIXEL) <= DMA2D_PIXEL)
 #define IS_DMA2D_OFFSET(OOFFSET)              ((OOFFSET) <= DMA2D_OFFSET)
 
-#if defined(DMA2D_FGPFCCR_CSS)
+#if   defined(DMA2D_FGPFCCR_CSS)
 #define IS_DMA2D_INPUT_COLOR_MODE(INPUT_CM)   (((INPUT_CM) == DMA2D_INPUT_ARGB8888) || \
                                                ((INPUT_CM) == DMA2D_INPUT_RGB888)   || \
                                                ((INPUT_CM) == DMA2D_INPUT_RGB565)   || \

system/Drivers/STM32U5xx_HAL_Driver/Inc/stm32u5xx_hal_flash.h

@@ -903,6 +903,12 @@ void               HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue);
   */
 HAL_StatusTypeDef  HAL_FLASH_Unlock(void);
 HAL_StatusTypeDef  HAL_FLASH_Lock(void);
+#if defined(__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
+HAL_StatusTypeDef  HAL_FLASH_Unlock_NS(void);
+HAL_StatusTypeDef  HAL_FLASH_Lock_NS(void);
+HAL_StatusTypeDef  HAL_FLASH_Unlock_S(void);
+HAL_StatusTypeDef  HAL_FLASH_Lock_S(void);
+#endif /* __ARM_FEATURE_CMSE */
 /* Option bytes control */
 HAL_StatusTypeDef  HAL_FLASH_OB_Unlock(void);
 HAL_StatusTypeDef  HAL_FLASH_OB_Lock(void);

system/Drivers/STM32U5xx_HAL_Driver/Inc/stm32u5xx_hal_hcd.h

@@ -163,6 +163,8 @@ typedef struct
   */
 #define HCD_PHY_ULPI                 1U
 #define HCD_PHY_EMBEDDED             2U
+#define HCD_HS_PHY_EMBEDDED          3U
+#define HCD_PHY_UTMI                 3U
 /**
   * @}
   */

system/Drivers/STM32U5xx_HAL_Driver/Inc/stm32u5xx_hal_lptim.h

@@ -573,18 +573,14 @@ typedef  void (*pLPTIM_CallbackTypeDef)(LPTIM_HandleTypeDef *hlptim);  /*!< poin
 /**
   * @brief  Disable the LPTIM peripheral.
   * @param  __HANDLE__ LPTIM handle
+  * @note   The following sequence is required to solve LPTIM disable HW limitation.
+  *         Please check Errata Sheet ES0335 for more details under "MCU may remain
+  *         stuck in LPTIM interrupt when entering Stop mode" section.
+  * @note   Please call @ref HAL_LPTIM_GetState() after a call to __HAL_LPTIM_DISABLE to
+  *         check for TIMEOUT.
   * @retval None
   */
-#define __HAL_LPTIM_DISABLE(__HANDLE__) \
-  do { \
-    if (((__HANDLE__)->Instance->CCMR1 & LPTIM_CCMR1_CC1E) == 0UL) \
-    { \
-      if(((__HANDLE__)->Instance->CCMR1 & LPTIM_CCMR1_CC2E) == 0UL) \
-      { \
-        (__HANDLE__)->Instance->CR &= ~(LPTIM_CR_ENABLE); \
-      } \
-    } \
-  } while(0)
+#define __HAL_LPTIM_DISABLE(__HANDLE__)   LPTIM_Disable(__HANDLE__)
 
 /**
   * @brief  Start the LPTIM peripheral in Continuous mode.
@@ -977,9 +973,9 @@ void HAL_LPTIM_IC_OverCaptureCallback(LPTIM_HandleTypeDef *hlptim);
 
 /* Callbacks Register/UnRegister functions  ***********************************/
 #if (USE_HAL_LPTIM_REGISTER_CALLBACKS == 1)
-HAL_StatusTypeDef HAL_LPTIM_RegisterCallback(LPTIM_HandleTypeDef *lphtim, HAL_LPTIM_CallbackIDTypeDef CallbackID,
+HAL_StatusTypeDef HAL_LPTIM_RegisterCallback(LPTIM_HandleTypeDef *hlptim, HAL_LPTIM_CallbackIDTypeDef CallbackID,
                                              pLPTIM_CallbackTypeDef pCallback);
-HAL_StatusTypeDef HAL_LPTIM_UnRegisterCallback(LPTIM_HandleTypeDef *lphtim, HAL_LPTIM_CallbackIDTypeDef CallbackID);
+HAL_StatusTypeDef HAL_LPTIM_UnRegisterCallback(LPTIM_HandleTypeDef *hlptim, HAL_LPTIM_CallbackIDTypeDef CallbackID);
 #endif /* USE_HAL_LPTIM_REGISTER_CALLBACKS */
 /**
   * @}
@@ -1195,6 +1191,7 @@ HAL_LPTIM_StateTypeDef HAL_LPTIM_GetState(const LPTIM_HandleTypeDef *hlptim);
 /** @defgroup LPTIM_Private_Functions LPTIM Private Functions
   * @{
   */
+void LPTIM_Disable(LPTIM_HandleTypeDef *hlptim);
 /**
   * @}
   */

system/Drivers/STM32U5xx_HAL_Driver/Inc/stm32u5xx_hal_ltdc_ex.h

@@ -27,6 +27,8 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32u5xx_hal_def.h"
 
+#if defined(HAL_LTDC_MODULE_ENABLED) && defined(HAL_DSI_MODULE_ENABLED)
+
 #if defined (LTDC) && defined (DSI)
 
 #include "stm32u5xx_hal_dsi.h"
@@ -76,6 +78,8 @@ HAL_StatusTypeDef HAL_LTDCEx_StructInitFromAdaptedCommandConfig(LTDC_HandleTypeD
 
 #endif /* LTDC && DSI */
 
+#endif /* HAL_LTCD_MODULE_ENABLED && HAL_DSI_MODULE_ENABLED */
+
 #ifdef __cplusplus
 }
 #endif

system/Drivers/STM32U5xx_HAL_Driver/Inc/stm32u5xx_hal_ospi.h

@@ -832,6 +832,7 @@ HAL_StatusTypeDef     HAL_OSPI_AutoPolling_IT(OSPI_HandleTypeDef *hospi, OSPI_Au
 
 /* OSPI memory-mapped mode functions */
 HAL_StatusTypeDef     HAL_OSPI_MemoryMapped(OSPI_HandleTypeDef *hospi, OSPI_MemoryMappedTypeDef *cfg);
+uint32_t              HAL_OSPI_IsMemoryMapped(const OSPI_HandleTypeDef *hospi);
 
 /* Callback functions in non-blocking modes ***********************************/
 void                  HAL_OSPI_ErrorCallback(OSPI_HandleTypeDef *hospi);