Skip to content

Commit a49da9e

Browse files
fpistmfpistm
committed
system(g4) update STM32G4xx HAL Drivers to v1.2.6
Included in STM32CubeG4 FW v1.6.2 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 1b98ba7 commit a49da9e

89 files changed

Lines changed: 3114 additions & 1308 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/STM32G4xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,10 +1279,10 @@ extern "C" {
12791279
#define RTC_TAMPERPIN_PA0 RTC_TAMPERPIN_POS1
12801280
#define RTC_TAMPERPIN_PI8 RTC_TAMPERPIN_POS1
12811281

1282-
#if defined(STM32H5) || defined(STM32H7RS)
1282+
#if defined(STM32H5) || defined(STM32H7RS) || defined(STM32N6)
12831283
#define TAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
12841284
#define TAMP_SECRETDEVICE_ERASE_BKP_SRAM TAMP_DEVICESECRETS_ERASE_BKPSRAM
1285-
#endif /* STM32H5 || STM32H7RS */
1285+
#endif /* STM32H5 || STM32H7RS || STM32N6 */
12861286

12871287
#if defined(STM32WBA)
12881288
#define TAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
@@ -1294,10 +1294,10 @@ extern "C" {
12941294
#define TAMP_SECRETDEVICE_ERASE_ALL TAMP_DEVICESECRETS_ERASE_ALL
12951295
#endif /* STM32WBA */
12961296

1297-
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS)
1297+
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS) || defined(STM32N6)
12981298
#define TAMP_SECRETDEVICE_ERASE_DISABLE TAMP_DEVICESECRETS_ERASE_NONE
12991299
#define TAMP_SECRETDEVICE_ERASE_ENABLE TAMP_SECRETDEVICE_ERASE_ALL
1300-
#endif /* STM32H5 || STM32WBA || STM32H7RS */
1300+
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
13011301

13021302
#if defined(STM32F7)
13031303
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_ENABLE_BITS_MASK
@@ -1481,7 +1481,7 @@ extern "C" {
14811481
#define TIM_TIM3_TI1_COMP1COMP2_OUT TIM_TIM3_TI1_COMP1_COMP2
14821482
#endif
14831483

1484-
#if defined(STM32U5)
1484+
#if defined(STM32U5) || defined(STM32MP2)
14851485
#define OCREF_CLEAR_SELECT_Pos OCREF_CLEAR_SELECT_POS
14861486
#define OCREF_CLEAR_SELECT_Msk OCREF_CLEAR_SELECT_MSK
14871487
#endif
@@ -2029,12 +2029,12 @@ extern "C" {
20292029
/** @defgroup HAL_RTC_Aliased_Functions HAL RTC Aliased Functions maintained for legacy purpose
20302030
* @{
20312031
*/
2032-
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS)
2032+
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS) || defined(STM32N6)
20332033
#define HAL_RTCEx_SetBoothardwareKey HAL_RTCEx_LockBootHardwareKey
20342034
#define HAL_RTCEx_BKUPBlock_Enable HAL_RTCEx_BKUPBlock
20352035
#define HAL_RTCEx_BKUPBlock_Disable HAL_RTCEx_BKUPUnblock
20362036
#define HAL_RTCEx_Erase_SecretDev_Conf HAL_RTCEx_ConfigEraseDeviceSecrets
2037-
#endif /* STM32H5 || STM32WBA || STM32H7RS */
2037+
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
20382038

20392039
/**
20402040
* @}
@@ -3695,7 +3695,7 @@ extern "C" {
36953695
#endif
36963696

36973697
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || \
3698-
defined(STM32WL) || defined(STM32C0) || defined(STM32H7RS) || defined(STM32U0)
3698+
defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) || defined(STM32U0)
36993699
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
37003700
#else
37013701
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
@@ -3946,7 +3946,8 @@ extern "C" {
39463946
*/
39473947
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \
39483948
defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
3949-
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32H7RS) || defined (STM32U0)
3949+
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || \
3950+
defined (STM32U0) || defined (STM32U3)
39503951
#else
39513952
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39523953
#endif

