Skip to content

Commit 101bab1

Browse files
fpistmfpistm
committed
[G4] Update STM32G4xx HAL Drivers to v1.2.1
Included in STM32CubeG4 FW v1.4.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 01a1aa3 commit 101bab1

File tree

89 files changed

+5718
-3471
lines changed

Some content is hidden

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

89 files changed

+5718
-3471
lines changed

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

Lines changed: 78 additions & 101 deletions
Large diffs are not rendered by default.

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

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ typedef struct
384384
typedef struct __ADC_HandleTypeDef
385385
#else
386386
typedef struct
387-
#endif
387+
#endif /* USE_HAL_ADC_REGISTER_CALLBACKS */
388388
{
389389
ADC_TypeDef *Instance; /*!< Register base address */
390390
ADC_InitTypeDef Init; /*!< ADC initialization parameters and regular conversions setting */
@@ -769,7 +769,6 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
769769
* @}
770770
*/
771771

772-
773772
/** @defgroup ADC_Event_type ADC Event type
774773
* @{
775774
*/
@@ -1239,7 +1238,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
12391238
#else
12401239
#define __HAL_ADC_RESET_HANDLE_STATE(__HANDLE__) \
12411240
((__HANDLE__)->State = HAL_ADC_STATE_RESET)
1242-
#endif
1241+
#endif /* USE_HAL_ADC_REGISTER_CALLBACKS */
12431242

12441243
/**
12451244
* @brief Enable ADC interrupt.
@@ -1667,7 +1666,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
16671666
*/
16681667
#define __HAL_ADC_MULTI_CONV_DATA_MASTER_SLAVE(__ADC_MULTI_MASTER_SLAVE__, __ADC_MULTI_CONV_DATA__) \
16691668
__LL_ADC_MULTI_CONV_DATA_MASTER_SLAVE((__ADC_MULTI_MASTER_SLAVE__), (__ADC_MULTI_CONV_DATA__))
1670-
#endif
1669+
#endif /* ADC_MULTIMODE_SUPPORT */
16711670

16721671
/**
16731672
* @brief Helper macro to select the ADC common instance
@@ -1738,10 +1737,10 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
17381737
*/
17391738
#define __HAL_ADC_CONVERT_DATA_RESOLUTION(__DATA__,\
17401739
__ADC_RESOLUTION_CURRENT__,\
1741-
__ADC_RESOLUTION_TARGET__) \
1742-
__LL_ADC_CONVERT_DATA_RESOLUTION((__DATA__), \
1743-
(__ADC_RESOLUTION_CURRENT__), \
1744-
(__ADC_RESOLUTION_TARGET__))
1740+
__ADC_RESOLUTION_TARGET__) \
1741+
__LL_ADC_CONVERT_DATA_RESOLUTION((__DATA__),\
1742+
(__ADC_RESOLUTION_CURRENT__),\
1743+
(__ADC_RESOLUTION_TARGET__))
17451744

17461745
/**
17471746
* @brief Helper macro to calculate the voltage (unit: mVolt)
@@ -1761,10 +1760,10 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
17611760
*/
17621761
#define __HAL_ADC_CALC_DATA_TO_VOLTAGE(__VREFANALOG_VOLTAGE__,\
17631762
__ADC_DATA__,\
1764-
__ADC_RESOLUTION__) \
1765-
__LL_ADC_CALC_DATA_TO_VOLTAGE((__VREFANALOG_VOLTAGE__), \
1766-
(__ADC_DATA__), \
1767-
(__ADC_RESOLUTION__))
1763+
__ADC_RESOLUTION__) \
1764+
__LL_ADC_CALC_DATA_TO_VOLTAGE((__VREFANALOG_VOLTAGE__),\
1765+
(__ADC_DATA__),\
1766+
(__ADC_RESOLUTION__))
17681767

