Skip to content

Commit ddb0fbf

Browse files
fpistmfpistm
committed
system(L4) update STM32L4xx HAL Drivers to v1.13.4
Included in STM32CubeL4 FW v1.18.0 Signed-off-by: Frederic Pillon <[email protected]>
1 parent 8ff274a commit ddb0fbf

File tree

124 files changed

+7282
-4775
lines changed

Some content is hidden

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

124 files changed

+7282
-4775
lines changed

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

+417-71
Large diffs are not rendered by default.

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_adc.h

+438-244
Large diffs are not rendered by default.

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_adc_ex.h

+317-164
Large diffs are not rendered by default.

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_can.h

+4
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,11 @@ typedef struct
209209
/**
210210
* @brief CAN handle Structure definition
211211
*/
212+
#if USE_HAL_CAN_REGISTER_CALLBACKS == 1
212213
typedef struct __CAN_HandleTypeDef
214+
#else
215+
typedef struct
216+
#endif /* USE_HAL_CAN_REGISTER_CALLBACKS */
213217
{
214218
CAN_TypeDef *Instance; /*!< Register base address */
215219

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_comp.h

+98-88
Large diffs are not rendered by default.

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_crc.h

+1-1
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/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_cryp.h

+4
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,11 @@ typedef enum
149149
/**
150150
* @brief CRYP handle Structure definition
151151
*/
152+
#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1)
152153
typedef struct __CRYP_HandleTypeDef
154+
#else
155+
typedef struct
156+
#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */
153157
{
154158
AES_TypeDef *Instance; /*!< Register base address */
155159

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_dcmi.h

+4
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,11 @@ typedef enum
126126
/**
127127
* @brief DCMI handle Structure definition
128128
*/
129+
#if (USE_HAL_DCMI_REGISTER_CALLBACKS == 1)
129130
typedef struct __DCMI_HandleTypeDef
131+
#else
132+
typedef struct
133+
#endif /* USE_HAL_DCMI_REGISTER_CALLBACKS */
130134
{
131135
DCMI_TypeDef *Instance; /*!< DCMI Register base address */
132136

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_def.h

+2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ typedef enum
5454

5555
/* Exported macros -----------------------------------------------------------*/
5656

57+
#if !defined(UNUSED)
5758
#define UNUSED(X) (void)X /* To avoid gcc/g++ warnings */
59+
#endif /* UNUSED */
5860

5961
#define HAL_MAX_DELAY 0xFFFFFFFFU
6062

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_dma.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#define STM32L4xx_HAL_DMA_H
2222

2323
#ifdef __cplusplus
24-
extern "C" {
24+
extern "C" {
2525
#endif
2626

2727
/* Includes ------------------------------------------------------------------*/
@@ -82,7 +82,7 @@ typedef enum
8282
HAL_DMA_STATE_READY = 0x01U, /*!< DMA initialized and ready for use */
8383
HAL_DMA_STATE_BUSY = 0x02U, /*!< DMA process is ongoing */
8484
HAL_DMA_STATE_TIMEOUT = 0x03U, /*!< DMA timeout state */
85-
}HAL_DMA_StateTypeDef;
85+
} HAL_DMA_StateTypeDef;
8686

8787
/**
8888
* @brief HAL DMA Error Code structure definition
@@ -91,7 +91,7 @@ typedef enum
9191
{
9292
HAL_DMA_FULL_TRANSFER = 0x00U, /*!< Full transfer */
9393
HAL_DMA_HALF_TRANSFER = 0x01U /*!< Half Transfer */
94-
}HAL_DMA_LevelCompleteTypeDef;
94+
} HAL_DMA_LevelCompleteTypeDef;
9595

9696

9797
/**
@@ -104,7 +104,7 @@ typedef enum
104104
HAL_DMA_XFER_ERROR_CB_ID = 0x02U, /*!< Error */
105105
HAL_DMA_XFER_ABORT_CB_ID = 0x03U, /*!< Abort */
106106
HAL_DMA_XFER_ALL_CB_ID = 0x04U /*!< All */
107-
}HAL_DMA_CallbackIDTypeDef;
107+
} HAL_DMA_CallbackIDTypeDef;
108108

109109
/**
110110
* @brief DMA handle Structure definition
@@ -121,13 +121,13 @@ typedef struct __DMA_HandleTypeDef
121121

122122
void *Parent; /*!< Parent object state */
123123

