Skip to content

Commit 7c2e19e

Browse files
fpistmfpistm
committed
system(L5) update STM32L5xx HAL Drivers to v1.0.6
Included in STM32CubeL5 FW v1.5.1 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent d4ce718 commit 7c2e19e

File tree

118 files changed

+5746
-2692
lines changed

Some content is hidden

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

118 files changed

+5746
-2692
lines changed

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

Lines changed: 368 additions & 58 deletions
Large diffs are not rendered by default.

‎system/Drivers/STM32L5xx_HAL_Driver/Inc/stm32l5xx_hal_comp.h‎

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ typedef struct
5050

5151
uint32_t WindowMode; /*!< Set window mode of a pair of comparators instances
5252
(2 consecutive instances odd and even COMP<x> and COMP<x+1>).
53-
Note: HAL COMP driver allows to set window mode from any COMP instance of the pair of COMP instances composing window mode.
53+
Note: HAL COMP driver allows to set window mode from any COMP
54+
instance of the pair of COMP instances composing window mode.
5455
This parameter can be a value of @ref COMP_WindowMode */
5556

5657
uint32_t Mode; /*!< Set comparator operating mode to adjust power and speed.
@@ -151,15 +152,25 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
151152
* @}
152153
*/
153154

155+
154156
/** @defgroup COMP_WindowMode COMP Window Mode
155157
* @{
156158
*/
157-
#define COMP_WINDOWMODE_DISABLE (0x00000000UL) /*!< Window mode disable: Comparators instances pair COMP1 and COMP2 are independent */
158-
#define COMP_WINDOWMODE_COMP1_INPUT_PLUS_COMMON (COMP_CSR_WINMODE) /*!< Window mode enable: Comparators instances pair COMP1 and COMP2 have their input plus connected together. The common input is COMP1 input plus (COMP2 input plus is no more accessible). */
159+
#define COMP_WINDOWMODE_DISABLE (0x00000000UL) /*!< Window mode disable: Comparators
160+
instances pair COMP1 and COMP2 are
161+
independent */
162+
#define COMP_WINDOWMODE_COMP1_INPUT_PLUS_COMMON (COMP_CSR_WINMODE) /*!< Window mode enable: Comparators instances
163+
pair COMP1 and COMP2 have their input
164+
plus connected together.
165+
The common input is COMP1 input plus
166+
(COMP2 input plus is no more accessible).
167+
*/
159168
/**
160169
* @}
161170
*/
162171

172+
173+
163174
/** @defgroup COMP_PowerMode COMP power mode
164175
* @{
165176
*/
@@ -302,14 +313,14 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
302313
* @param __HANDLE__ COMP handle
303314
* @retval None
304315
*/
305-
#define __HAL_COMP_ENABLE(__HANDLE__) SET_BIT((__HANDLE__)->Instance->CSR, COMP_CSR_EN)
316+
#define __HAL_COMP_ENABLE(__HANDLE__) SET_BIT((__HANDLE__)->Instance->CSR, COMP_CSR_EN)
306317

307318
/**
308319
* @brief Disable the specified comparator.
309320
* @param __HANDLE__ COMP handle
310321
* @retval None
311322
*/
312-
#define __HAL_COMP_DISABLE(__HANDLE__) CLEAR_BIT((__HANDLE__)->Instance->CSR, COMP_CSR_EN)
323+
#define __HAL_COMP_DISABLE(__HANDLE__) CLEAR_BIT((__HANDLE__)->Instance->CSR, COMP_CSR_EN)
313324

314325
/**
315326
* @brief Lock the specified comparator configuration.
@@ -320,14 +331,14 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
320331
* @param __HANDLE__ COMP handle
321332
* @retval None
322333
*/
323-
#define __HAL_COMP_LOCK(__HANDLE__) SET_BIT((__HANDLE__)->Instance->CSR, COMP_CSR_LOCK)
334+
#define __HAL_COMP_LOCK(__HANDLE__) SET_BIT((__HANDLE__)->Instance->CSR, COMP_CSR_LOCK)
324335

