Skip to content

Commit 6ecaca6

Browse files
djiatsaf-sterwango
djiatsaf-st
authored and
erwango
committed
stm32cube: stm32h7rsxx: drivers: include: update hal-ll header
synchronize hal-ll header files with correct h7rs cube repository history. Signed-off-by: Fabrice DJIATSA <[email protected]>
1 parent f0b2519 commit 6ecaca6

13 files changed

+67
-49
lines changed

‎stm32cube/stm32h7rsxx/drivers/include/Legacy/stm32_hal_legacy.h

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,16 @@ extern "C" {
554554
#define OB_SRAM134_RST_ERASE OB_SRAM_RST_ERASE
555555
#define OB_SRAM134_RST_NOT_ERASE OB_SRAM_RST_NOT_ERASE
556556
#endif /* STM32U5 */
557+
#if defined(STM32U0)
558+
#define OB_USER_nRST_STOP OB_USER_NRST_STOP
559+
#define OB_USER_nRST_STDBY OB_USER_NRST_STDBY
560+
#define OB_USER_nRST_SHDW OB_USER_NRST_SHDW
561+
#define OB_USER_nBOOT_SEL OB_USER_NBOOT_SEL
562+
#define OB_USER_nBOOT0 OB_USER_NBOOT0
563+
#define OB_USER_nBOOT1 OB_USER_NBOOT1
564+
#define OB_nBOOT0_RESET OB_NBOOT0_RESET
565+
#define OB_nBOOT0_SET OB_NBOOT0_SET
566+
#endif /* STM32U0 */
557567

558568
/**
559569
* @}
@@ -3792,10 +3802,10 @@ extern "C" {
37923802
#define __HAL_RCC_GET_DFSDM_SOURCE __HAL_RCC_GET_DFSDM1_SOURCE
37933803
#define RCC_DFSDM1CLKSOURCE_PCLK RCC_DFSDM1CLKSOURCE_PCLK2
37943804
#define RCC_SWPMI1CLKSOURCE_PCLK RCC_SWPMI1CLKSOURCE_PCLK1
3795-
3805+
#if !defined(STM32U0)
37963806
#define RCC_LPTIM1CLKSOURCE_PCLK RCC_LPTIM1CLKSOURCE_PCLK1
37973807
#define RCC_LPTIM2CLKSOURCE_PCLK RCC_LPTIM2CLKSOURCE_PCLK1
3798-
3808+
#endif
37993809

38003810
#define RCC_DFSDM1AUDIOCLKSOURCE_I2SAPB1 RCC_DFSDM1AUDIOCLKSOURCE_I2S1
38013811
#define RCC_DFSDM1AUDIOCLKSOURCE_I2SAPB2 RCC_DFSDM1AUDIOCLKSOURCE_I2S2

‎stm32cube/stm32h7rsxx/drivers/include/stm32h7rsxx_hal_cortex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ void HAL_CORTEX_ClearEvent(void);
388388

389389
#define IS_MPU_SUB_REGION_DISABLE(__SUBREGION__) ((__SUBREGION__) < (uint16_t)0x00FFU)
390390

391-
#define IS_MPU_ADDRESS_MULTIPLE_SIZE(__ADDRESS__, __SIZE__) (((__ADDRESS__) & (1<<(__SIZE__+1U))- 1U) == 0U)
391+
#define IS_MPU_ADDRESS_MULTIPLE_SIZE(__ADDRESS__, __SIZE__) (((__ADDRESS__) & ((1<<(__SIZE__+1U))- 1U)) == 0U)
392392

393393
/**
394394
* @}

‎stm32cube/stm32h7rsxx/drivers/include/stm32h7rsxx_hal_def.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@ typedef enum
130130
/* Macro to get buffer 32-bytes aligned (aligned to cache line width) */
131131
#define ALIGN_32BYTES(buf) buf __attribute__((aligned(32)))
132132

133+
/* Macro to get buffer 8-bytes aligned (aligned to double-word width) */
134+
/* This alignment is required for double-word DMA transfers */
135+
#define ALIGN_8BYTES(buf) buf __attribute__((aligned(8)))
136+
133137
/* Legacy macros to get variable 4-bytes aligned */
134138
#ifndef __ALIGN_BEGIN
135139
#define __ALIGN_BEGIN

‎stm32cube/stm32h7rsxx/drivers/include/stm32h7rsxx_hal_flash_ex.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ void HAL_FLASHEx_EnableEccDetectionInterrupt(void);
204204
void HAL_FLASHEx_DisableEccDetectionInterrupt(void);
205205
void HAL_FLASHEx_GetEccInfo(FLASH_EccInfoTypeDef *pData);
206206
void HAL_FLASHEx_ECCD_IRQHandler(void);
207-
__weak void HAL_FLASHEx_EccDetectionCallback(void);
208-
__weak void HAL_FLASHEx_EccCorrectionCallback(void);
207+
void HAL_FLASHEx_EccDetectionCallback(void);
208+
void HAL_FLASHEx_EccCorrectionCallback(void);
209209
/**
210210
* @}
211211
*/

‎stm32cube/stm32h7rsxx/drivers/include/stm32h7rsxx_hal_mdios.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ typedef struct
8383
typedef struct __MDIOS_HandleTypeDef
8484
#else
8585
typedef struct
86-
#endif
86+
#endif /* USE_HAL_MDIOS_REGISTER_CALLBACKS */
8787
{
8888
MDIOS_TypeDef *Instance; /*!< Register base address */
8989

‎stm32cube/stm32h7rsxx/drivers/include/stm32h7rsxx_hal_rcc.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4103,7 +4103,6 @@ typedef struct
41034103
* 192 to 836 MHz or 128 to 560 MHz(*) if PLL2VCOSEL = 0
41044104
* 150 to 420 MHz if PLL2VCOSEL = 1.
41054105
*
4106-
* (*) : For stm32h7a3xx and stm32h7b3xx family lines.
41074106
*
41084107
* @retval None
41094108
*/
@@ -4129,7 +4128,6 @@ typedef struct
41294128
* @arg RCC_PLL_VCO_HIGH: Range frequency is between 192 and 836 MHz or between 128 to 560 MHz(*)
41304129
* @arg RCC_PLL_VCO_LOW: Range frequency is between 150 and 420 MHz
41314130
*
4132-
* (*) : For stm32h7a3xx and stm32h7b3xx family lines.
41334131
*
41344132
* @retval None
41354133
*/
@@ -4242,7 +4240,6 @@ typedef struct
42424240
* 192 to 836 MHz or 128 to 560 MHz(*) if PLL3VCOSEL = 0
42434241
* 150 to 420 MHz if PLL3VCOSEL = 1.
42444242
*
4245-
* (*) : For stm32h7a3xx and stm32h7b3xx family lines.
42464243
*
42474244
* @retval None
42484245
*/
@@ -4266,7 +4263,6 @@ typedef struct
42664263
* @arg RCC_PLL_VCO_HIGH: Range frequency is between 192 and 836 MHz or between 128 to 560 MHz(*)
42674264
* @arg RCC_PLL_VCO_HIGH: Range frequency is between 150 and 420 MHz
42684265
*
4269-
* (*) : For stm32h7a3xx and stm32h7b3xx family lines.
42704266
*
42714267
* @retval None
42724268
*/

‎stm32cube/stm32h7rsxx/drivers/include/stm32h7rsxx_hal_rcc_ex.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ typedef struct
888888
* @arg RCC_FMCCLKSOURCE_HCLK_DIV4 Recovery Clock selected as FMC clock
889889
*/
890890
#define __HAL_RCC_GET_FMC_SOURCE() ((READ_BIT(RCC->CKPROTR, RCC_CKPROTR_FMCSWP) == RCC_FMCCLKSOURCE_HCLK_DIV4) ? \
891-
RCC_FMCCLKSOURCE_HCLK_DIV4 : ((uint32_t)(READ_BIT(RCC->CCIPR1, RCC_CCIPR1_FMCSEL))))
891+
RCC_FMCCLKSOURCE_HCLK_DIV4 : ((uint32_t)(READ_BIT(RCC->CCIPR1, RCC_CCIPR1_FMCSEL))))
892892

