Skip to content

Commit 0791058

Browse files
fpistmfpistm
committed
system(l1) update STM32L1xx HAL Drivers to v1.4.6
Included in STM32CubeL1 FW v1.10.5 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 750d92f commit 0791058

Some content is hidden

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

56 files changed

+1672
-1074
lines changed

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

Lines changed: 118 additions & 30 deletions
Large diffs are not rendered by default.

‎system/Drivers/STM32L1xx_HAL_Driver/Inc/stm32l1xx_hal_cortex.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,8 @@ uint32_t HAL_SYSTICK_Config(uint32_t TicksNumb);
399399
#if (__MPU_PRESENT == 1)
400400
void HAL_MPU_Enable(uint32_t MPU_Control);
401401
void HAL_MPU_Disable(void);
402+
void HAL_MPU_EnableRegion(uint32_t RegionNumber);
403+
void HAL_MPU_DisableRegion(uint32_t RegionNumber);
402404
void HAL_MPU_ConfigRegion(MPU_Region_InitTypeDef *MPU_Init);
403405
#endif /* __MPU_PRESENT */
404406
uint32_t HAL_NVIC_GetPriorityGrouping(void);
@@ -432,4 +434,3 @@ void HAL_SYSTICK_Callback(void);
432434

433435
#endif /* __STM32L1xx_HAL_CORTEX_H */
434436

435-

