Skip to content

Commit ccb361d

Browse files
fpistmfpistm
committed
F1: update STM32F1xx HAL Drivers to v1.1.8
Included in STM32CubeF1 FW v1.8.4 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 626ede3 commit ccb361d

File tree

73 files changed

+3645
-1839
lines changed

Some content is hidden

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

73 files changed

+3645
-1839
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3251,7 +3251,7 @@
32513251
#define RCC_MCOSOURCE_PLLCLK_NODIV RCC_MCO1SOURCE_PLLCLK
32523252
#define RCC_MCOSOURCE_PLLCLK_DIV2 RCC_MCO1SOURCE_PLLCLK_DIV2
32533253

3254-
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5)
3254+
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || defined(STM32WL)
32553255
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
32563256
#else
32573257
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
@@ -3380,7 +3380,7 @@
33803380
/** @defgroup HAL_RTC_Aliased_Macros HAL RTC Aliased Macros maintained for legacy purpose
33813381
* @{
33823382
*/
3383-
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32L4P5xx) || defined (STM32L4Q5xx) || defined (STM32G4)
3383+
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32L4P5xx) || defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL)
33843384
#else
33853385
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
33863386
#endif

‎system/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
/* Includes ------------------------------------------------------------------*/
3030
#include "stm32f1xx_hal_def.h"
31+
3132
/** @addtogroup STM32F1xx_HAL_Driver
3233
* @{
3334
*/

‎system/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_can.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ typedef enum
255255
HAL_CAN_RX_FIFO1_MSG_PENDING_CB_ID = 0x08U, /*!< CAN Rx FIFO 1 message pending callback ID */
256256
HAL_CAN_RX_FIFO1_FULL_CB_ID = 0x09U, /*!< CAN Rx FIFO 1 full callback ID */
257257
HAL_CAN_SLEEP_CB_ID = 0x0AU, /*!< CAN Sleep callback ID */
258-
HAL_CAN_WAKEUP_FROM_RX_MSG_CB_ID = 0x0BU, /*!< CAN Wake Up fropm Rx msg callback ID */
258+
HAL_CAN_WAKEUP_FROM_RX_MSG_CB_ID = 0x0BU, /*!< CAN Wake Up from Rx msg callback ID */
259259
HAL_CAN_ERROR_CB_ID = 0x0CU, /*!< CAN Error callback ID */
260260

261261
HAL_CAN_MSPINIT_CB_ID = 0x0DU, /*!< CAN MspInit callback ID */
@@ -295,11 +295,11 @@ typedef void (*pCAN_CallbackTypeDef)(CAN_HandleTypeDef *hcan); /*!< pointer to
295295
#define HAL_CAN_ERROR_RX_FOV0 (0x00000200U) /*!< Rx FIFO0 overrun error */
296296
#define HAL_CAN_ERROR_RX_FOV1 (0x00000400U) /*!< Rx FIFO1 overrun error */
297297
#define HAL_CAN_ERROR_TX_ALST0 (0x00000800U) /*!< TxMailbox 0 transmit failure due to arbitration lost */
298-
#define HAL_CAN_ERROR_TX_TERR0 (0x00001000U) /*!< TxMailbox 1 transmit failure due to transmit error */
299-
#define HAL_CAN_ERROR_TX_ALST1 (0x00002000U) /*!< TxMailbox 0 transmit failure due to arbitration lost */
298+
#define HAL_CAN_ERROR_TX_TERR0 (0x00001000U) /*!< TxMailbox 0 transmit failure due to transmit error */
299+
#define HAL_CAN_ERROR_TX_ALST1 (0x00002000U) /*!< TxMailbox 1 transmit failure due to arbitration lost */
300300
#define HAL_CAN_ERROR_TX_TERR1 (0x00004000U) /*!< TxMailbox 1 transmit failure due to transmit error */
301-
#define HAL_CAN_ERROR_TX_ALST2 (0x00008000U) /*!< TxMailbox 0 transmit failure due to arbitration lost */
302-
#define HAL_CAN_ERROR_TX_TERR2 (0x00010000U) /*!< TxMailbox 1 transmit failure due to transmit error */
301+
#define HAL_CAN_ERROR_TX_ALST2 (0x00008000U) /*!< TxMailbox 2 transmit failure due to arbitration lost */
302+
#define HAL_CAN_ERROR_TX_TERR2 (0x00010000U) /*!< TxMailbox 2 transmit failure due to transmit error */
303303
#define HAL_CAN_ERROR_TIMEOUT (0x00020000U) /*!< Timeout error */
304304
#define HAL_CAN_ERROR_NOT_INITIALIZED (0x00040000U) /*!< Peripheral not initialized */
305305
#define HAL_CAN_ERROR_NOT_READY (0x00080000U) /*!< Peripheral not ready */