17691768
/**
17701769
* @brief Helper macro to calculate analog reference voltage (Vref+)
@@ -1792,9 +1791,9 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
17921791
* @retval Analog reference voltage (unit: mV)
17931792
*/
17941793
#define __HAL_ADC_CALC_VREFANALOG_VOLTAGE(__VREFINT_ADC_DATA__,\
1795-
__ADC_RESOLUTION__) \
1796-
__LL_ADC_CALC_VREFANALOG_VOLTAGE((__VREFINT_ADC_DATA__), \
1797-
(__ADC_RESOLUTION__))
1794+
__ADC_RESOLUTION__) \
1795+
__LL_ADC_CALC_VREFANALOG_VOLTAGE((__VREFINT_ADC_DATA__),\
1796+
(__ADC_RESOLUTION__))
17981797

17991798
/**
18001799
* @brief Helper macro to calculate the temperature (unit: degree Celsius)
@@ -1843,10 +1842,10 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
18431842
*/
18441843
#define __HAL_ADC_CALC_TEMPERATURE(__VREFANALOG_VOLTAGE__,\
18451844
__TEMPSENSOR_ADC_DATA__,\
1846-
__ADC_RESOLUTION__) \
1847-
__LL_ADC_CALC_TEMPERATURE((__VREFANALOG_VOLTAGE__), \
1848-
(__TEMPSENSOR_ADC_DATA__), \
1849-
(__ADC_RESOLUTION__))
1845+
__ADC_RESOLUTION__) \
1846+
__LL_ADC_CALC_TEMPERATURE((__VREFANALOG_VOLTAGE__),\
1847+
(__TEMPSENSOR_ADC_DATA__),\
1848+
(__ADC_RESOLUTION__))
18501849

18511850
/**
18521851
* @brief Helper macro to calculate the temperature (unit: degree Celsius)
@@ -1897,13 +1896,13 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
18971896
__TEMPSENSOR_CALX_TEMP__,\
18981897
__VREFANALOG_VOLTAGE__,\
18991898
__TEMPSENSOR_ADC_DATA__,\
1900-
__ADC_RESOLUTION__) \
1901-
__LL_ADC_CALC_TEMPERATURE_TYP_PARAMS((__TEMPSENSOR_TYP_AVGSLOPE__), \
1902-
(__TEMPSENSOR_TYP_CALX_V__), \
1903-
(__TEMPSENSOR_CALX_TEMP__), \
1904-
(__VREFANALOG_VOLTAGE__), \
1905-
(__TEMPSENSOR_ADC_DATA__), \
1906-
(__ADC_RESOLUTION__))
1899+
__ADC_RESOLUTION__) \
1900+
__LL_ADC_CALC_TEMPERATURE_TYP_PARAMS((__TEMPSENSOR_TYP_AVGSLOPE__),\
1901+
(__TEMPSENSOR_TYP_CALX_V__),\
1902+
(__TEMPSENSOR_CALX_TEMP__),\
1903+
(__VREFANALOG_VOLTAGE__),\
1904+
(__TEMPSENSOR_ADC_DATA__),\
1905+
(__ADC_RESOLUTION__))
19071906

19081907
/**
19091908
* @}

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ typedef struct
393393
ADC_SMPR1_SMP6 | ADC_SMPR1_SMP5 | ADC_SMPR1_SMP4 |\
394394
ADC_SMPR1_SMP3 | ADC_SMPR1_SMP2 | ADC_SMPR1_SMP1 |\
395395
ADC_SMPR1_SMP0)
396-
#endif
396+
#endif /* ADC_SMPR1_SMPPLUS */
397397
/**
398398
* @}
399399
*/
@@ -482,15 +482,16 @@ typedef struct
482482
)
483483
#elif defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx)
484484
#define ADC_IS_INDEPENDENT(__HANDLE__) (RESET)
485-
#endif
485+
#endif /* defined(STM32G474xx) || defined(STM32G484xx) || defined(STM32G473xx) || defined(STM32G483xx) */
486486