325336
/**
326337
* @brief Check whether the specified comparator is locked.
327338
* @param __HANDLE__ COMP handle
328339
* @retval Value 0 if COMP instance is not locked, value 1 if COMP instance is locked
329340
*/
330-
#define __HAL_COMP_IS_LOCKED(__HANDLE__) (READ_BIT((__HANDLE__)->Instance->CSR, COMP_CSR_LOCK) == COMP_CSR_LOCK)
341+
#define __HAL_COMP_IS_LOCKED(__HANDLE__) (READ_BIT((__HANDLE__)->Instance->CSR, COMP_CSR_LOCK) == COMP_CSR_LOCK)
331342

332343
/**
333344
* @}
@@ -336,7 +347,6 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
336347
/** @defgroup COMP_Exti_Management COMP external interrupt line management
337348
* @{
338349
*/
339-
340350
/**
341351
* @brief Enable the COMP1 EXTI line rising edge trigger.
342352
* @retval None
@@ -365,19 +375,19 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
365375
* @brief Enable the COMP1 EXTI line rising & falling edge trigger.
366376
* @retval None
367377
*/
368-
#define __HAL_COMP_COMP1_EXTI_ENABLE_RISING_FALLING_EDGE() do { \
369-
LL_EXTI_EnableRisingTrig_0_31(COMP_EXTI_LINE_COMP1); \
370-
LL_EXTI_EnableFallingTrig_0_31(COMP_EXTI_LINE_COMP1); \
371-
} while(0)
378+
#define __HAL_COMP_COMP1_EXTI_ENABLE_RISING_FALLING_EDGE() do { \
379+
LL_EXTI_EnableRisingTrig_0_31(COMP_EXTI_LINE_COMP1); \
380+
LL_EXTI_EnableFallingTrig_0_31(COMP_EXTI_LINE_COMP1); \
381+
} while(0)
372382

373383
/**
374384
* @brief Disable the COMP1 EXTI line rising & falling edge trigger.
375385
* @retval None
376386
*/
377-
#define __HAL_COMP_COMP1_EXTI_DISABLE_RISING_FALLING_EDGE() do { \
378-
LL_EXTI_DisableRisingTrig_0_31(COMP_EXTI_LINE_COMP1); \
379-
LL_EXTI_DisableFallingTrig_0_31(COMP_EXTI_LINE_COMP1); \
380-
} while(0)
387+
#define __HAL_COMP_COMP1_EXTI_DISABLE_RISING_FALLING_EDGE() do { \
388+
LL_EXTI_DisableRisingTrig_0_31(COMP_EXTI_LINE_COMP1); \
389+
LL_EXTI_DisableFallingTrig_0_31(COMP_EXTI_LINE_COMP1);\
390+
} while(0)
381391

382392
/**
383393
* @brief Enable the COMP1 EXTI line in interrupt mode.
@@ -461,19 +471,19 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
461471
* @brief Enable the COMP2 EXTI line rising & falling edge trigger.
462472
* @retval None
463473
*/
464-
#define __HAL_COMP_COMP2_EXTI_ENABLE_RISING_FALLING_EDGE() do { \
465-
LL_EXTI_EnableRisingTrig_0_31(COMP_EXTI_LINE_COMP2); \
466-
LL_EXTI_EnableFallingTrig_0_31(COMP_EXTI_LINE_COMP2); \
467-
} while(0)
474+
#define __HAL_COMP_COMP2_EXTI_ENABLE_RISING_FALLING_EDGE() do { \
475+
LL_EXTI_EnableRisingTrig_0_31(COMP_EXTI_LINE_COMP2); \
476+
LL_EXTI_EnableFallingTrig_0_31(COMP_EXTI_LINE_COMP2); \
477+
} while(0)
468478

469479
/**
470480
* @brief Disable the COMP2 EXTI line rising & falling edge trigger.
471481
* @retval None
472482
*/
473-
#define __HAL_COMP_COMP2_EXTI_DISABLE_RISING_FALLING_EDGE() do { \
474-
LL_EXTI_DisableRisingTrig_0_31(COMP_EXTI_LINE_COMP2); \
475-
LL_EXTI_DisableFallingTrig_0_31(COMP_EXTI_LINE_COMP2); \
476-
} while(0)
483+
#define __HAL_COMP_COMP2_EXTI_DISABLE_RISING_FALLING_EDGE() do { \
484+
LL_EXTI_DisableRisingTrig_0_31(COMP_EXTI_LINE_COMP2); \
485+
LL_EXTI_DisableFallingTrig_0_31(COMP_EXTI_LINE_COMP2);\
486+
} while(0)
477487