‎system/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac.h

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ typedef enum
6464
typedef struct __DAC_HandleTypeDef
6565
#else
6666
typedef struct
67-
#endif
67+
#endif /* USE_HAL_DAC_REGISTER_CALLBACKS */
6868
{
6969
DAC_TypeDef *Instance; /*!< Register base address */
7070

@@ -83,18 +83,19 @@ typedef struct
8383
void (* ConvHalfCpltCallbackCh1) (struct __DAC_HandleTypeDef *hdac);
8484
void (* ErrorCallbackCh1) (struct __DAC_HandleTypeDef *hdac);
8585
void (* DMAUnderrunCallbackCh1) (struct __DAC_HandleTypeDef *hdac);
86+
8687
void (* ConvCpltCallbackCh2) (struct __DAC_HandleTypeDef *hdac);
8788
void (* ConvHalfCpltCallbackCh2) (struct __DAC_HandleTypeDef *hdac);
8889
void (* ErrorCallbackCh2) (struct __DAC_HandleTypeDef *hdac);
8990
void (* DMAUnderrunCallbackCh2) (struct __DAC_HandleTypeDef *hdac);
9091

92+
9193
void (* MspInitCallback) (struct __DAC_HandleTypeDef *hdac);
92-
void (* MspDeInitCallback ) (struct __DAC_HandleTypeDef *hdac);
94+
void (* MspDeInitCallback) (struct __DAC_HandleTypeDef *hdac);
9395
#endif /* USE_HAL_DAC_REGISTER_CALLBACKS */
9496

9597
} DAC_HandleTypeDef;
9698