487487
/**
488488
* @brief Set the selected injected Channel rank.
489489
* @param __CHANNELNB__ Channel number.
490490
* @param __RANKNB__ Rank number.
491491
* @retval None
492492
*/
493-
#define ADC_JSQR_RK(__CHANNELNB__, __RANKNB__) ((((__CHANNELNB__) & ADC_CHANNEL_ID_NUMBER_MASK) >> ADC_CHANNEL_ID_NUMBER_BITOFFSET_POS) << ((__RANKNB__) & ADC_INJ_RANK_ID_JSQR_MASK))
493+
#define ADC_JSQR_RK(__CHANNELNB__, __RANKNB__) ((((__CHANNELNB__)\
494+
& ADC_CHANNEL_ID_NUMBER_MASK) >> ADC_CHANNEL_ID_NUMBER_BITOFFSET_POS) << ((__RANKNB__) & ADC_INJ_RANK_ID_JSQR_MASK))
494495

495496
/**
496497
* @brief Configure ADC injected context queue
@@ -658,7 +659,7 @@ typedef struct
658659
#define ADC_TEMPERATURE_SENSOR_INSTANCE(__HANDLE__) ((((__HANDLE__)->Instance) == ADC1) || (((__HANDLE__)->Instance) == ADC5))
659660
#elif defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx) || defined(STM32G491xx) || defined(STM32G4A1xx)
660661
#define ADC_TEMPERATURE_SENSOR_INSTANCE(__HANDLE__) (((__HANDLE__)->Instance) == ADC1)
661-
#endif
662+
#endif /* defined(STM32G474xx) || defined(STM32G484xx) || defined(STM32G473xx) || defined(STM32G483xx) */
662663

663664
/**
664665
* @brief Verify the ADC instance connected to the battery voltage VBAT.
@@ -838,7 +839,7 @@ typedef struct
838839
((__CHANNEL__) == ADC_CHANNEL_16) || \
839840
((__CHANNEL__) == ADC_CHANNEL_VOPAMP6) || \
840841
((__CHANNEL__) == ADC_CHANNEL_VREFINT))))
841-
#endif
842+
#endif /* defined(STM32G474xx) || defined(STM32G484xx) || defined(STM32G473xx) || defined(STM32G483xx) */
842843