893893
/** @brief Macro to configure the I2C1/I3C1 clock source.
894894
* @param __I2C1_I3C1_CLKSOURCE__ specifies the I2C1/I3C1clock source.
@@ -1070,7 +1070,7 @@ typedef struct
10701070
* @arg RCC_XSPI1CLKSOURCE_HCLK_DIV4 Recovery Clock selected as XSPI1 clock
10711071
*/
10721072
#define __HAL_RCC_GET_XSPI1_SOURCE() ((READ_BIT(RCC->CKPROTR, RCC_CKPROTR_XSPI1SWP) == RCC_XSPI1CLKSOURCE_HCLK_DIV4) ? \
1073-
RCC_XSPI1CLKSOURCE_HCLK_DIV4 : ((uint32_t)(READ_BIT(RCC->CCIPR1, RCC_CCIPR1_XSPI1SEL))))
1073+
RCC_XSPI1CLKSOURCE_HCLK_DIV4 : ((uint32_t)(READ_BIT(RCC->CCIPR1, RCC_CCIPR1_XSPI1SEL))))
10741074

10751075
/** @brief Macro to configure the XSPI2 clock source.
10761076
*
@@ -1090,7 +1090,7 @@ typedef struct
10901090
* @arg RCC_XSPI2CLKSOURCE_HCLK_DIV4 Recovery Clock selected as XSPI2 clock
10911091
*/
10921092
#define __HAL_RCC_GET_XSPI2_SOURCE() ((READ_BIT(RCC->CKPROTR, RCC_CKPROTR_XSPI2SWP) == RCC_XSPI2CLKSOURCE_HCLK_DIV4) ? \
1093-
RCC_XSPI2CLKSOURCE_HCLK_DIV4 : ((uint32_t)(READ_BIT(RCC->CCIPR1, RCC_CCIPR1_XSPI2SEL))))
1093+
RCC_XSPI2CLKSOURCE_HCLK_DIV4 : ((uint32_t)(READ_BIT(RCC->CCIPR1, RCC_CCIPR1_XSPI2SEL))))
10941094