97-
9899
/**
99100
* @brief DAC Configuration regular Channel structure definition
100101
*/
@@ -118,10 +119,12 @@ typedef enum
118119
HAL_DAC_CH1_HALF_COMPLETE_CB_ID = 0x01U, /*!< DAC CH1 half Complete Callback ID */
119120
HAL_DAC_CH1_ERROR_ID = 0x02U, /*!< DAC CH1 error Callback ID */
120121
HAL_DAC_CH1_UNDERRUN_CB_ID = 0x03U, /*!< DAC CH1 underrun Callback ID */
122+
121123
HAL_DAC_CH2_COMPLETE_CB_ID = 0x04U, /*!< DAC CH2 Complete Callback ID */
122124
HAL_DAC_CH2_HALF_COMPLETE_CB_ID = 0x05U, /*!< DAC CH2 half Complete Callback ID */
123125
HAL_DAC_CH2_ERROR_ID = 0x06U, /*!< DAC CH2 error Callback ID */
124126
HAL_DAC_CH2_UNDERRUN_CB_ID = 0x07U, /*!< DAC CH2 underrun Callback ID */
127+
125128
HAL_DAC_MSPINIT_CB_ID = 0x08U, /*!< DAC MspInit Callback ID */
126129
HAL_DAC_MSPDEINIT_CB_ID = 0x09U, /*!< DAC MspDeInit Callback ID */
127130
HAL_DAC_ALL_CB_ID = 0x0AU /*!< DAC All ID */
@@ -173,7 +176,9 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
173176
* @{
174177
*/
175178
#define DAC_CHANNEL_1 0x00000000U
179+
176180
#define DAC_CHANNEL_2 0x00000010U
181+
177182
/**
178183
* @}
179184
*/
@@ -193,8 +198,10 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
193198
* @{
194199
*/
195200
#define DAC_FLAG_DMAUDR1 (DAC_SR_DMAUDR1)
201+
196202
#define DAC_FLAG_DMAUDR2 (DAC_SR_DMAUDR2)
197203

204+
198205
/**
199206
* @}
200207
*/
@@ -203,8 +210,10 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
203210
* @{
204211
*/
205212
#define DAC_IT_DMAUDR1 (DAC_SR_DMAUDR1)
213+
206214
#define DAC_IT_DMAUDR2 (DAC_SR_DMAUDR2)
207215

216+
208217
/**
209218
* @}
210219
*/
@@ -253,26 +262,28 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
253262
* @param __ALIGNMENT__ specifies the DAC alignment
254263
* @retval None
255264
*/
256-
#define DAC_DHR12R1_ALIGNMENT(__ALIGNMENT__) (0x00000008U + (__ALIGNMENT__))
265+
#define DAC_DHR12R1_ALIGNMENT(__ALIGNMENT__) (0x00000008UL + (__ALIGNMENT__))
266+
257267

258268
/** @brief Set DHR12R2 alignment.
259269
* @param __ALIGNMENT__ specifies the DAC alignment
260270
* @retval None
261271
*/
262-
#define DAC_DHR12R2_ALIGNMENT(__ALIGNMENT__) (0x00000014U + (__ALIGNMENT__))
272+
#define DAC_DHR12R2_ALIGNMENT(__ALIGNMENT__) (0x00000014UL + (__ALIGNMENT__))
273+
263274

264275
/** @brief Set DHR12RD alignment.
265276
* @param __ALIGNMENT__ specifies the DAC alignment
266277
* @retval None
267278
*/
268-
#define DAC_DHR12RD_ALIGNMENT(__ALIGNMENT__) (0x00000020U + (__ALIGNMENT__))
279+
#define DAC_DHR12RD_ALIGNMENT(__ALIGNMENT__) (0x00000020UL + (__ALIGNMENT__))
269280

270281
/** @brief Enable the DAC interrupt.
271282
* @param __HANDLE__ specifies the DAC handle
272283
* @param __INTERRUPT__ specifies the DAC interrupt.
273284
* This parameter can be any combination of the following values:
274-
* @arg DAC_IT_DMAUDR1: DAC channel 1 DMA underrun interrupt
275-
* @arg DAC_IT_DMAUDR2: DAC channel 2 DMA underrun interrupt
285+
* @arg DAC_IT_DMAUDR1 DAC channel 1 DMA underrun interrupt
286+
* @arg DAC_IT_DMAUDR2 DAC channel 2 DMA underrun interrupt
276287
* @retval None
277288
*/
278289
#define __HAL_DAC_ENABLE_IT(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->CR) |= (__INTERRUPT__))
@@ -281,8 +292,8 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
281292
* @param __HANDLE__ specifies the DAC handle
282293
* @param __INTERRUPT__ specifies the DAC interrupt.
283294
* This parameter can be any combination of the following values:
284-
* @arg DAC_IT_DMAUDR1: DAC channel 1 DMA underrun interrupt
285-
* @arg DAC_IT_DMAUDR2: DAC channel 2 DMA underrun interrupt
295+
* @arg DAC_IT_DMAUDR1 DAC channel 1 DMA underrun interrupt
296+
* @arg DAC_IT_DMAUDR2 DAC channel 2 DMA underrun interrupt
286297
* @retval None
287298
*/
288299
#define __HAL_DAC_DISABLE_IT(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->CR) &= ~(__INTERRUPT__))
@@ -291,18 +302,19 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
291302
* @param __HANDLE__ DAC handle
292303
* @param __INTERRUPT__ DAC interrupt source to check
293304
* This parameter can be any combination of the following values:
294-
* @arg DAC_IT_DMAUDR1: DAC channel 1 DMA underrun interrupt
295-
* @arg DAC_IT_DMAUDR2: DAC channel 2 DMA underrun interrupt
305+
* @arg DAC_IT_DMAUDR1 DAC channel 1 DMA underrun interrupt
306+
* @arg DAC_IT_DMAUDR2 DAC channel 2 DMA underrun interrupt
296307
* @retval State of interruption (SET or RESET)
297308
*/
298-
#define __HAL_DAC_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->CR & (__INTERRUPT__)) == (__INTERRUPT__))
309+
#define __HAL_DAC_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->CR\
310+
& (__INTERRUPT__)) == (__INTERRUPT__))
299311

300312
/** @brief Get the selected DAC's flag status.
301313
* @param __HANDLE__ specifies the DAC handle.
302314
* @param __FLAG__ specifies the DAC flag to get.
303315
* This parameter can be any combination of the following values:
304-
* @arg DAC_FLAG_DMAUDR1: DAC channel 1 DMA underrun flag
305-
* @arg DAC_FLAG_DMAUDR2: DAC channel 2 DMA underrun flag
316+
* @arg DAC_FLAG_DMAUDR1 DAC channel 1 DMA underrun flag
317+
* @arg DAC_FLAG_DMAUDR2 DAC channel 2 DMA underrun flag
306318
* @retval None
307319
*/
308320
#define __HAL_DAC_GET_FLAG(__HANDLE__, __FLAG__) ((((__HANDLE__)->Instance->SR) & (__FLAG__)) == (__FLAG__))
@@ -311,8 +323,8 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
311323
* @param __HANDLE__ specifies the DAC handle.
312324
* @param __FLAG__ specifies the DAC flag to clear.
313325
* This parameter can be any combination of the following values:
314-
* @arg DAC_FLAG_DMAUDR1: DAC channel 1 DMA underrun flag
315-
* @arg DAC_FLAG_DMAUDR2: DAC channel 2 DMA underrun flag
326+
* @arg DAC_FLAG_DMAUDR1 DAC channel 1 DMA underrun flag
327+
* @arg DAC_FLAG_DMAUDR2 DAC channel 2 DMA underrun flag
316328
* @retval None
317329
*/
318330
#define __HAL_DAC_CLEAR_FLAG(__HANDLE__, __FLAG__) (((__HANDLE__)->Instance->SR) = (__FLAG__))
@@ -336,7 +348,7 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
336348
((ALIGN) == DAC_ALIGN_12B_L) || \
337349
((ALIGN) == DAC_ALIGN_8B_R))
338350