‎system/Drivers/STM32L1xx_HAL_Driver/Inc/stm32l1xx_hal_i2s.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,8 @@ void HAL_I2S_ErrorCallback(I2S_HandleTypeDef *hi2s);
457457
* @{
458458
*/
459459
/* Peripheral Control and State functions ************************************/
460-
HAL_I2S_StateTypeDef HAL_I2S_GetState(I2S_HandleTypeDef *hi2s);
461-
uint32_t HAL_I2S_GetError(I2S_HandleTypeDef *hi2s);
460+
HAL_I2S_StateTypeDef HAL_I2S_GetState(const I2S_HandleTypeDef *hi2s);
461+
uint32_t HAL_I2S_GetError(const I2S_HandleTypeDef *hi2s);
462462
/**
463463
* @}
464464
*/

‎system/Drivers/STM32L1xx_HAL_Driver/Inc/stm32l1xx_hal_nor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ HAL_StatusTypeDef HAL_NOR_WriteOperation_Disable(NOR_HandleTypeDef *hnor);
234234
*/
235235

236236
/* NOR State functions ********************************************************/
237-
HAL_NOR_StateTypeDef HAL_NOR_GetState(NOR_HandleTypeDef *hnor);
237+
HAL_NOR_StateTypeDef HAL_NOR_GetState(const NOR_HandleTypeDef *hnor);
238238
HAL_NOR_StatusTypeDef HAL_NOR_GetStatus(NOR_HandleTypeDef *hnor, uint32_t Address, uint32_t Timeout);
239239
/**
240240
* @}

‎system/Drivers/STM32L1xx_HAL_Driver/Inc/stm32l1xx_hal_pcd.h‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -801,20 +801,17 @@ PCD_StateTypeDef HAL_PCD_GetState(PCD_HandleTypeDef const *hpcd);
801801
\
802802
*(pdwReg) &= 0x3FFU; \
803803
\
804-
if ((wCount) > 62U) \
804+
if ((wCount) == 0U) \
805805
{ \
806-
PCD_CALC_BLK32((pdwReg), (wCount), wNBlocks); \
806+
*(pdwReg) |= USB_CNTRX_BLSIZE; \
807+
} \
808+
else if ((wCount) <= 62U) \
809+
{ \
810+
PCD_CALC_BLK2((pdwReg), (wCount), wNBlocks); \
807811
} \
808812
else \
809813
{ \
810-
if ((wCount) == 0U) \
811-
{ \
812-
*(pdwReg) |= USB_CNTRX_BLSIZE; \
813-
} \
814-
else \
815-
{ \
816-
PCD_CALC_BLK2((pdwReg), (wCount), wNBlocks); \
817-
} \
814+
PCD_CALC_BLK32((pdwReg), (wCount), wNBlocks); \
818815
} \
819816
} while(0) /* PCD_SET_EP_CNT_RX_REG */
820817

‎system/Drivers/STM32L1xx_HAL_Driver/Inc/stm32l1xx_hal_pcd_ex.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ extern "C" {
4747
*/
4848

4949

50-
5150
HAL_StatusTypeDef HAL_PCDEx_PMAConfig(PCD_HandleTypeDef *hpcd, uint16_t ep_addr,
5251
uint16_t ep_kind, uint32_t pmaadress);
5352

‎system/Drivers/STM32L1xx_HAL_Driver/Inc/stm32l1xx_hal_rcc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1845,7 +1845,7 @@ typedef struct
18451845
/* Initialization and de-initialization functions ******************************/
18461846
HAL_StatusTypeDef HAL_RCC_DeInit(void);
18471847
HAL_StatusTypeDef HAL_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct);
1848-
HAL_StatusTypeDef HAL_RCC_ClockConfig(RCC_ClkInitTypeDef *RCC_ClkInitStruct, uint32_t FLatency);
1848+
HAL_StatusTypeDef HAL_RCC_ClockConfig(const RCC_ClkInitTypeDef *RCC_ClkInitStruct, uint32_t FLatency);
18491849

18501850
/**
18511851
* @}

‎system/Drivers/STM32L1xx_HAL_Driver/Inc/stm32l1xx_hal_rtc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ HAL_RTCStateTypeDef HAL_RTC_GetState(RTC_HandleTypeDef *hrtc);
810810

811811
#define RTC_TIMEOUT_VALUE 1000U
812812

813-
#define RTC_EXTI_LINE_ALARM_EVENT EXTI_IMR_MR17 /*!< External interrupt line 17 Connected to the RTC Alarm event */
813+
#define RTC_EXTI_LINE_ALARM_EVENT EXTI_IMR_MR17 /*!< External interrupt line 17 connected to the RTC Alarm event */
814814
/**
815815
* @}
816816
*/

‎system/Drivers/STM32L1xx_HAL_Driver/Inc/stm32l1xx_hal_rtc_ex.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -695,10 +695,10 @@ typedef struct
695695
* @param __FLAG__ specifies the RTC Tamper flag to be checked.
696696
* This parameter can be:
697697
* @arg RTC_FLAG_TAMP1F: Tamper 1 interrupt flag
698-
* @arg RTC_FLAG_TAMP2F: Tamper 2 interrupt flag
699-
* @arg RTC_FLAG_TAMP3F: Tamper 3 interrupt flag
700-
* @note RTC_FLAG_TAMP2F is not applicable to all devices.
701-
* @note RTC_FLAG_TAMP3F is not applicable to all devices.
698+
* @arg RTC_FLAG_TAMP2F: Tamper 2 interrupt flag (*)
699+
* @arg RTC_FLAG_TAMP3F: Tamper 3 interrupt flag (*)
700+
*
701+
* (*) value not applicable to all devices.
702702
* @retval None
703703
*/
704704
#define __HAL_RTC_TAMPER_GET_FLAG(__HANDLE__, __FLAG__) (((((__HANDLE__)->Instance->ISR) & (__FLAG__)) != 0U)? 1U : 0U)
@@ -709,10 +709,10 @@ typedef struct
709709
* @param __FLAG__ specifies the RTC Tamper Flag to clear.
710710
* This parameter can be:
711711
* @arg RTC_FLAG_TAMP1F: Tamper 1 interrupt flag
712-
* @arg RTC_FLAG_TAMP2F: Tamper 2 interrupt flag
713-
* @arg RTC_FLAG_TAMP3F: Tamper 3 interrupt flag
714-
* @note RTC_FLAG_TAMP2F is not applicable to all devices.
715-
* @note RTC_FLAG_TAMP3F is not applicable to all devices.
712+
* @arg RTC_FLAG_TAMP2F: Tamper 2 interrupt flag (*)
713+
* @arg RTC_FLAG_TAMP3F: Tamper 3 interrupt flag (*)
714+
*
715+
* (*) value not applicable to all devices.
716716
* @retval None
717717
*/
718718
#define __HAL_RTC_TAMPER_CLEAR_FLAG(__HANDLE__, __FLAG__) ((__HANDLE__)->Instance->ISR) = (~((__FLAG__) | RTC_ISR_INIT)|((__HANDLE__)->Instance->ISR & RTC_ISR_INIT))
@@ -741,13 +741,13 @@ typedef struct
741741
* @brief Enable event on the RTC Tamper and Timestamp associated EXTI line.
742742
* @retval None.
743743
*/
744-
#define __HAL_RTC_TAMPER_TIMESTAMP_EXTI_ENABLE_EVENT() (EXTI->EMR |= RTC_EXTI_LINE_TAMPER_TIMESTAMP_EVENT)
744+
#define __HAL_RTC_TAMPER_TIMESTAMP_EXTI_ENABLE_EVENT() (EXTI->EMR |= RTC_EXTI_LINE_TAMPER_TIMESTAMP_EVENT)
745745

746746
/**
747747
* @brief Disable event on the RTC Tamper and Timestamp associated EXTI line.
748748
* @retval None.
749749
*/
750-
#define __HAL_RTC_TAMPER_TIMESTAMP_EXTI_DISABLE_EVENT() (EXTI->EMR &= ~RTC_EXTI_LINE_TAMPER_TIMESTAMP_EVENT)
750+
#define __HAL_RTC_TAMPER_TIMESTAMP_EXTI_DISABLE_EVENT() (EXTI->EMR &= ~RTC_EXTI_LINE_TAMPER_TIMESTAMP_EVENT)
751751

752752
/**
753753
* @brief Enable falling edge trigger on the RTC Tamper and Timestamp associated EXTI line.
@@ -970,7 +970,7 @@ HAL_StatusTypeDef HAL_RTCEx_DisableBypassShadow(RTC_HandleTypeDef *hrtc);
970970
* @{
971971
*/
972972
/* Extended RTC features functions *******************************************/
973-
void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc);
973+
void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc);
974974
HAL_StatusTypeDef HAL_RTCEx_PollForAlarmBEvent(RTC_HandleTypeDef *hrtc, uint32_t Timeout);
975975
/**
976976
* @}

‎system/Drivers/STM32L1xx_HAL_Driver/Inc/stm32l1xx_hal_smbus.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -150,35 +150,35 @@ typedef enum
150150
*/
151151
typedef struct __SMBUS_HandleTypeDef
152152
{
153-
I2C_TypeDef *Instance; /*!< SMBUS registers base address */
153+
I2C_TypeDef *Instance; /*!< SMBUS registers base address */
154154

155-
SMBUS_InitTypeDef Init; /*!< SMBUS communication parameters */
155+
SMBUS_InitTypeDef Init; /*!< SMBUS communication parameters */
156156

157-
uint8_t *pBuffPtr; /*!< Pointer to SMBUS transfer buffer */
157+
uint8_t *pBuffPtr; /*!< Pointer to SMBUS transfer buffer */
158158

159-
uint16_t XferSize; /*!< SMBUS transfer size */
159+
uint16_t XferSize; /*!< SMBUS transfer size */
160160

161-
__IO uint16_t XferCount; /*!< SMBUS transfer counter */
161+
__IO uint16_t XferCount; /*!< SMBUS transfer counter */
162162

163163
__IO uint32_t XferOptions; /*!< SMBUS transfer options this parameter can
164-
be a value of @ref SMBUS_OPTIONS */
164+
be a value of @ref SMBUS_XferOptions_definition */
165165

166166
__IO uint32_t PreviousState; /*!< SMBUS communication Previous state and mode
167-
context for internal usage */
167+
context for internal usage */
168168

169-
HAL_LockTypeDef Lock; /*!< SMBUS locking object */
169+
HAL_LockTypeDef Lock; /*!< SMBUS locking object */
170170

171-
__IO HAL_SMBUS_StateTypeDef State; /*!< SMBUS communication state */
171+
__IO HAL_SMBUS_StateTypeDef State; /*!< SMBUS communication state */
172172

173-
__IO HAL_SMBUS_ModeTypeDef Mode; /*!< SMBUS communication mode */
173+
__IO HAL_SMBUS_ModeTypeDef Mode; /*!< SMBUS communication mode */
174174

175-
__IO uint32_t ErrorCode; /*!< SMBUS Error code */
175+
__IO uint32_t ErrorCode; /*!< SMBUS Error code */
176176

177-
__IO uint32_t Devaddress; /*!< SMBUS Target device address */
177+
__IO uint32_t Devaddress; /*!< SMBUS Target device address */
178178

179-
__IO uint32_t EventCount; /*!< SMBUS Event counter */
179+
__IO uint32_t EventCount; /*!< SMBUS Event counter */
180180

181-
uint8_t XferPEC; /*!< SMBUS PEC data in reception mode */
181+
uint8_t XferPEC; /*!< SMBUS PEC data in reception mode */
182182

183183
#if (USE_HAL_SMBUS_REGISTER_CALLBACKS == 1)
184184
void (* MasterTxCpltCallback)(struct __SMBUS_HandleTypeDef *hsmbus); /*!< SMBUS Master Tx Transfer completed callback */
@@ -600,6 +600,10 @@ void HAL_SMBUS_ListenCpltCallback(SMBUS_HandleTypeDef *hsmbus);
600600
void HAL_SMBUS_ErrorCallback(SMBUS_HandleTypeDef *hsmbus);
601601
void HAL_SMBUS_AbortCpltCallback(SMBUS_HandleTypeDef *hsmbus);
602602

603+
/**
604+
* @}
605+
*/
606+
603607
/**
604608
* @}
605609
*/
@@ -709,10 +713,6 @@ uint32_t HAL_SMBUS_GetError(SMBUS_HandleTypeDef *hsmbus);
709713
* @}
710714
*/
711715

712-
/**
713-
* @}
714-
*/
715-
716716
#ifdef __cplusplus
717717
}
718718
#endif

0 commit comments

Comments
 (0)