10951095
/**
10961096
* @brief Macro to configure the PSSI clock source.

‎stm32cube/stm32h7rsxx/drivers/include/stm32h7rsxx_hal_rng_ex.h

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ extern "C" {
3434
#if defined(RNG)
3535
#if defined(RNG_CR_CONDRST)
3636

37-
/** @defgroup RNG_Ex RNG_Ex
37+
/** @defgroup RNGEx RNGEx
3838
* @brief RNG Extension HAL module driver
3939
* @{
4040
*/
4141

4242
/* Exported types ------------------------------------------------------------*/
43-
/** @defgroup RNG_Ex_Exported_Types RNG_Ex Exported Types
44-
* @brief RNG_Ex Exported types
43+
/** @defgroup RNGEx_Exported_Types RNGEx Exported Types
44+
* @brief RNGEx Exported types
4545
* @{
4646
*/
4747

4848
/**
49-
* @brief RNG_Ex Configuration Structure definition
49+
* @brief RNGEx Configuration Structure definition
5050
*/
5151

5252
typedef struct
@@ -55,11 +55,11 @@ typedef struct
5555
uint32_t Config2; /*!< Config2 must be a value between 0 and 0x7 */
5656
uint32_t Config3; /*!< Config3 must be a value between 0 and 0xF */
5757
uint32_t ClockDivider; /*!< Clock Divider factor.This parameter can
58-
be a value of @ref RNG_Ex_Clock_Divider_Factor */
58+
be a value of @ref RNGEx_Clock_Divider_Factor */
5959
uint32_t NistCompliance; /*!< NIST compliance.This parameter can be a
60-
value of @ref RNG_Ex_NIST_Compliance */
60+
value of @ref RNGEx_NIST_Compliance */
6161
uint32_t AutoReset; /*!< automatic reset When a noise source error occurs
62-
value of @ref RNG_Ex_Auto_Reset */
62+
value of @ref RNGEx_Auto_Reset */
6363
uint32_t HealthTest; /*!< RNG health test control must be a value
6464
between 0x0FFCABFF and 0x00005200 */
6565
} RNG_ConfigTypeDef;
@@ -69,11 +69,11 @@ typedef struct
6969
*/
7070