339-
#define IS_DAC_DATA(DATA) ((DATA) <= 0xFFF0U)
351+
#define IS_DAC_DATA(DATA) ((DATA) <= 0xFFF0UL)
340352

341353
/**
342354
* @}
@@ -373,9 +385,7 @@ HAL_StatusTypeDef HAL_DAC_Stop(DAC_HandleTypeDef *hdac, uint32_t Channel);
373385
HAL_StatusTypeDef HAL_DAC_Start_DMA(DAC_HandleTypeDef *hdac, uint32_t Channel, uint32_t *pData, uint32_t Length,
374386
uint32_t Alignment);
375387
HAL_StatusTypeDef HAL_DAC_Stop_DMA(DAC_HandleTypeDef *hdac, uint32_t Channel);
376-
377388
void HAL_DAC_IRQHandler(DAC_HandleTypeDef *hdac);
378-
379389
HAL_StatusTypeDef HAL_DAC_SetValue(DAC_HandleTypeDef *hdac, uint32_t Channel, uint32_t Alignment, uint32_t Data);
380390

381391
void HAL_DAC_ConvCpltCallbackCh1(DAC_HandleTypeDef *hdac);
@@ -399,7 +409,6 @@ HAL_StatusTypeDef HAL_DAC_UnRegisterCallback(DAC_HandleTypeDef *hdac, HAL_DA
399409
*/
400410
/* Peripheral Control functions ***********************************************/
401411
uint32_t HAL_DAC_GetValue(DAC_HandleTypeDef *hdac, uint32_t Channel);
402-
403412
HAL_StatusTypeDef HAL_DAC_ConfigChannel(DAC_HandleTypeDef *hdac, DAC_ChannelConfTypeDef *sConfig, uint32_t Channel);
404413
/**
405414
* @}
@@ -445,7 +454,6 @@ void DAC_DMAHalfConvCpltCh1(DMA_HandleTypeDef *hdma);
445454
#endif
446455

447456

448-
#endif /*STM32F1xx_HAL_DAC_H */
457+
#endif /* STM32F1xx_HAL_DAC_H */
449458

450459
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
451-

