Skip to content

Commit 763bac7

Browse files
fpistmfpistm
committed
system(h7) update STM32H7xx HAL Drivers to v1.11.6
Included in STM32CubeH7 FW v1.13.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 1b98ba7 commit 763bac7

79 files changed

Lines changed: 1637 additions & 943 deletions

File tree

Some content is hidden

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

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

Lines changed: 27 additions & 12 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

@@ -538,6 +540,10 @@ extern "C" {
538540
#define FLASH_FLAG_WDW FLASH_FLAG_WBNE
539541
#define OB_WRP_SECTOR_All OB_WRP_SECTOR_ALL
540542
#endif /* STM32H7 */
543+
#if defined(STM32H7RS)
544+
#define FLASH_OPTKEY1 FLASH_OPT_KEY1
545+
#define FLASH_OPTKEY2 FLASH_OPT_KEY2
546+
#endif /* STM32H7RS */
541547
#if defined(STM32U5)
542548
#define OB_USER_nRST_STOP OB_USER_NRST_STOP
543549
#define OB_USER_nRST_STDBY OB_USER_NRST_STDBY
@@ -560,6 +566,9 @@ extern "C" {
560566
#define OB_nBOOT0_RESET OB_NBOOT0_RESET
561567
#define OB_nBOOT0_SET OB_NBOOT0_SET
562568
#endif /* STM32U0 */
569+
#if defined(STM32H5)
570+
#define FLASH_ECC_AREA_EDATA FLASH_ECC_AREA_EDATA_BANK1
571+
#endif /* STM32H5 */
563572

564573
/**
565574
* @}
@@ -1299,22 +1308,22 @@ extern "C" {
12991308
#define TAMP_SECRETDEVICE_ERASE_ENABLE TAMP_SECRETDEVICE_ERASE_ALL
13001309
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
13011310

1302-
#if defined(STM32F7)
1311+
#if defined(STM32F7) || defined(STM32WB)
13031312
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_ENABLE_BITS_MASK
13041313
#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_IT_ENABLE_BITS_MASK
1305-
#endif /* STM32F7 */
1314+
#endif /* STM32F7 || STM32WB */
13061315

13071316
#if defined(STM32H7)
13081317
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_X
13091318
#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_X_INTERRUPT
13101319
#endif /* STM32H7 */
13111320

1312-
#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0)
1321+
#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0) || defined(STM32WB)
13131322
#define RTC_TAMPER1_INTERRUPT RTC_IT_TAMP1
13141323
#define RTC_TAMPER2_INTERRUPT RTC_IT_TAMP2
13151324
#define RTC_TAMPER3_INTERRUPT RTC_IT_TAMP3
13161325
#define RTC_ALL_TAMPER_INTERRUPT RTC_IT_TAMP
1317-
#endif /* STM32F7 || STM32H7 || STM32L0 */
1326+
#endif /* STM32F7 || STM32H7 || STM32L0 || STM32WB */
13181327

13191328
/**
13201329
* @}
@@ -1481,7 +1490,7 @@ extern "C" {
14811490
#define TIM_TIM3_TI1_COMP1COMP2_OUT TIM_TIM3_TI1_COMP1_COMP2
14821491
#endif
14831492

1484-
#if defined(STM32U5)
1493+
#if defined(STM32U5) || defined(STM32MP2)
14851494
#define OCREF_CLEAR_SELECT_Pos OCREF_CLEAR_SELECT_POS
14861495
#define OCREF_CLEAR_SELECT_Msk OCREF_CLEAR_SELECT_MSK
14871496
#endif
@@ -2021,6 +2030,9 @@ extern "C" {
20212030

20222031
#define PWR_ALL_RAM_RUN_RETENTION_MASK PWR_ALL_RAM_RUN_MASK
20232032
#endif
2033+
#if defined (STM32H7RS)
2034+
#define PWR_SMPS_1V8_SUPPLIES_EXT_AND_LDO PWR_SMPS_1V8_SUPPLIES_EXT_VDD_SUPPLIES_LDO
2035+
#endif
20242036

20252037
/**
20262038
* @}
@@ -2142,6 +2154,13 @@ extern "C" {
21422154
#define UFB_MODE_BitNumber UFB_MODE_BIT_NUMBER
21432155
#define CMP_PD_BitNumber CMP_PD_BIT_NUMBER
21442156

2157+
#if defined(STM32H7RS) || defined(STM32N6)
2158+
#define FMC_SWAPBMAP_DISABLE FMC_SWAPBANK_MODE0
2159+
#define FMC_SWAPBMAP_SDRAM_SRAM FMC_SWAPBANK_MODE1
2160+
#define HAL_SetFMCMemorySwappingConfig HAL_FMC_SetBankSwapConfig
2161+
#define HAL_GetFMCMemorySwappingConfig HAL_FMC_GetBankSwapConfig
2162+
#endif /* STM32H7RS || STM32N6 */
2163+
21452164
/**
21462165
* @}
21472166
*/
@@ -3694,8 +3713,7 @@ extern "C" {
36943713
#define RCC_SYSCLKSOURCE_STATUS_PLLR RCC_SYSCLKSOURCE_STATUS_PLLCLK
36953714
#endif
36963715

3697-
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || \
3698-
defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) || defined(STM32U0)
3716+
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) || defined(STM32U0)
36993717
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
37003718
#else
37013719
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
@@ -3944,10 +3962,7 @@ extern "C" {
39443962
/** @defgroup HAL_RTC_Aliased_Macros HAL RTC Aliased Macros maintained for legacy purpose
39453963
* @{
39463964
*/
3947-
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \
3948-
defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
3949-
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32N6) || \
3950-
defined (STM32H7RS) || defined (STM32U0) || defined (STM32U3)
3965+
#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)
39513966
#else
39523967
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39533968
#endif

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/Legacy/stm32h7xx_hal_eth_legacy.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,8 +1557,8 @@ typedef struct{
15571557
* @}
15581558
*/
15591559

1560-
/* Include ETH HAL Extension module */
1561-
#include "stm32h7xx_hal_eth_ex.h"
1560+
/* Include ETH HAL Legacy Extension module */
1561+
#include "stm32h7xx_hal_eth_ex_legacy.h"
15621562

15631563
/* Exported functions --------------------------------------------------------*/
15641564

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_crc.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ void HAL_CRC_MspDeInit(CRC_HandleTypeDef *hcrc);
308308
/** @defgroup CRC_Exported_Functions_Group2 Peripheral Control functions
309309
* @{
310310
*/
311-
uint32_t HAL_CRC_Accumulate(CRC_HandleTypeDef *hcrc, uint32_t pBuffer[], uint32_t BufferLength);
312-
uint32_t HAL_CRC_Calculate(CRC_HandleTypeDef *hcrc, uint32_t pBuffer[], uint32_t BufferLength);
311+
uint32_t HAL_CRC_Accumulate(CRC_HandleTypeDef *hcrc, const uint32_t pBuffer[], uint32_t BufferLength);
312+
uint32_t HAL_CRC_Calculate(CRC_HandleTypeDef *hcrc, const uint32_t pBuffer[], uint32_t BufferLength);
313313
/**
314314
* @}
315315
*/

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_cryp_ex.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,10 @@ extern "C" {
9191
/** @addtogroup CRYPEx_Exported_Functions_Group1
9292
* @{
9393
*/
94-
HAL_StatusTypeDef HAL_CRYPEx_AESGCM_GenerateAuthTAG(CRYP_HandleTypeDef *hcryp, const uint32_t *AuthTag, uint32_t Timeout);
95-
HAL_StatusTypeDef HAL_CRYPEx_AESCCM_GenerateAuthTAG(CRYP_HandleTypeDef *hcryp, const uint32_t *AuthTag, uint32_t Timeout);
94+
HAL_StatusTypeDef HAL_CRYPEx_AESGCM_GenerateAuthTAG(CRYP_HandleTypeDef *hcryp, const uint32_t *AuthTag,
95+
uint32_t Timeout);
96+
HAL_StatusTypeDef HAL_CRYPEx_AESCCM_GenerateAuthTAG(CRYP_HandleTypeDef *hcryp, const uint32_t *AuthTag,
97+
uint32_t Timeout);
9698

9799

98100
/**

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_eth_ex.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ HAL_StatusTypeDef HAL_ETHEx_SetL4FilterConfig(ETH_HandleTypeDef *heth, uint32_t
327327
void HAL_ETHEx_EnableVLANProcessing(ETH_HandleTypeDef *heth);
328328
void HAL_ETHEx_DisableVLANProcessing(ETH_HandleTypeDef *heth);
329329
HAL_StatusTypeDef HAL_ETHEx_GetRxVLANConfig(const ETH_HandleTypeDef *heth, ETH_RxVLANConfigTypeDef *pVlanConfig);
330-
HAL_StatusTypeDef HAL_ETHEx_SetRxVLANConfig(ETH_HandleTypeDef *heth, ETH_RxVLANConfigTypeDef *pVlanConfig);
330+
HAL_StatusTypeDef HAL_ETHEx_SetRxVLANConfig(ETH_HandleTypeDef *heth, const ETH_RxVLANConfigTypeDef *pVlanConfig);
331331
void HAL_ETHEx_SetVLANHashTable(ETH_HandleTypeDef *heth, uint32_t VLANHashTable);
332332
HAL_StatusTypeDef HAL_ETHEx_GetTxVLANConfig(const ETH_HandleTypeDef *heth, uint32_t VLANTag,
333333
ETH_TxVLANConfigTypeDef *pVlanConfig);

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_exti.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,22 @@ typedef enum
5252
*/
5353
typedef struct
5454
{
55-
uint32_t Line; /*!< Exti line number */
56-
void (* PendingCallback)(void); /*!< Exti pending callback */
55+
uint32_t Line; /*!< EXTI line number */
56+
void (* PendingCallback)(void); /*!< EXTI pending callback */
5757
} EXTI_HandleTypeDef;
5858

5959
/**
6060
* @brief EXTI Configuration structure definition
6161
*/
6262
typedef struct
6363
{
64-
uint32_t Line; /*!< The Exti line to be configured. This parameter
64+
uint32_t Line; /*!< The EXTI line to be configured. This parameter
6565
can be a value of @ref EXTI_Line */
66-
uint32_t Mode; /*!< The Exit Mode to be configured for a core.
66+
uint32_t Mode; /*!< The EXTI Mode to be configured for a core.
6767
This parameter can be a combination of @ref EXTI_Mode */
68-
uint32_t Trigger; /*!< The Exti Trigger to be configured. This parameter
68+
uint32_t Trigger; /*!< The EXTI Trigger to be configured. This parameter
6969
can be a value of @ref EXTI_Trigger */
70-
uint32_t GPIOSel; /*!< The Exti GPIO multiplexer selection to be configured.
70+
uint32_t GPIOSel; /*!< The EXTI GPIO multiplexer selection to be configured.
7171
This parameter is only possible for line 0 to 15. It
7272
can be a value of @ref EXTI_GPIOSel */
7373

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_flash_ex.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -888,8 +888,8 @@ void HAL_FLASHEx_DisableEccDetectionInterrupt_Bank2(void);
888888
void HAL_FLASHEx_GetEccInfo(FLASH_EccInfoTypeDef *pData);
889889
void HAL_FLASHEx_BusFault_IRQHandler(void);
890890

891-
__weak void HAL_FLASHEx_EccDetectionCallback(void);
892-
__weak void HAL_FLASHEx_EccCorrectionCallback(void);
891+
void HAL_FLASHEx_EccDetectionCallback(void);
892+
void HAL_FLASHEx_EccCorrectionCallback(void);
893893
/**
894894
* @}
895895
*/

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_hcd.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ typedef struct
103103
/** @defgroup HCD_Exported_Constants HCD Exported Constants
104104
* @{
105105
*/
106+
#ifndef HAL_HCD_CHANNEL_NAK_COUNT
107+
#define HAL_HCD_CHANNEL_NAK_COUNT 2U
108+
#endif /* HAL_HCD_CHANNEL_NAK_COUNT */
106109

107110
/** @defgroup HCD_Speed HCD Speed
108111
* @{
@@ -193,6 +196,7 @@ HAL_StatusTypeDef HAL_HCD_HC_Init(HCD_HandleTypeDef *hhcd, uint8_t ch_num,
193196
uint8_t speed, uint8_t ep_type, uint16_t mps);
194197

195198
HAL_StatusTypeDef HAL_HCD_HC_Halt(HCD_HandleTypeDef *hhcd, uint8_t ch_num);
199+
HAL_StatusTypeDef HAL_HCD_HC_Activate(HCD_HandleTypeDef *hhcd, uint8_t ch_num);
196200
void HAL_HCD_MspInit(HCD_HandleTypeDef *hhcd);
197201
void HAL_HCD_MspDeInit(HCD_HandleTypeDef *hhcd);
198202

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_lptim.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,9 +645,9 @@ void HAL_LPTIM_DirectionDownCallback(LPTIM_HandleTypeDef *hlptim);
645645

646646
/* Callbacks Register/UnRegister functions ***********************************/
647647
#if (USE_HAL_LPTIM_REGISTER_CALLBACKS == 1)
648-
HAL_StatusTypeDef HAL_LPTIM_RegisterCallback(LPTIM_HandleTypeDef *lphtim, HAL_LPTIM_CallbackIDTypeDef CallbackID,
648+
HAL_StatusTypeDef HAL_LPTIM_RegisterCallback(LPTIM_HandleTypeDef *hlptim, HAL_LPTIM_CallbackIDTypeDef CallbackID,
649649
pLPTIM_CallbackTypeDef pCallback);
650-
HAL_StatusTypeDef HAL_LPTIM_UnRegisterCallback(LPTIM_HandleTypeDef *lphtim, HAL_LPTIM_CallbackIDTypeDef CallbackID);
650+
HAL_StatusTypeDef HAL_LPTIM_UnRegisterCallback(LPTIM_HandleTypeDef *hlptim, HAL_LPTIM_CallbackIDTypeDef CallbackID);
651651
#endif /* USE_HAL_LPTIM_REGISTER_CALLBACKS */
652652
/**
653653
* @}

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_ltdc_ex.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ extern "C" {
2727
/* Includes ------------------------------------------------------------------*/
2828
#include "stm32h7xx_hal_def.h"
2929

30+
#if defined(HAL_LTDC_MODULE_ENABLED) && defined(HAL_DSI_MODULE_ENABLED)
31+
3032
#if defined (LTDC) && defined (DSI)
3133

3234
#include "stm32h7xx_hal_dsi.h"
@@ -76,6 +78,8 @@ HAL_StatusTypeDef HAL_LTDCEx_StructInitFromAdaptedCommandConfig(LTDC_HandleTypeD
7678

7779
#endif /* LTDC && DSI */
7880

81+
#endif /* HAL_LTCD_MODULE_ENABLED && HAL_DSI_MODULE_ENABLED */
82+
7983
#ifdef __cplusplus
8084
}
8185
#endif

0 commit comments

Comments
 (0)