7171
/* Exported constants --------------------------------------------------------*/
72-
/** @defgroup RNG_Ex_Exported_Constants RNG_Ex Exported Constants
72+
/** @defgroup RNGEx_Exported_Constants RNGEx Exported Constants
7373
* @{
7474
*/
7575

76-
/** @defgroup RNG_Ex_Clock_Divider_Factor Value used to configure an internal
76+
/** @defgroup RNGEx_Clock_Divider_Factor Value used to configure an internal
7777
* programmable divider acting on the incoming RNG clock
7878
* @{
7979
*/
@@ -112,7 +112,7 @@ typedef struct
112112
* @}
113113
*/
114114

115-
/** @defgroup RNG_Ex_NIST_Compliance NIST Compliance configuration
115+
/** @defgroup RNGEx_NIST_Compliance NIST Compliance configuration
116116
* @{
117117
*/
118118
#define RNG_NIST_COMPLIANT (0x00000000UL) /*!< NIST compliant configuration*/
@@ -121,7 +121,7 @@ typedef struct
121121
/**
122122
* @}
123123
*/
124-
/** @defgroup RNG_Ex_Auto_Reset Auto Reset configuration
124+
/** @defgroup RNGEx_Auto_Reset Auto Reset configuration
125125
* @{
126126
*/
127127
#define RNG_ARDIS_ENABLE (0x00000000UL) /*!< automatic reset after seed error*/
@@ -136,7 +136,7 @@ typedef struct
136136
*/
137137

138138
/* Private types -------------------------------------------------------------*/
139-
/** @defgroup RNG_Ex_Private_Types RNG_Ex Private Types
139+
/** @defgroup RNGEx_Private_Types RNGEx Private Types
140140
* @{
141141
*/
142142

@@ -145,7 +145,7 @@ typedef struct
145145
*/
146146

147147
/* Private variables ---------------------------------------------------------*/
148-
/** @defgroup RNG_Ex_Private_Variables RNG_Ex Private Variables
148+
/** @defgroup RNGEx_Private_Variables RNGEx Private Variables
149149
* @{
150150
*/
151151

@@ -154,7 +154,7 @@ typedef struct
154154
*/
155155

156156
/* Private constants ---------------------------------------------------------*/
157-
/** @defgroup RNG_Ex_Private_Constants RNG_Ex Private Constants
157+
/** @defgroup RNGEx_Private_Constants RNGEx Private Constants
158158
* @{
159159
*/
160160

@@ -163,7 +163,7 @@ typedef struct
163163
*/
164164

165165
/* Private macros ------------------------------------------------------------*/
166-
/** @defgroup RNG_Ex_Private_Macros RNG_Ex Private Macros
166+
/** @defgroup RNGEx_Private_Macros RNGEx Private Macros
167167
* @{
168168
*/
169169

@@ -202,7 +202,7 @@ typedef struct
202202
*/
203203

204204
/* Private functions ---------------------------------------------------------*/
205-
/** @defgroup RNG_Ex_Private_Functions RNG_Ex Private Functions
205+
/** @defgroup RNGEx_Private_Functions RNGEx Private Functions
206206
* @{
207207
*/
208208

@@ -211,11 +211,11 @@ typedef struct
211211
*/
212212