124-
void (* XferCpltCallback)(struct __DMA_HandleTypeDef * hdma); /*!< DMA transfer complete callback */
124+
void (* XferCpltCallback)(struct __DMA_HandleTypeDef *hdma); /*!< DMA transfer complete callback */
125125

126-
void (* XferHalfCpltCallback)(struct __DMA_HandleTypeDef * hdma); /*!< DMA Half transfer complete callback */
126+
void (* XferHalfCpltCallback)(struct __DMA_HandleTypeDef *hdma); /*!< DMA Half transfer complete callback */
127127

128-
void (* XferErrorCallback)(struct __DMA_HandleTypeDef * hdma); /*!< DMA transfer error callback */
128+
void (* XferErrorCallback)(struct __DMA_HandleTypeDef *hdma); /*!< DMA transfer error callback */
129129

130-
void (* XferAbortCallback)(struct __DMA_HandleTypeDef * hdma); /*!< DMA transfer abort callback */
130+
void (* XferAbortCallback)(struct __DMA_HandleTypeDef *hdma); /*!< DMA transfer abort callback */
131131

132132
__IO uint32_t ErrorCode; /*!< DMA Error code */
133133

@@ -150,7 +150,7 @@ typedef struct __DMA_HandleTypeDef
150150

151151
#endif /* DMAMUX1 */
152152

153-
}DMA_HandleTypeDef;
153+
} DMA_HandleTypeDef;
154154
/**
155155
* @}
156156
*/
@@ -753,7 +753,7 @@ typedef struct __DMA_HandleTypeDef
753753
*/
754754
/* Initialization and de-initialization functions *****************************/
755755
HAL_StatusTypeDef HAL_DMA_Init(DMA_HandleTypeDef *hdma);
756-
HAL_StatusTypeDef HAL_DMA_DeInit (DMA_HandleTypeDef *hdma);
756+
HAL_StatusTypeDef HAL_DMA_DeInit(DMA_HandleTypeDef *hdma);
757757
/**
758758
* @}
759759
*/
@@ -762,13 +762,13 @@ HAL_StatusTypeDef HAL_DMA_DeInit (DMA_HandleTypeDef *hdma);
762762
* @{
763763
*/
764764
/* IO operation functions *****************************************************/
765-
HAL_StatusTypeDef HAL_DMA_Start (DMA_HandleTypeDef *hdma, uint32_t SrcAddress, uint32_t DstAddress, uint32_t DataLength);
765+
HAL_StatusTypeDef HAL_DMA_Start(DMA_HandleTypeDef *hdma, uint32_t SrcAddress, uint32_t DstAddress, uint32_t DataLength);
766766
HAL_StatusTypeDef HAL_DMA_Start_IT(DMA_HandleTypeDef *hdma, uint32_t SrcAddress, uint32_t DstAddress, uint32_t DataLength);
767767
HAL_StatusTypeDef HAL_DMA_Abort(DMA_HandleTypeDef *hdma);
768768
HAL_StatusTypeDef HAL_DMA_Abort_IT(DMA_HandleTypeDef *hdma);
769769
HAL_StatusTypeDef HAL_DMA_PollForTransfer(DMA_HandleTypeDef *hdma, HAL_DMA_LevelCompleteTypeDef CompleteLevel, uint32_t Timeout);
770770
void HAL_DMA_IRQHandler(DMA_HandleTypeDef *hdma);
771-
HAL_StatusTypeDef HAL_DMA_RegisterCallback(DMA_HandleTypeDef *hdma, HAL_DMA_CallbackIDTypeDef CallbackID, void (* pCallback)( DMA_HandleTypeDef * _hdma));
771+
HAL_StatusTypeDef HAL_DMA_RegisterCallback(DMA_HandleTypeDef *hdma, HAL_DMA_CallbackIDTypeDef CallbackID, void (* pCallback)(DMA_HandleTypeDef *_hdma));
772772
HAL_StatusTypeDef HAL_DMA_UnRegisterCallback(DMA_HandleTypeDef *hdma, HAL_DMA_CallbackIDTypeDef CallbackID);
773773

774774
/**

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_dma_ex.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ typedef struct
6969
This parameter must be a number between Min_Data = 1 and Max_Data = 32 */
7070

7171

72-
}HAL_DMA_MuxSyncConfigTypeDef;
72+
} HAL_DMA_MuxSyncConfigTypeDef;
7373