843844
/**
844845
* @brief Verify the ADC channel setting in differential mode.
@@ -1360,7 +1361,8 @@ HAL_StatusTypeDef HAL_ADCEx_RegularMultiModeStop_DMA(ADC_HandleTypeDef *hadc);
13601361
* @{
13611362
*/
13621363
/* Peripheral Control functions ***********************************************/
1363-
HAL_StatusTypeDef HAL_ADCEx_InjectedConfigChannel(ADC_HandleTypeDef *hadc,ADC_InjectionConfTypeDef* sConfigInjected);
1364+
HAL_StatusTypeDef HAL_ADCEx_InjectedConfigChannel(ADC_HandleTypeDef *hadc,
1365+
ADC_InjectionConfTypeDef *sConfigInjected);
13641366
#if defined(ADC_MULTIMODE_SUPPORT)
13651367
HAL_StatusTypeDef HAL_ADCEx_MultiModeConfigChannel(ADC_HandleTypeDef *hadc, ADC_MultiModeTypeDef *multimode);
13661368
#endif /* ADC_MULTIMODE_SUPPORT */

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

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -198,15 +198,21 @@ typedef void (*pCORDIC_CallbackTypeDef)(CORDIC_HandleTypeDef *hcordic); /*!< p
198198
#define CORDIC_PRECISION_4CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_2))
199199
#define CORDIC_PRECISION_5CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_2 | CORDIC_CSR_PRECISION_0))
200200
#define CORDIC_PRECISION_6CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_2 | CORDIC_CSR_PRECISION_1))
201-
#define CORDIC_PRECISION_7CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_2 | CORDIC_CSR_PRECISION_1 | CORDIC_CSR_PRECISION_0))
201+
#define CORDIC_PRECISION_7CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_2\
202+
| CORDIC_CSR_PRECISION_1 | CORDIC_CSR_PRECISION_0))
202203
#define CORDIC_PRECISION_8CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_3))
203204
#define CORDIC_PRECISION_9CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_3 | CORDIC_CSR_PRECISION_0))
204205
#define CORDIC_PRECISION_10CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_3 | CORDIC_CSR_PRECISION_1))
205-
#define CORDIC_PRECISION_11CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_3 | CORDIC_CSR_PRECISION_1 | CORDIC_CSR_PRECISION_0))
206+
#define CORDIC_PRECISION_11CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_3\
207+
| CORDIC_CSR_PRECISION_1 | CORDIC_CSR_PRECISION_0))
206208
#define CORDIC_PRECISION_12CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_3 | CORDIC_CSR_PRECISION_2))
207-
#define CORDIC_PRECISION_13CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_3 | CORDIC_CSR_PRECISION_2 | CORDIC_CSR_PRECISION_0))
208-
#define CORDIC_PRECISION_14CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_3 | CORDIC_CSR_PRECISION_2 | CORDIC_CSR_PRECISION_1))
209-
#define CORDIC_PRECISION_15CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_3 | CORDIC_CSR_PRECISION_2 | CORDIC_CSR_PRECISION_1 | CORDIC_CSR_PRECISION_0))
209+
#define CORDIC_PRECISION_13CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_3\
210+
| CORDIC_CSR_PRECISION_2 | CORDIC_CSR_PRECISION_0))
211+
#define CORDIC_PRECISION_14CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_3\
212+
| CORDIC_CSR_PRECISION_2 | CORDIC_CSR_PRECISION_1))
213+
#define CORDIC_PRECISION_15CYCLES ((uint32_t)(CORDIC_CSR_PRECISION_3\
214+
| CORDIC_CSR_PRECISION_2 | CORDIC_CSR_PRECISION_1\
215+
|CORDIC_CSR_PRECISION_0))
210216
/**
211217
* @}
212218
*/
@@ -257,7 +263,8 @@ typedef void (*pCORDIC_CallbackTypeDef)(CORDIC_HandleTypeDef *hcordic); /*!< p
257263
*/
258264
#define CORDIC_NBWRITE_1 (0x00000000U) /*!< One 32-bits write containing either only one
259265
32-bit data input (Q1.31 format), or two 16-bit
260-
data input (Q1.15 format) packed in one 32 bits Data */
266+
data input (Q1.15 format) packed in one 32 bits
267+
Data */
261268
#define CORDIC_NBWRITE_2 CORDIC_CSR_NARGS /*!< Two 32-bit write containing two 32-bits data input
262269
(Q1.31 format) */
263270
/**
@@ -269,7 +276,8 @@ typedef void (*pCORDIC_CallbackTypeDef)(CORDIC_HandleTypeDef *hcordic); /*!< p
269276
*/
270277
#define CORDIC_NBREAD_1 (0x00000000U) /*!< One 32-bits read containing either only one
271278
32-bit data output (Q1.31 format), or two 16-bit
272-
data output (Q1.15 format) packed in one 32 bits Data */
279+
data output (Q1.15 format) packed in one 32 bits
280+
Data */
273281
#define CORDIC_NBREAD_2 CORDIC_CSR_NRES /*!< Two 32-bit Data containing two 32-bits data output
274282
(Q1.31 format) */
275283
/**
@@ -329,9 +337,9 @@ typedef void (*pCORDIC_CallbackTypeDef)(CORDIC_HandleTypeDef *hcordic); /*!< p
329337
*/
330338
#if USE_HAL_CORDIC_REGISTER_CALLBACKS == 1
331339
#define __HAL_CORDIC_RESET_HANDLE_STATE(__HANDLE__) do{ \
332-
(__HANDLE__)->State = HAL_CORDIC_STATE_RESET; \
333-
(__HANDLE__)->MspInitCallback = NULL; \
334-
(__HANDLE__)->MspDeInitCallback = NULL; \
340+
(__HANDLE__)->State = HAL_CORDIC_STATE_RESET; \
341+
(__HANDLE__)->MspInitCallback = NULL; \
342+
(__HANDLE__)->MspDeInitCallback = NULL; \
335343
} while(0)
336344
#else
337345
#define __HAL_CORDIC_RESET_HANDLE_STATE(__HANDLE__) ((__HANDLE__)->State = HAL_CORDIC_STATE_RESET)
@@ -346,7 +354,7 @@ typedef void (*pCORDIC_CallbackTypeDef)(CORDIC_HandleTypeDef *hcordic); /*!< p
346354
* @retval None
347355
*/
348356
#define __HAL_CORDIC_ENABLE_IT(__HANDLE__, __INTERRUPT__) \
349-
(((__HANDLE__)->Instance->CSR) |= (__INTERRUPT__))
357+
(((__HANDLE__)->Instance->CSR) |= (__INTERRUPT__))
350358