‎system/Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_adc_ex.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ typedef struct
827827
*/
828828
#if defined(STM32G474xx) || defined(STM32G484xx) || defined(STM32G473xx) || defined(STM32G483xx)
829829
#define ADC_BATTERY_VOLTAGE_INSTANCE(__HANDLE__) \
830-
((((__HANDLE__)->Instance) != ADC2) || (((__HANDLE__)->Instance) != ADC4))
830+
((((__HANDLE__)->Instance) != ADC2) && (((__HANDLE__)->Instance) != ADC4))
831831
#elif defined(STM32G411xB) || defined(STM32G411xC) || defined(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx)
832832
#define ADC_BATTERY_VOLTAGE_INSTANCE(__HANDLE__) (((__HANDLE__)->Instance) != ADC2)
833833
#elif defined(STM32G491xx) || defined(STM32G4A1xx)

‎system/Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_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/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_cryp_ex.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,10 @@ extern "C" {
9393
/** @addtogroup CRYPEx_Exported_Functions_Group1
9494
* @{
9595
*/
96-
HAL_StatusTypeDef HAL_CRYPEx_AESGCM_GenerateAuthTAG(CRYP_HandleTypeDef *hcryp, uint32_t *AuthTag, uint32_t Timeout);
97-
HAL_StatusTypeDef HAL_CRYPEx_AESCCM_GenerateAuthTAG(CRYP_HandleTypeDef *hcryp, uint32_t *AuthTag, uint32_t Timeout);
96+
HAL_StatusTypeDef HAL_CRYPEx_AESGCM_GenerateAuthTAG(CRYP_HandleTypeDef *hcryp, const uint32_t *AuthTag,
97+
uint32_t Timeout);
98+
HAL_StatusTypeDef HAL_CRYPEx_AESCCM_GenerateAuthTAG(CRYP_HandleTypeDef *hcryp, const uint32_t *AuthTag,
99+
uint32_t Timeout);
98100

99101
/**
100102
* @}

‎system/Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_dac.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -509,13 +509,6 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
509509
: \
510510
(((CHANNEL) == DAC_CHANNEL_1) || \
511511
((CHANNEL) == DAC_CHANNEL_2)))
512-
#elif defined(STM32G411xB) || defined(STM32G411xC)
513-
#define IS_DAC_CHANNEL(DACX, CHANNEL) \
514-
(((DACX) == DAC1) ? \
515-
((CHANNEL) == DAC_CHANNEL_1) \
516-
: \
517-
(((CHANNEL) == DAC_CHANNEL_1) || \
518-
((CHANNEL) == DAC_CHANNEL_2)))
519512
#else
520513
#define IS_DAC_CHANNEL(DACX, CHANNEL) \
521514
(((CHANNEL) == DAC_CHANNEL_1) || \

‎system/Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_dma_ex.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,13 @@ typedef struct
195195

196196
/* ------------------------- REQUEST -----------------------------------------*/
197197
HAL_StatusTypeDef HAL_DMAEx_ConfigMuxRequestGenerator(DMA_HandleTypeDef *hdma,
198-
HAL_DMA_MuxRequestGeneratorConfigTypeDef *pRequestGeneratorConfig);
198+
const HAL_DMA_MuxRequestGeneratorConfigTypeDef *pRequestGeneratorConfig);
199199
HAL_StatusTypeDef HAL_DMAEx_EnableMuxRequestGenerator(DMA_HandleTypeDef *hdma);
200200
HAL_StatusTypeDef HAL_DMAEx_DisableMuxRequestGenerator(DMA_HandleTypeDef *hdma);
201201
/* -------------------------------------------------------------------------- */
202202

203203
/* ------------------------- SYNCHRO -----------------------------------------*/
204-
HAL_StatusTypeDef HAL_DMAEx_ConfigMuxSync(DMA_HandleTypeDef *hdma, HAL_DMA_MuxSyncConfigTypeDef *pSyncConfig);
204+
HAL_StatusTypeDef HAL_DMAEx_ConfigMuxSync(DMA_HandleTypeDef *hdma, const HAL_DMA_MuxSyncConfigTypeDef *pSyncConfig);
205205
/* -------------------------------------------------------------------------- */
206206

207207
void HAL_DMAEx_MUX_IRQHandler(DMA_HandleTypeDef *hdma);