7474

7575
/**
7676
* @brief HAL DMAMUX request generator parameters structure definition
7777
*/
7878
typedef struct
7979
{
80-
uint32_t SignalID; /*!< Specifies the ID of the signal used for DMAMUX request generator
80+
uint32_t SignalID; /*!< Specifies the ID of the signal used for DMAMUX request generator
8181
This parameter can be a value of @ref DMAEx_DMAMUX_SignalGeneratorID_selection */
8282

8383
uint32_t Polarity; /*!< Specifies the polarity of the signal on which the request is generated.
@@ -86,7 +86,7 @@ typedef struct
8686
uint32_t RequestNumber; /*!< Specifies the number of DMA request that will be generated after a signal event
8787
This parameter must be a number between Min_Data = 1 and Max_Data = 32 */
8888

89-
}HAL_DMA_MuxRequestGeneratorConfigTypeDef;
89+
} HAL_DMA_MuxRequestGeneratorConfigTypeDef;
9090

9191
/**
9292
* @}
@@ -211,10 +211,10 @@ typedef struct
211211
*/
212212

213213
/* ------------------------- REQUEST -----------------------------------------*/
214-
HAL_StatusTypeDef HAL_DMAEx_ConfigMuxRequestGenerator (DMA_HandleTypeDef *hdma,
215-
HAL_DMA_MuxRequestGeneratorConfigTypeDef *pRequestGeneratorConfig);
216-
HAL_StatusTypeDef HAL_DMAEx_EnableMuxRequestGenerator (DMA_HandleTypeDef *hdma);
217-
HAL_StatusTypeDef HAL_DMAEx_DisableMuxRequestGenerator (DMA_HandleTypeDef *hdma);
214+
HAL_StatusTypeDef HAL_DMAEx_ConfigMuxRequestGenerator(DMA_HandleTypeDef *hdma,
215+
HAL_DMA_MuxRequestGeneratorConfigTypeDef *pRequestGeneratorConfig);
216+
HAL_StatusTypeDef HAL_DMAEx_EnableMuxRequestGenerator(DMA_HandleTypeDef *hdma);
217+
HAL_StatusTypeDef HAL_DMAEx_DisableMuxRequestGenerator(DMA_HandleTypeDef *hdma);
218218
/* -------------------------------------------------------------------------- */
219219

220220
/* ------------------------- SYNCHRO -----------------------------------------*/

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_dsi.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ typedef void (*pDSI_CallbackTypeDef)(DSI_HandleTypeDef *hdsi); /*!< pointer to
976976
#define __HAL_DSI_WRAPPER_ENABLE(__HANDLE__) do { \
977977
__IO uint32_t tmpreg = 0x00U; \
978978
SET_BIT((__HANDLE__)->Instance->WCR, DSI_WCR_DSIEN);\
979-
/* Delay after an DSI warpper enabling */ \
979+
/* Delay after an DSI wrapper enabling */ \
980980
tmpreg = READ_BIT((__HANDLE__)->Instance->WCR, DSI_WCR_DSIEN);\
981981
UNUSED(tmpreg); \
982982
} while(0U)
@@ -989,7 +989,7 @@ typedef void (*pDSI_CallbackTypeDef)(DSI_HandleTypeDef *hdsi); /*!< pointer to
989989
#define __HAL_DSI_WRAPPER_DISABLE(__HANDLE__) do { \
990990
__IO uint32_t tmpreg = 0x00U; \
991991
CLEAR_BIT((__HANDLE__)->Instance->WCR, DSI_WCR_DSIEN);\
992-
/* Delay after an DSI warpper disabling*/ \
992+
/* Delay after an DSI wrapper disabling*/ \
993993
tmpreg = READ_BIT((__HANDLE__)->Instance->WCR, DSI_WCR_DSIEN);\
994994
UNUSED(tmpreg); \
995995
} while(0U)
@@ -1271,10 +1271,10 @@ HAL_DSI_StateTypeDef HAL_DSI_GetState(DSI_HandleTypeDef *hdsi);
12711271
|| ((LooselyPacked) == DSI_LOOSELY_PACKED_DISABLE))
12721272
#define IS_DSI_DE_POLARITY(DataEnable) (((DataEnable) == DSI_DATA_ENABLE_ACTIVE_HIGH)\
12731273
|| ((DataEnable) == DSI_DATA_ENABLE_ACTIVE_LOW))
1274-
#define IS_DSI_VSYNC_POLARITY(VSYNC) (((VSYNC) == DSI_VSYNC_ACTIVE_HIGH)\
1275-
|| ((VSYNC) == DSI_VSYNC_ACTIVE_LOW))
1276-
#define IS_DSI_HSYNC_POLARITY(HSYNC) (((HSYNC) == DSI_HSYNC_ACTIVE_HIGH)\
1277-
|| ((HSYNC) == DSI_HSYNC_ACTIVE_LOW))
1274+
#define IS_DSI_VSYNC_POLARITY(Vsync) (((Vsync) == DSI_VSYNC_ACTIVE_HIGH)\
1275+
|| ((Vsync) == DSI_VSYNC_ACTIVE_LOW))
1276+
#define IS_DSI_HSYNC_POLARITY(Hsync) (((Hsync) == DSI_HSYNC_ACTIVE_HIGH)\
1277+
|| ((Hsync) == DSI_HSYNC_ACTIVE_LOW))
12781278
#define IS_DSI_VIDEO_MODE_TYPE(VideoModeType) (((VideoModeType) == DSI_VID_MODE_NB_PULSES) || \
12791279
((VideoModeType) == DSI_VID_MODE_NB_EVENTS) || \
12801280
((VideoModeType) == DSI_VID_MODE_BURST))

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_gpio_ex.h