351359
/**
352360
* @brief Disable the CORDIC interrupt
@@ -357,7 +365,7 @@ typedef void (*pCORDIC_CallbackTypeDef)(CORDIC_HandleTypeDef *hcordic); /*!< p
357365
* @retval None
358366
*/
359367
#define __HAL_CORDIC_DISABLE_IT(__HANDLE__, __INTERRUPT__) \
360-
(((__HANDLE__)->Instance->CSR) &= ~(__INTERRUPT__))
368+
(((__HANDLE__)->Instance->CSR) &= ~(__INTERRUPT__))
361369

362370
/** @brief Check whether the specified CORDIC interrupt occurred or not.
363371
Dummy macro as no interrupt status flag.
@@ -383,7 +391,7 @@ typedef void (*pCORDIC_CallbackTypeDef)(CORDIC_HandleTypeDef *hcordic); /*!< p
383391
* @retval SET (flag is set) or RESET (flag is reset)
384392
*/
385393
#define __HAL_CORDIC_GET_FLAG(__HANDLE__, __FLAG__) \
386-
((((__HANDLE__)->Instance->CSR) & (__FLAG__)) == (__FLAG__))
394+
((((__HANDLE__)->Instance->CSR) & (__FLAG__)) == (__FLAG__))
387395

388396
/** @brief Clear specified CORDIC status flag. Dummy macro as no
389397
flag can be cleared.
@@ -403,7 +411,7 @@ typedef void (*pCORDIC_CallbackTypeDef)(CORDIC_HandleTypeDef *hcordic); /*!< p
403411
* @retval FlagStatus
404412
*/
405413
#define __HAL_CORDIC_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) \
406-
(((__HANDLE__)->Instance->CSR) & (__INTERRUPT__))
414+
(((__HANDLE__)->Instance->CSR) & (__INTERRUPT__))
407415