213213
/* Exported functions --------------------------------------------------------*/
214-
/** @addtogroup RNG_Ex_Exported_Functions
214+
/** @addtogroup RNGEx_Exported_Functions
215215
* @{
216216
*/
217217

218-
/** @addtogroup RNG_Ex_Exported_Functions_Group1
218+
/** @addtogroup RNGEx_Exported_Functions_Group1
219219
* @{
220220
*/
221221
HAL_StatusTypeDef HAL_RNGEx_SetConfig(RNG_HandleTypeDef *hrng, const RNG_ConfigTypeDef *pConf);
@@ -226,7 +226,7 @@ HAL_StatusTypeDef HAL_RNGEx_LockConfig(RNG_HandleTypeDef *hrng);
226226
* @}
227227
*/
228228

229-
/** @addtogroup RNG_Ex_Exported_Functions_Group2
229+
/** @addtogroup RNGEx_Exported_Functions_Group2
230230
* @{
231231
*/
232232
HAL_StatusTypeDef HAL_RNGEx_RecoverSeedError(RNG_HandleTypeDef *hrng);
@@ -260,3 +260,4 @@ HAL_StatusTypeDef HAL_RNGEx_RecoverSeedError(RNG_HandleTypeDef *hrng);
260260

261261

262262
#endif /* STM32H7RSxx_HAL_RNG_EX_H */
263+