+1
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,7 @@
783783
/**
784784
* @brief AF 14 selection
785785
*/
786+
#define GPIO_AF14_TIM2 ((uint8_t)0x0E) /* TIM2 Alternate Function mapping */
786787
#define GPIO_AF14_TIM15 ((uint8_t)0x0E) /* TIM15 Alternate Function mapping */
787788
#define GPIO_AF14_TIM16 ((uint8_t)0x0E) /* TIM16 Alternate Function mapping */
788789
#define GPIO_AF14_TIM17 ((uint8_t)0x0E) /* TIM17 Alternate Function mapping */

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_hcd.h

+16-7
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@ typedef struct
158158

159159
#define __HAL_HCD_GET_FLAG(__HANDLE__, __INTERRUPT__) ((USB_ReadInterrupts((__HANDLE__)->Instance)\
160160
& (__INTERRUPT__)) == (__INTERRUPT__))
161+
162+
#define __HAL_HCD_GET_CH_FLAG(__HANDLE__, __chnum__, __INTERRUPT__) \
163+
((USB_ReadChInterrupts((__HANDLE__)->Instance, (__chnum__)) & (__INTERRUPT__)) == (__INTERRUPT__))
164+
161165
#define __HAL_HCD_CLEAR_FLAG(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->GINTSTS) = (__INTERRUPT__))
162166
#define __HAL_HCD_IS_INVALID_INTERRUPT(__HANDLE__) (USB_ReadInterrupts((__HANDLE__)->Instance) == 0U)
163167

@@ -247,6 +251,11 @@ HAL_StatusTypeDef HAL_HCD_HC_SubmitRequest(HCD_HandleTypeDef *hhcd, uint8_t ch_n
247251
uint8_t token, uint8_t *pbuff,
248252
uint16_t length, uint8_t do_ping);
249253

254+
HAL_StatusTypeDef HAL_HCD_HC_SetHubInfo(HCD_HandleTypeDef *hhcd, uint8_t ch_num,
255+
uint8_t addr, uint8_t PortNbr);
256+
257+
HAL_StatusTypeDef HAL_HCD_HC_ClearHubInfo(HCD_HandleTypeDef *hhcd, uint8_t ch_num);
258+
250259
/* Non-Blocking mode: Interrupt */
251260
void HAL_HCD_IRQHandler(HCD_HandleTypeDef *hhcd);
252261
void HAL_HCD_SOF_Callback(HCD_HandleTypeDef *hhcd);
@@ -275,16 +284,13 @@ HAL_StatusTypeDef HAL_HCD_Stop(HCD_HandleTypeDef *hhcd);
275284
/** @addtogroup HCD_Exported_Functions_Group4 Peripheral State functions
276285
* @{
277286
*/
278-
HCD_StateTypeDef HAL_HCD_GetState(HCD_HandleTypeDef *hhcd);
279-
HCD_URBStateTypeDef HAL_HCD_HC_GetURBState(HCD_HandleTypeDef *hhcd, uint8_t chnum);
280-
HCD_HCStateTypeDef HAL_HCD_HC_GetState(HCD_HandleTypeDef *hhcd, uint8_t chnum);
281-
uint32_t HAL_HCD_HC_GetXferCount(HCD_HandleTypeDef *hhcd, uint8_t chnum);
287+
HCD_StateTypeDef HAL_HCD_GetState(HCD_HandleTypeDef const *hhcd);
288+
HCD_URBStateTypeDef HAL_HCD_HC_GetURBState(HCD_HandleTypeDef const *hhcd, uint8_t chnum);
289+
HCD_HCStateTypeDef HAL_HCD_HC_GetState(HCD_HandleTypeDef const *hhcd, uint8_t chnum);
290+
uint32_t HAL_HCD_HC_GetXferCount(HCD_HandleTypeDef const *hhcd, uint8_t chnum);
282291
uint32_t HAL_HCD_GetCurrentFrame(HCD_HandleTypeDef *hhcd);
283292
uint32_t HAL_HCD_GetCurrentSpeed(HCD_HandleTypeDef *hhcd);
284293