‎system/Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_exti.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ typedef struct
272272
* @{
273273
*/
274274
/* Configuration functions ****************************************************/
275-
HAL_StatusTypeDef HAL_EXTI_SetConfigLine(EXTI_HandleTypeDef *hexti, EXTI_ConfigTypeDef *pExtiConfig);
276-
HAL_StatusTypeDef HAL_EXTI_GetConfigLine(EXTI_HandleTypeDef *hexti, EXTI_ConfigTypeDef *pExtiConfig);
277-
HAL_StatusTypeDef HAL_EXTI_ClearConfigLine(EXTI_HandleTypeDef *hexti);
275+
HAL_StatusTypeDef HAL_EXTI_SetConfigLine(EXTI_HandleTypeDef *hexti, EXTI_ConfigTypeDef const *pExtiConfig);
276+
HAL_StatusTypeDef HAL_EXTI_GetConfigLine(EXTI_HandleTypeDef const *hexti, EXTI_ConfigTypeDef *pExtiConfig);
277+
HAL_StatusTypeDef HAL_EXTI_ClearConfigLine(EXTI_HandleTypeDef const *hexti);
278278
HAL_StatusTypeDef HAL_EXTI_RegisterCallback(EXTI_HandleTypeDef *hexti, EXTI_CallbackIDTypeDef CallbackID, void (*pPendingCbfn)(void));
279279
HAL_StatusTypeDef HAL_EXTI_GetHandle(EXTI_HandleTypeDef *hexti, uint32_t ExtiLine);
280280
/**
@@ -286,10 +286,10 @@ HAL_StatusTypeDef HAL_EXTI_GetHandle(EXTI_HandleTypeDef *hexti, uint32_t ExtiLin
286286
* @{
287287
*/
288288
/* IO operation functions *****************************************************/
289-
void HAL_EXTI_IRQHandler(EXTI_HandleTypeDef *hexti);
290-
uint32_t HAL_EXTI_GetPending(EXTI_HandleTypeDef *hexti, uint32_t Edge);
291-
void HAL_EXTI_ClearPending(EXTI_HandleTypeDef *hexti, uint32_t Edge);
292-
void HAL_EXTI_GenerateSWI(EXTI_HandleTypeDef *hexti);
289+
void HAL_EXTI_IRQHandler(EXTI_HandleTypeDef const *hexti);
290+
uint32_t HAL_EXTI_GetPending(EXTI_HandleTypeDef const *hexti, uint32_t Edge);
291+
void HAL_EXTI_ClearPending(EXTI_HandleTypeDef const *hexti, uint32_t Edge);
292+
void HAL_EXTI_GenerateSWI(EXTI_HandleTypeDef const *hexti);
293293

294294
/**
295295
* @}

‎system/Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_gpio.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ typedef enum
282282
*/
283283

284284
/* Initialization and de-initialization functions *****************************/
285-
void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef *GPIO_Init);
285+
void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef const *GPIO_Init);
286286
void HAL_GPIO_DeInit(GPIO_TypeDef *GPIOx, uint32_t GPIO_Pin);
287287

288288
/**
@@ -295,7 +295,7 @@ void HAL_GPIO_DeInit(GPIO_TypeDef *GPIOx, uint32_t GPIO_Pin);
295295
*/
296296

297297
/* IO operation functions *****************************************************/
298-
GPIO_PinState HAL_GPIO_ReadPin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin);
298+
GPIO_PinState HAL_GPIO_ReadPin(GPIO_TypeDef const *GPIOx, uint16_t GPIO_Pin);
299299
void HAL_GPIO_WritePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin, GPIO_PinState PinState);
300300
void HAL_GPIO_TogglePin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin);
301301
HAL_StatusTypeDef HAL_GPIO_LockPin(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin);