‎system/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac_ex.h

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ extern "C" {
5353
/** @defgroup DACEx_lfsrunmask_triangleamplitude DACEx lfsrunmask triangle amplitude
5454
* @{
5555
*/
56-
#define DAC_LFSRUNMASK_BIT0 0x00000000U /*!< Unmask DAC channel LFSR bit0 for noise wave generation */
56+
#define DAC_LFSRUNMASK_BIT0 0x00000000UL /*!< Unmask DAC channel LFSR bit0 for noise wave generation */
5757
#define DAC_LFSRUNMASK_BITS1_0 ( DAC_CR_MAMP1_0) /*!< Unmask DAC channel LFSR bit[1:0] for noise wave generation */
5858
#define DAC_LFSRUNMASK_BITS2_0 ( DAC_CR_MAMP1_1 ) /*!< Unmask DAC channel LFSR bit[2:0] for noise wave generation */
5959
#define DAC_LFSRUNMASK_BITS3_0 ( DAC_CR_MAMP1_1 | DAC_CR_MAMP1_0) /*!< Unmask DAC channel LFSR bit[3:0] for noise wave generation */
@@ -65,7 +65,7 @@ extern "C" {
6565
#define DAC_LFSRUNMASK_BITS9_0 (DAC_CR_MAMP1_3 | DAC_CR_MAMP1_0) /*!< Unmask DAC channel LFSR bit[9:0] for noise wave generation */
6666
#define DAC_LFSRUNMASK_BITS10_0 (DAC_CR_MAMP1_3 | DAC_CR_MAMP1_1 ) /*!< Unmask DAC channel LFSR bit[10:0] for noise wave generation */
6767
#define DAC_LFSRUNMASK_BITS11_0 (DAC_CR_MAMP1_3 | DAC_CR_MAMP1_1 | DAC_CR_MAMP1_0) /*!< Unmask DAC channel LFSR bit[11:0] for noise wave generation */
68-
#define DAC_TRIANGLEAMPLITUDE_1 0x00000000U /*!< Select max triangle amplitude of 1 */
68+
#define DAC_TRIANGLEAMPLITUDE_1 0x00000000UL /*!< Select max triangle amplitude of 1 */
6969
#define DAC_TRIANGLEAMPLITUDE_3 ( DAC_CR_MAMP1_0) /*!< Select max triangle amplitude of 3 */
7070
#define DAC_TRIANGLEAMPLITUDE_7 ( DAC_CR_MAMP1_1 ) /*!< Select max triangle amplitude of 7 */
7171
#define DAC_TRIANGLEAMPLITUDE_15 ( DAC_CR_MAMP1_1 | DAC_CR_MAMP1_0) /*!< Select max triangle amplitude of 15 */
@@ -145,7 +145,6 @@ extern "C" {
145145
/** @defgroup DACEx_Private_Macros DACEx Private Macros
146146
* @{
147147
*/
148-
149148
#if defined (STM32F101xE) || defined (STM32F101xG) || defined (STM32F103xE) || defined (STM32F103xG)
150149
#define IS_DAC_TRIGGER(TRIGGER) (((TRIGGER) == DAC_TRIGGER_NONE) || \
151150
((TRIGGER) == DAC_TRIGGER_T6_TRGO) || \
@@ -223,6 +222,8 @@ extern "C" {
223222
HAL_StatusTypeDef HAL_DACEx_TriangleWaveGenerate(DAC_HandleTypeDef *hdac, uint32_t Channel, uint32_t Amplitude);
224223
HAL_StatusTypeDef HAL_DACEx_NoiseWaveGenerate(DAC_HandleTypeDef *hdac, uint32_t Channel, uint32_t Amplitude);
225224

225+
HAL_StatusTypeDef HAL_DACEx_DualStart(DAC_HandleTypeDef *hdac);
226+
HAL_StatusTypeDef HAL_DACEx_DualStop(DAC_HandleTypeDef *hdac);
226227
HAL_StatusTypeDef HAL_DACEx_DualSetValue(DAC_HandleTypeDef *hdac, uint32_t Alignment, uint32_t Data1, uint32_t Data2);
227228
uint32_t HAL_DACEx_DualGetValue(DAC_HandleTypeDef *hdac);
228229

@@ -240,6 +241,10 @@ void HAL_DACEx_DMAUnderrunCallbackCh2(DAC_HandleTypeDef *hdac);
240241
* @}
241242
*/
242243

244+
/**
245+
* @}
246+
*/
247+
243248
/** @addtogroup DACEx_Private_Functions
244249
* @{
245250
*/
@@ -258,10 +263,6 @@ void DAC_DMAHalfConvCpltCh2(DMA_HandleTypeDef *hdma);
258263
* @}
259264
*/
260265

261-
/**
262-
* @}
263-
*/
264-
265266
#endif /* DAC */
266267

267268
/**
@@ -272,6 +273,6 @@ void DAC_DMAHalfConvCpltCh2(DMA_HandleTypeDef *hdma);
272273
}
273274
#endif
274275

275-
#endif /*STM32F1xx_HAL_DAC_EX_H */
276+
#endif /* STM32F1xx_HAL_DAC_EX_H */
276277

277278
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

‎system/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -217,19 +217,19 @@ typedef struct
217217
/** @defgroup EXTI_Private_Macros EXTI Private Macros
218218
* @{
219219
*/
220-
#define IS_EXTI_LINE(__LINE__) ((((__LINE__) & ~(EXTI_PROPERTY_MASK | EXTI_PIN_MASK)) == 0x00u) && \
221-
((((__LINE__) & EXTI_PROPERTY_MASK) == EXTI_CONFIG) || \
222-
(((__LINE__) & EXTI_PROPERTY_MASK) == EXTI_GPIO)) && \
223-
(((__LINE__) & EXTI_PIN_MASK) < EXTI_LINE_NB))
220+
#define IS_EXTI_LINE(__EXTI_LINE__) ((((__EXTI_LINE__) & ~(EXTI_PROPERTY_MASK | EXTI_PIN_MASK)) == 0x00u) && \
221+
((((__EXTI_LINE__) & EXTI_PROPERTY_MASK) == EXTI_CONFIG) || \
222+
(((__EXTI_LINE__) & EXTI_PROPERTY_MASK) == EXTI_GPIO)) && \
223+
(((__EXTI_LINE__) & EXTI_PIN_MASK) < EXTI_LINE_NB))
224224