285-
/**
286-
* @}
287-
*/
288294

289295
/**
290296
* @}
@@ -305,6 +311,9 @@ uint32_t HAL_HCD_GetCurrentSpeed(HCD_HandleTypeDef *hhcd);
305311
/**
306312
* @}
307313
*/
314+
/**
315+
* @}
316+
*/
308317
#endif /* defined (USB_OTG_FS) */
309318

310319
#ifdef __cplusplus

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_i2c.h

+6-5
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ typedef struct __I2C_HandleTypeDef
207207

208208
DMA_HandleTypeDef *hdmarx; /*!< I2C Rx DMA handle parameters */
209209

210+
210211
HAL_LockTypeDef Lock; /*!< I2C locking object */
211212

212213
__IO HAL_I2C_StateTypeDef State; /*!< I2C communication state */
@@ -709,9 +710,9 @@ void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c);
709710
* @{
710711
*/
711712
/* Peripheral State, Mode and Error functions *********************************/
712-
HAL_I2C_StateTypeDef HAL_I2C_GetState(I2C_HandleTypeDef *hi2c);
713-
HAL_I2C_ModeTypeDef HAL_I2C_GetMode(I2C_HandleTypeDef *hi2c);
714-
uint32_t HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
713+
HAL_I2C_StateTypeDef HAL_I2C_GetState(const I2C_HandleTypeDef *hi2c);
714+
HAL_I2C_ModeTypeDef HAL_I2C_GetMode(const I2C_HandleTypeDef *hi2c);
715+
uint32_t HAL_I2C_GetError(const I2C_HandleTypeDef *hi2c);
715716

716717
/**
717718
* @}
@@ -804,8 +805,8 @@ uint32_t HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
804805
(I2C_CR2_START) | (I2C_CR2_AUTOEND)) & \
805806
(~I2C_CR2_RD_WRN)) : \
806807
(uint32_t)((((uint32_t)(__ADDRESS__) & (I2C_CR2_SADD)) | \
807-
(I2C_CR2_ADD10) | (I2C_CR2_START)) & \
808-
(~I2C_CR2_RD_WRN)))
808+
(I2C_CR2_ADD10) | (I2C_CR2_START) | \
809+
(I2C_CR2_AUTOEND)) & (~I2C_CR2_RD_WRN)))
809810

810811
#define I2C_CHECK_FLAG(__ISR__, __FLAG__) ((((__ISR__) & ((__FLAG__) & I2C_FLAG_MASK)) == \
811812
((__FLAG__) & I2C_FLAG_MASK)) ? SET : RESET)

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_irda_ex.h

+6-3
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,12 @@ extern "C" {
6969
* @param __CLOCKSOURCE__ output variable.
7070
* @retval IRDA clocking source, written in __CLOCKSOURCE__.
7171
*/
72-
#if defined (STM32L471xx) || defined (STM32L475xx) || defined (STM32L476xx) || defined (STM32L485xx) || defined (STM32L486xx) \
72+
#if defined (STM32L471xx) || defined (STM32L475xx) || defined (STM32L476xx) \
73+
|| defined (STM32L485xx) || defined (STM32L486xx) \
7374
|| defined (STM32L496xx) || defined (STM32L4A6xx) \
7475
|| defined (STM32L4P5xx) || defined (STM32L4Q5xx) \
75-
|| defined (STM32L4R5xx) || defined (STM32L4R7xx) || defined (STM32L4R9xx) || defined (STM32L4S5xx) || defined (STM32L4S7xx) || defined (STM32L4S9xx)
76+
|| defined (STM32L4R5xx) || defined (STM32L4R7xx) \
77+
|| defined (STM32L4R9xx) || defined (STM32L4S5xx) || defined (STM32L4S7xx) || defined (STM32L4S9xx)
7678
#define IRDA_GETCLOCKSOURCE(__HANDLE__,__CLOCKSOURCE__) \
7779
do { \
7880
if((__HANDLE__)->Instance == USART1) \
@@ -185,7 +187,8 @@ extern "C" {
185187
(__CLOCKSOURCE__) = IRDA_CLOCKSOURCE_UNDEFINED; \
186188
} \
187189
} while(0)
188-
#elif defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32L431xx) || defined (STM32L433xx) || defined (STM32L443xx)
190+
#elif defined(STM32L412xx) || defined(STM32L422xx) \
191+
|| defined(STM32L431xx) || defined(STM32L433xx) || defined(STM32L443xx)
189192
#define IRDA_GETCLOCKSOURCE(__HANDLE__,__CLOCKSOURCE__) \
190193
do { \
191194
if((__HANDLE__)->Instance == USART1) \

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_lptim.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ HAL_StatusTypeDef HAL_LPTIM_UnRegisterCallback(LPTIM_HandleTypeDef *lphtim, HAL_
771771
* @{
772772
*/
773773
/* Peripheral State functions ************************************************/
774-
HAL_LPTIM_StateTypeDef HAL_LPTIM_GetState(LPTIM_HandleTypeDef *hlptim);
774+
HAL_LPTIM_StateTypeDef HAL_LPTIM_GetState(const LPTIM_HandleTypeDef *hlptim);
775775
/**
776776
* @}
777777
*/

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal_ltdc.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -346,14 +346,14 @@ typedef void (*pLTDC_CallbackTypeDef)(LTDC_HandleTypeDef *hltdc); /*!< pointer
346346
/** @defgroup LTDC_Pixelformat LTDC Pixel format
347347
* @{
348348
*/
349-
#define LTDC_PIXEL_FORMAT_ARGB8888 0x00000000U /*!< ARGB8888 LTDC pixel format */
350-
#define LTDC_PIXEL_FORMAT_RGB888 0x00000001U /*!< RGB888 LTDC pixel format */
351-
#define LTDC_PIXEL_FORMAT_RGB565 0x00000002U /*!< RGB565 LTDC pixel format */
352-
#define LTDC_PIXEL_FORMAT_ARGB1555 0x00000003U /*!< ARGB1555 LTDC pixel format */
353-
#define LTDC_PIXEL_FORMAT_ARGB4444 0x00000004U /*!< ARGB4444 LTDC pixel format */
354-
#define LTDC_PIXEL_FORMAT_L8 0x00000005U /*!< L8 LTDC pixel format */
355-
#define LTDC_PIXEL_FORMAT_AL44 0x00000006U /*!< AL44 LTDC pixel format */
356-
#define LTDC_PIXEL_FORMAT_AL88 0x00000007U /*!< AL88 LTDC pixel format */
349+
#define LTDC_PIXEL_FORMAT_ARGB8888 0x00000000U /*!< ARGB8888 LTDC pixel format */
350+
#define LTDC_PIXEL_FORMAT_RGB888 0x00000001U /*!< RGB888 LTDC pixel format */
351+
#define LTDC_PIXEL_FORMAT_RGB565 0x00000002U /*!< RGB565 LTDC pixel format */
352+
#define LTDC_PIXEL_FORMAT_ARGB1555 0x00000003U /*!< ARGB1555 LTDC pixel format */
353+
#define LTDC_PIXEL_FORMAT_ARGB4444 0x00000004U /*!< ARGB4444 LTDC pixel format */
354+
#define LTDC_PIXEL_FORMAT_L8 0x00000005U /*!< L8 LTDC pixel format */
355+
#define LTDC_PIXEL_FORMAT_AL44 0x00000006U /*!< AL44 LTDC pixel format */
356+
#define LTDC_PIXEL_FORMAT_AL88 0x00000007U /*!< AL88 LTDC pixel format */
357357
/**
358358
* @}
359359
*/

0 commit comments

Comments
 (0)