‎stm32cube/stm32h7rsxx/drivers/include/stm32h7rsxx_hal_sdio.h

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -434,19 +434,21 @@ HAL_StatusTypeDef HAL_SDIO_GetCardFBRRegister(SDIO_HandleTypeDef *hsdio, HAL_SDI
434434
/** @defgroup SDIO_Exported_Functions_Group3 Process functions
435435
* @{
436436
*/
437-
HAL_StatusTypeDef HAL_SDIO_ReadDirect(SDIO_HandleTypeDef *hsdio, HAL_SDIO_DirectCmd_TypeDef *Argument, uint8_t *pData);
438-
HAL_StatusTypeDef HAL_SDIO_WriteDirect(SDIO_HandleTypeDef *hsdio, HAL_SDIO_DirectCmd_TypeDef *Argument, uint8_t Data);
437+
HAL_StatusTypeDef HAL_SDIO_ReadDirect(SDIO_HandleTypeDef *hsdio, const HAL_SDIO_DirectCmd_TypeDef *Argument,
438+
uint8_t *pData);
439+
HAL_StatusTypeDef HAL_SDIO_WriteDirect(SDIO_HandleTypeDef *hsdio, const HAL_SDIO_DirectCmd_TypeDef *Argument,
440+
uint8_t Data);
439441

440-
HAL_StatusTypeDef HAL_SDIO_ReadExtended(SDIO_HandleTypeDef *hsdio, HAL_SDIO_ExtendedCmd_TypeDef *Argument,
442+
HAL_StatusTypeDef HAL_SDIO_ReadExtended(SDIO_HandleTypeDef *hsdio, const HAL_SDIO_ExtendedCmd_TypeDef *Argument,
441443
uint8_t *pData, uint32_t Size_byte, uint32_t Timeout_Ms);
442444

443-
HAL_StatusTypeDef HAL_SDIO_WriteExtended(SDIO_HandleTypeDef *hsdio, HAL_SDIO_ExtendedCmd_TypeDef *Argument,
445+
HAL_StatusTypeDef HAL_SDIO_WriteExtended(SDIO_HandleTypeDef *hsdio, const HAL_SDIO_ExtendedCmd_TypeDef *Argument,
444446
uint8_t *pData, uint32_t Size_byte, uint32_t Timeout_Ms);
445447

446-
HAL_StatusTypeDef HAL_SDIO_ReadExtended_DMA(SDIO_HandleTypeDef *hsdio, HAL_SDIO_ExtendedCmd_TypeDef *Argument,
448+
HAL_StatusTypeDef HAL_SDIO_ReadExtended_DMA(SDIO_HandleTypeDef *hsdio, const HAL_SDIO_ExtendedCmd_TypeDef *Argument,
447449
uint8_t *pData, uint32_t Size_byte);
448450

449-
HAL_StatusTypeDef HAL_SDIO_WriteExtended_DMA(SDIO_HandleTypeDef *hsdio, HAL_SDIO_ExtendedCmd_TypeDef *Argument,
451+
HAL_StatusTypeDef HAL_SDIO_WriteExtended_DMA(SDIO_HandleTypeDef *hsdio, const HAL_SDIO_ExtendedCmd_TypeDef *Argument,
450452
uint8_t *pData, uint32_t Size_byte);
451453
/**
452454
* @}
@@ -598,3 +600,4 @@ HAL_StatusTypeDef HAL_SDIO_DisableIOAsynInterrupt(SDIO_HandleTypeDef *hsdio);
598600

599601

600602
#endif /* STM32H7RSxx_HAL_SDIO_H */
603+

‎stm32cube/stm32h7rsxx/drivers/include/stm32h7rsxx_hal_usart_ex.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,3 +279,4 @@ HAL_StatusTypeDef HAL_USARTEx_SetRxFifoThreshold(USART_HandleTypeDef *husart, ui
279279
#endif
280280

281281
#endif /* STM32H7RSxx_HAL_USART_EX_H */
282+

‎stm32cube/stm32h7rsxx/drivers/include/stm32h7rsxx_ll_dlyb.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ extern "C" {
3131
* @{
3232
*/
3333

34-
#if defined(HAL_SD_MODULE_ENABLED) || defined(HAL_OSPI_MODULE_ENABLED) || defined(HAL_XSPI_MODULE_ENABLED)
35-
#if defined (DLYB_SDMMC1) || defined (DLYB_SDMMC2) || defined (DLYB_OCTOSPI1) || defined (DLYB_OCTOSPI2)
34+
#if defined(HAL_SD_MODULE_ENABLED)
35+
#if defined (DLYB_SDMMC1) || defined (DLYB_SDMMC2)
3636

3737
/* Exported types ------------------------------------------------------------*/
3838
/** @defgroup DLYB_LL DLYB
@@ -129,8 +129,8 @@ uint32_t LL_DLYB_GetClockPeriod(DLYB_TypeDef *DLYBx, LL_DLYB_CfgTypeDef *pdlyb_c
129129
* @}
130130
*/
131131

132-
#endif /* DLYB_SDMMC1 || DLYB_SDMMC2 || DLYB_OCTOSPI1 || DLYB_OCTOSPI2 */
133-
#endif /* HAL_SD_MODULE_ENABLED || HAL_OSPI_MODULE_ENABLED || HAL_XSPI_MODULE_ENABLED */
132+
#endif /* DLYB_SDMMC1 || DLYB_SDMMC2 */
133+
#endif /* HAL_SD_MODULE_ENABLED */
134134

135135
/**
136136
* @}

‎stm32cube/stm32h7rsxx/drivers/include/stm32h7rsxx_ll_rcc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ extern "C" {
7575
*/
7676
#if !defined(UNUSED)
7777
#define UNUSED(x) ((void)(x))
78-
#endif
78+
#endif /* UNUSED */
7979

8080
#define LL_CLKSOURCE_SHIFT(__CLKSOURCE__) (((__CLKSOURCE__) >> LL_RCC_POS_SHIFT ) & 0x1FUL)
8181

@@ -5445,7 +5445,7 @@ __STATIC_INLINE uint32_t LL_RCC_IsActiveFlag_HSECSS(void)
54455445
}
54465446

54475447
/**
5448-
* @brief Check if RCC flag Low Power D1 reset is set or not.
5448+
* @brief Check if RCC flag Low Power reset is set or not.
54495449
* @rmtoll RSR LPWRRSTF LL_RCC_IsActiveFlag_LPWRRST
54505450
* @retval State of bit (1 or 0).
54515451
*/

0 commit comments

Comments
 (0)