225-
#define IS_EXTI_MODE(__LINE__) ((((__LINE__) & EXTI_MODE_MASK) != 0x00u) && \
226-
(((__LINE__) & ~EXTI_MODE_MASK) == 0x00u))
225+
#define IS_EXTI_MODE(__EXTI_LINE__) ((((__EXTI_LINE__) & EXTI_MODE_MASK) != 0x00u) && \
226+
(((__EXTI_LINE__) & ~EXTI_MODE_MASK) == 0x00u))
227227

228-
#define IS_EXTI_TRIGGER(__LINE__) (((__LINE__) & ~EXTI_TRIGGER_MASK) == 0x00u)
228+
#define IS_EXTI_TRIGGER(__EXTI_LINE__) (((__EXTI_LINE__) & ~EXTI_TRIGGER_MASK) == 0x00u)
229229

230-
#define IS_EXTI_PENDING_EDGE(__LINE__) ((__LINE__) == EXTI_TRIGGER_RISING_FALLING)
230+
#define IS_EXTI_PENDING_EDGE(__EXTI_LINE__) ((__EXTI_LINE__) == EXTI_TRIGGER_RISING_FALLING)
231231

232-
#define IS_EXTI_CONFIG_LINE(__LINE__) (((__LINE__) & EXTI_CONFIG) != 0x00u)
232+
#define IS_EXTI_CONFIG_LINE(__EXTI_LINE__) (((__EXTI_LINE__) & EXTI_CONFIG) != 0x00u)
233233

234234
#if defined (GPIOG)
235235
#define IS_EXTI_GPIO_PORT(__PORT__) (((__PORT__) == EXTI_GPIOA) || \

‎system/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_hcd.h

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,16 @@ typedef struct
110110
*/
111111
#define HCD_SPEED_FULL USBH_FSLS_SPEED
112112
#define HCD_SPEED_LOW USBH_FSLS_SPEED
113+
/**
114+
* @}
115+
*/
113116

117+
/** @defgroup HCD_Device_Speed HCD Device Speed
118+
* @{
119+
*/
120+
#define HCD_DEVICE_SPEED_HIGH 0U
121+
#define HCD_DEVICE_SPEED_FULL 1U
122+
#define HCD_DEVICE_SPEED_LOW 2U
114123
/**
115124
* @}
116125
*/
@@ -148,7 +157,8 @@ typedef struct
148157
#define __HAL_HCD_ENABLE(__HANDLE__) (void)USB_EnableGlobalInt ((__HANDLE__)->Instance)
149158
#define __HAL_HCD_DISABLE(__HANDLE__) (void)USB_DisableGlobalInt ((__HANDLE__)->Instance)
150159

151-
#define __HAL_HCD_GET_FLAG(__HANDLE__, __INTERRUPT__) ((USB_ReadInterrupts((__HANDLE__)->Instance) & (__INTERRUPT__)) == (__INTERRUPT__))
160+
#define __HAL_HCD_GET_FLAG(__HANDLE__, __INTERRUPT__) ((USB_ReadInterrupts((__HANDLE__)->Instance)\
161+
& (__INTERRUPT__)) == (__INTERRUPT__))
152162
#define __HAL_HCD_CLEAR_FLAG(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->GINTSTS) = (__INTERRUPT__))
153163
#define __HAL_HCD_IS_INVALID_INTERRUPT(__HANDLE__) (USB_ReadInterrupts((__HANDLE__)->Instance) == 0U)
154164

@@ -291,10 +301,10 @@ uint32_t HAL_HCD_GetCurrentSpeed(HCD_HandleTypeDef *hhcd);
291301
*/
292302
/* Private functions prototypes ----------------------------------------------*/
293303

294-
/**
304+
/**
295305
* @}
296306
*/
297-
/**
307+
/**
298308
* @}
299309
*/
300310
#endif /* defined (USB_OTG_FS) */

0 commit comments

Comments
 (0)