408416
/**
409417
* @}
@@ -527,7 +535,8 @@ void HAL_CORDIC_MspDeInit(CORDIC_HandleTypeDef *hcordic);
527535

528536
#if USE_HAL_CORDIC_REGISTER_CALLBACKS == 1
529537
/* Callbacks Register/UnRegister functions ***********************************/
530-
HAL_StatusTypeDef HAL_CORDIC_RegisterCallback(CORDIC_HandleTypeDef *hcordic, HAL_CORDIC_CallbackIDTypeDef CallbackID, pCORDIC_CallbackTypeDef pCallback);
538+
HAL_StatusTypeDef HAL_CORDIC_RegisterCallback(CORDIC_HandleTypeDef *hcordic, HAL_CORDIC_CallbackIDTypeDef CallbackID,
539+
pCORDIC_CallbackTypeDef pCallback);
531540
HAL_StatusTypeDef HAL_CORDIC_UnRegisterCallback(CORDIC_HandleTypeDef *hcordic, HAL_CORDIC_CallbackIDTypeDef CallbackID);
532541
/**
533542
* @}
@@ -539,10 +548,14 @@ HAL_StatusTypeDef HAL_CORDIC_UnRegisterCallback(CORDIC_HandleTypeDef *hcordic, H
539548
#endif /* USE_HAL_CORDIC_REGISTER_CALLBACKS */
540549
/* Peripheral Control functions ***********************************************/
541550
HAL_StatusTypeDef HAL_CORDIC_Configure(CORDIC_HandleTypeDef *hcordic, CORDIC_ConfigTypeDef *sConfig);
542-
HAL_StatusTypeDef HAL_CORDIC_Calculate(CORDIC_HandleTypeDef *hcordic, int32_t *pInBuff, int32_t *pOutBuff, uint32_t NbCalc, uint32_t Timeout);
543-
HAL_StatusTypeDef HAL_CORDIC_CalculateZO(CORDIC_HandleTypeDef *hcordic, int32_t *pInBuff, int32_t *pOutBuff, uint32_t NbCalc, uint32_t Timeout);
544-
HAL_StatusTypeDef HAL_CORDIC_Calculate_IT(CORDIC_HandleTypeDef *hcordic, int32_t *pInBuff, int32_t *pOutBuff, uint32_t NbCalc);
545-
HAL_StatusTypeDef HAL_CORDIC_Calculate_DMA(CORDIC_HandleTypeDef *hcordic, int32_t *pInBuff, int32_t *pOutBuff, uint32_t NbCalc, uint32_t DMADirection);
551+
HAL_StatusTypeDef HAL_CORDIC_Calculate(CORDIC_HandleTypeDef *hcordic, int32_t *pInBuff, int32_t *pOutBuff,
552+
uint32_t NbCalc, uint32_t Timeout);
553+
HAL_StatusTypeDef HAL_CORDIC_CalculateZO(CORDIC_HandleTypeDef *hcordic, int32_t *pInBuff, int32_t *pOutBuff,
554+
uint32_t NbCalc, uint32_t Timeout);
555+
HAL_StatusTypeDef HAL_CORDIC_Calculate_IT(CORDIC_HandleTypeDef *hcordic, int32_t *pInBuff, int32_t *pOutBuff,
556+
uint32_t NbCalc);
557+
HAL_StatusTypeDef HAL_CORDIC_Calculate_DMA(CORDIC_HandleTypeDef *hcordic, int32_t *pInBuff, int32_t *pOutBuff,
558+
uint32_t NbCalc, uint32_t DMADirection);
546559
/**
547560
* @}
548561
*/

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ typedef struct
267267
#define IS_DEFAULT_POLYNOMIAL(DEFAULT) (((DEFAULT) == DEFAULT_POLYNOMIAL_ENABLE) || \
268268
((DEFAULT) == DEFAULT_POLYNOMIAL_DISABLE))
269269

270-
271270
#define IS_DEFAULT_INIT_VALUE(VALUE) (((VALUE) == DEFAULT_INIT_VALUE_ENABLE) || \
272271
((VALUE) == DEFAULT_INIT_VALUE_DISABLE))
273272

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ typedef struct __CRYP_HandleTypeDef
109109
typedef struct
110110
#endif
111111
{
112-
AES_TypeDef *Instance; /*!< AES Register base address */
112+
AES_TypeDef *Instance; /*!< AES Register base address */
113113

114114
CRYP_ConfigTypeDef Init; /*!< CRYP required parameters */
115115

@@ -120,13 +120,13 @@ typedef struct
120120

121121
uint32_t *pCrypOutBuffPtr; /*!< Pointer to CRYP processing (encryption, decryption,...) buffer */
122122

123-
__IO uint16_t CrypHeaderCount; /*!< Counter of header data */
123+
__IO uint16_t CrypHeaderCount; /*!< Counter of header data in words */
124124

125-
__IO uint16_t CrypInCount; /*!< Counter of input data */
125+
__IO uint16_t CrypInCount; /*!< Counter of input data in words */
126126

127-
__IO uint16_t CrypOutCount; /*!< Counter of output data */
127+
__IO uint16_t CrypOutCount; /*!< Counter of output data in words */
128128

129-
uint16_t Size; /*!< length of input data in words */
129+
uint16_t Size; /*!< Length of input data */
130130

131131
uint32_t Phase; /*!< CRYP peripheral phase */
132132

0 commit comments

Comments
 (0)