‎system/Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_hrtim.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,14 +1620,14 @@ typedef void (* pHRTIM_TIMxCallbackTypeDef)(HRTIM_HandleTypeDef *hhrtim, /*!<
16201620
* @brief Constants defining division ratio between the timer clock frequency
16211621
* (fHRTIM) and the dead-time generator clock (fDTG)
16221622
*/
1623-
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL8 (0x00000000U) /*!< fDTG = fHRTIM * 8U */
1624-
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL4 (HRTIM_DTR_DTPRSC_0) /*!< fDTG = fHRTIM * 4U */
1625-
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL2 (HRTIM_DTR_DTPRSC_1) /*!< fDTG = fHRTIM * 2U */
1623+
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV8 (0x00000000U) /*!< fDTG = fHRTIM / 8U */
1624+
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV4 (HRTIM_DTR_DTPRSC_0) /*!< fDTG = fHRTIM / 4U */
1625+
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV2 (HRTIM_DTR_DTPRSC_1) /*!< fDTG = fHRTIM / 2U */
16261626
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV1 (HRTIM_DTR_DTPRSC_1 | HRTIM_DTR_DTPRSC_0) /*!< fDTG = fHRTIM */
1627-
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV2 (HRTIM_DTR_DTPRSC_2) /*!< fDTG = fHRTIM / 2U */
1628-
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV4 (HRTIM_DTR_DTPRSC_2 | HRTIM_DTR_DTPRSC_0) /*!< fDTG = fHRTIM / 4U */
1629-
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV8 (HRTIM_DTR_DTPRSC_2 | HRTIM_DTR_DTPRSC_1) /*!< fDTG = fHRTIM / 8U */
1630-
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV16 (HRTIM_DTR_DTPRSC_2 | HRTIM_DTR_DTPRSC_1 | HRTIM_DTR_DTPRSC_0) /*!< fDTG = fHRTIM / 16U */
1627+
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL2 (HRTIM_DTR_DTPRSC_2) /*!< fDTG = fHRTIM * 2U */
1628+
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL4 (HRTIM_DTR_DTPRSC_2 | HRTIM_DTR_DTPRSC_0) /*!< fDTG = fHRTIM * 4U */
1629+
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL8 (HRTIM_DTR_DTPRSC_2 | HRTIM_DTR_DTPRSC_1) /*!< fDTG = fHRTIM * 8U */
1630+
#define HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL16 (HRTIM_DTR_DTPRSC_2 | HRTIM_DTR_DTPRSC_1 | HRTIM_DTR_DTPRSC_0) /*!< fDTG = fHRTIM * 16U */
16311631
/**
16321632
* @}
16331633
*/
@@ -3223,14 +3223,14 @@ typedef void (* pHRTIM_TIMxCallbackTypeDef)(HRTIM_HandleTypeDef *hhrtim, /*!<
32233223
((TIMEVENTLATCH) == HRTIM_TIMEVENTLATCH_ENABLED))
32243224

32253225
#define IS_HRTIM_TIMDEADTIME_PRESCALERRATIO(PRESCALERRATIO)\
3226-
(((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL8) || \
3227-
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL4) || \
3228-
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL2) || \
3229-
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV1) || \
3230-
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV2) || \
3226+
(((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV8) || \
32313227
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV4) || \
3232-
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV8) || \
3233-
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV16))
3228+
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV2) || \
3229+
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_DIV1) || \
3230+
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL2) || \
3231+
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL4) || \
3232+
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL8) || \
3233+
((PRESCALERRATIO) == HRTIM_TIMDEADTIME_PRESCALERRATIO_MUL16))
32343234

32353235
#define IS_HRTIM_TIMDEADTIME_RISINGSIGN(RISINGSIGN)\
32363236
(((RISINGSIGN) == HRTIM_TIMDEADTIME_RISINGSIGN_POSITIVE) || \

‎system/Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_i2s.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,8 @@ void HAL_I2S_ErrorCallback(I2S_HandleTypeDef *hi2s);
452452
* @{
453453
*/
454454
/* Peripheral Control and State functions ************************************/
455-
HAL_I2S_StateTypeDef HAL_I2S_GetState(I2S_HandleTypeDef *hi2s);
456-
uint32_t HAL_I2S_GetError(I2S_HandleTypeDef *hi2s);
455+
HAL_I2S_StateTypeDef HAL_I2S_GetState(const I2S_HandleTypeDef *hi2s);
456+
uint32_t HAL_I2S_GetError(const I2S_HandleTypeDef *hi2s);
457457
/**
458458
* @}
459459
*/

0 commit comments

Comments
 (0)