478488
/**
479489
* @brief Enable the COMP2 EXTI line in interrupt mode.
@@ -609,7 +619,7 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
609619
/* Note: On this STM32 series, comparator input minus parameters are */
610620
/* the same on all COMP instances. */
611621
/* However, comparator instance kept as macro parameter for */
612-
/* compatibility with other STM32 families. */
622+
/* compatibility with other STM32 series. */
613623
#define IS_COMP_INPUT_MINUS(__COMP_INSTANCE__, __INPUT_MINUS__) (((__INPUT_MINUS__) == COMP_INPUT_MINUS_1_4VREFINT) || \
614624
((__INPUT_MINUS__) == COMP_INPUT_MINUS_1_2VREFINT) || \
615625
((__INPUT_MINUS__) == COMP_INPUT_MINUS_3_4VREFINT) || \
@@ -628,7 +638,7 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
628638
((__POL__) == COMP_OUTPUTPOL_INVERTED))
629639

630640
#define IS_COMP_BLANKINGSRCE(__OUTPUT_BLANKING_SOURCE__) \
631-
( ((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_NONE) \
641+
(((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_NONE) \
632642
|| ((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM1_OC5_COMP1) \
633643
|| ((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM2_OC3_COMP1) \
634644
|| ((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM3_OC3_COMP1) \
@@ -638,17 +648,17 @@ typedef void (*pCOMP_CallbackTypeDef)(COMP_HandleTypeDef *hcomp); /*!< pointer
638648
)
639649

640650
#define IS_COMP_BLANKINGSRC_INSTANCE(__INSTANCE__, __OUTPUT_BLANKING_SOURCE__) \
641-
((((__INSTANCE__) == COMP1) && \
651+
((((__INSTANCE__) == COMP1) && \
642652
(((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_NONE) || \
643653
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM1_OC5_COMP1) || \
644654
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM2_OC3_COMP1) || \
645655
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM3_OC3_COMP1))) \
646-
|| \
647-
(((__INSTANCE__) == COMP2) && \
648-
(((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_NONE) || \
649-
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM3_OC4_COMP2) || \
650-
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM8_OC5_COMP2) || \
651-
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM15_OC1_COMP2))))
656+
|| \
657+
(((__INSTANCE__) == COMP2) && \
658+
(((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_NONE) || \
659+
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM3_OC4_COMP2) || \
660+
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM8_OC5_COMP2) || \
661+
((__OUTPUT_BLANKING_SOURCE__) == COMP_BLANKINGSRC_TIM15_OC1_COMP2))))
652662

653663

654664
#define IS_COMP_TRIGGERMODE(__MODE__) (((__MODE__) == COMP_TRIGGERMODE_NONE) || \

‎system/Drivers/STM32L5xx_HAL_Driver/Inc/stm32l5xx_hal_cortex.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,11 +277,15 @@ void HAL_SYSTICK_Callback(void);
277277
#if (__MPU_PRESENT == 1)
278278
void HAL_MPU_Enable(uint32_t MPU_Control);
279279
void HAL_MPU_Disable(void);
280+
void HAL_MPU_EnableRegion(uint32_t RegionNumber);
281+
void HAL_MPU_DisableRegion(uint32_t RegionNumber);
280282
void HAL_MPU_ConfigRegion(MPU_Region_InitTypeDef *MPU_RegionInit);
281283
void HAL_MPU_ConfigMemoryAttributes(MPU_Attributes_InitTypeDef *MPU_AttributesInit);
282284
#ifdef MPU_NS
283285
void HAL_MPU_Enable_NS(uint32_t MPU_Control);
284286
void HAL_MPU_Disable_NS(void);
287+
void HAL_MPU_EnableRegion_NS(uint32_t RegionNumber);
288+
void HAL_MPU_DisableRegion_NS(uint32_t RegionNumber);
285289
void HAL_MPU_ConfigRegion_NS(MPU_Region_InitTypeDef *MPU_RegionInit);
286290
void HAL_MPU_ConfigMemoryAttributes_NS(MPU_Attributes_InitTypeDef *MPU_AttributesInit);
287291
#endif /* MPU_NS */

‎system/Drivers/STM32L5xx_HAL_Driver/Inc/stm32l5xx_hal_crc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ uint32_t HAL_CRC_Calculate(CRC_HandleTypeDef *hcrc, uint32_t pBuffer[], uint32_t
318318
/** @defgroup CRC_Exported_Functions_Group3 Peripheral State functions
319319
* @{
320320
*/
321-
HAL_CRC_StateTypeDef HAL_CRC_GetState(CRC_HandleTypeDef *hcrc);
321+
HAL_CRC_StateTypeDef HAL_CRC_GetState(const CRC_HandleTypeDef *hcrc);
322322
/**
323323
* @}
324324
*/

‎system/Drivers/STM32L5xx_HAL_Driver/Inc/stm32l5xx_hal_cryp.h‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ typedef struct
5353
uint32_t DataType; /*!< 32-bit data, 16-bit data, 8-bit data or 1-bit string.
5454
This parameter can be a value of @ref CRYP_Data_Type */
5555
uint32_t KeySize; /*!< Used only in AES mode : 128, 192 or 256 bit key length in CRYP1.
56-
128 or 256 bit key length in TinyAES This parameter can be a value of @ref CRYP_Key_Size */
56+
128 or 256 bit key length in TinyAES
57+
This parameter can be a value of @ref CRYP_Key_Size */
5758
uint32_t *pKey; /*!< The key used for encryption/decryption */
5859
uint32_t *pInitVect; /*!< The initialization vector used also as initialization
5960
counter in CTR mode */
@@ -96,7 +97,7 @@ typedef enum
9697
{
9798
HAL_CRYP_SUSPEND_NONE = 0x00U, /*!< CRYP processing suspension not requested */
9899
HAL_CRYP_SUSPEND = 0x01U /*!< CRYP processing suspension requested */
99-
}HAL_SuspendTypeDef;
100+
} HAL_SuspendTypeDef;
100101
#endif /* USE_HAL_CRYP_SUSPEND_RESUME */
101102

102103
/**
@@ -407,7 +408,7 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
407408
* @arg CRYP_FLAG_OFNE: Output FIFO is not empty
408409
* @arg CRYP_FLAG_OFFU: Output FIFO is full
409410
* @arg CRYP_FLAG_OUTRIS: Input FIFO service raw interrupt is pending
410-
* @retval The state of __FLAG__ (TRUE or FALSE).
411+
* @retval The state of __FLAG__ (TRUE or FALSE).
411412
*/
412413

413414
#define CRYP_FLAG_MASK 0x0000001FU
@@ -434,7 +435,8 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
434435
* @retval State of interruption (TRUE or FALSE).
435436
*/
436437

437-
#define __HAL_CRYP_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->CR & (__INTERRUPT__)) == (__INTERRUPT__))
438+
#define __HAL_CRYP_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->CR &\
439+
(__INTERRUPT__)) == (__INTERRUPT__))
438440

439441
/** @brief Check whether the specified CRYP interrupt is set or not.
440442
* @param __HANDLE__ specifies the CRYP handle.
@@ -503,7 +505,8 @@ void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp);
503505
HAL_StatusTypeDef HAL_CRYP_SetConfig(CRYP_HandleTypeDef *hcryp, CRYP_ConfigTypeDef *pConf);
504506
HAL_StatusTypeDef HAL_CRYP_GetConfig(CRYP_HandleTypeDef *hcryp, CRYP_ConfigTypeDef *pConf);
505507
#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
506-
HAL_StatusTypeDef HAL_CRYP_RegisterCallback(CRYP_HandleTypeDef *hcryp, HAL_CRYP_CallbackIDTypeDef CallbackID, pCRYP_CallbackTypeDef pCallback);
508+
HAL_StatusTypeDef HAL_CRYP_RegisterCallback(CRYP_HandleTypeDef *hcryp, HAL_CRYP_CallbackIDTypeDef CallbackID,
509+
pCRYP_CallbackTypeDef pCallback);
507510
HAL_StatusTypeDef HAL_CRYP_UnRegisterCallback(CRYP_HandleTypeDef *hcryp, HAL_CRYP_CallbackIDTypeDef CallbackID);
508511
#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */
509512
#if (USE_HAL_CRYP_SUSPEND_RESUME == 1U)
@@ -520,8 +523,10 @@ HAL_StatusTypeDef HAL_CRYP_Resume(CRYP_HandleTypeDef *hcryp);
520523
*/
521524

522525
/* encryption/decryption ***********************************/
523-
HAL_StatusTypeDef HAL_CRYP_Encrypt(CRYP_HandleTypeDef *hcryp, uint32_t *Input, uint16_t Size, uint32_t *Output, uint32_t Timeout);
524-
HAL_StatusTypeDef HAL_CRYP_Decrypt(CRYP_HandleTypeDef *hcryp, uint32_t *Input, uint16_t Size, uint32_t *Output, uint32_t Timeout);
526+
HAL_StatusTypeDef HAL_CRYP_Encrypt(CRYP_HandleTypeDef *hcryp, uint32_t *Input, uint16_t Size, uint32_t *Output,
527+
uint32_t Timeout);
528+
HAL_StatusTypeDef HAL_CRYP_Decrypt(CRYP_HandleTypeDef *hcryp, uint32_t *Input, uint16_t Size, uint32_t *Output,
529+
uint32_t Timeout);
525530
HAL_StatusTypeDef HAL_CRYP_Encrypt_IT(CRYP_HandleTypeDef *hcryp, uint32_t *Input, uint16_t Size, uint32_t *Output);
526531
HAL_StatusTypeDef HAL_CRYP_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint32_t *Input, uint16_t Size, uint32_t *Output);
527532
HAL_StatusTypeDef HAL_CRYP_Encrypt_DMA(CRYP_HandleTypeDef *hcryp, uint32_t *Input, uint16_t Size, uint32_t *Output);
@@ -579,11 +584,11 @@ uint32_t HAL_CRYP_GetError(CRYP_HandleTypeDef *hcryp);
579584
((CONFIG) == CRYP_KEYIVCONFIG_ONCE))
580585

581586
#define IS_CRYP_BUFFERSIZE(ALGO, DATAWIDTH, SIZE) \
582-
(((((ALGO) == CRYP_AES_CTR)) && \
583-
((((DATAWIDTH) == CRYP_DATAWIDTHUNIT_WORD) && (((SIZE) % 4U) == 0U)) || \
584-
(((DATAWIDTH) == CRYP_DATAWIDTHUNIT_BYTE) && (((SIZE) % 16U) == 0U)))) || \
585-
(((ALGO) == CRYP_AES_ECB) || ((ALGO) == CRYP_AES_CBC) || \
586-
((ALGO)== CRYP_AES_GCM_GMAC) || ((ALGO) == CRYP_AES_CCM)))
587+
(((((ALGO) == CRYP_AES_CTR)) && \
588+
((((DATAWIDTH) == CRYP_DATAWIDTHUNIT_WORD) && (((SIZE) % 4U) == 0U)) || \
589+
(((DATAWIDTH) == CRYP_DATAWIDTHUNIT_BYTE) && (((SIZE) % 16U) == 0U)))) || \
590+
(((ALGO) == CRYP_AES_ECB) || ((ALGO) == CRYP_AES_CBC) || \
591+
((ALGO)== CRYP_AES_GCM_GMAC) || ((ALGO) == CRYP_AES_CCM)))
587592

588593
/**
589594
* @}

‎system/Drivers/STM32L5xx_HAL_Driver/Inc/stm32l5xx_hal_cryp_ex.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ extern "C" {
7373
*/
7474

7575
/**
76-
* @}
77-
*/
76+
* @}
77+
*/
7878

7979
/* Private functions ---------------------------------------------------------*/
8080
/** @defgroup CRYPEx_Private_Functions CRYPEx Private Functions

0 commit comments

Comments
 (0)