Skip to content

Commit 0897fb9

Browse files
fpistmfpistm
committed
F2: update STM32F2xx HAL Drivers to v1.2.7
Included in STM32CubeF2 FW v1.9.3 Signed-off-by: Frederic Pillon <[email protected]>
1 parent 7653437 commit 0897fb9

File tree

76 files changed

+3635
-1997
lines changed

Some content is hidden

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

76 files changed

+3635
-1997
lines changed

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

+112-107
Large diffs are not rendered by default.

‎system/Drivers/STM32F2xx_HAL_Driver/Inc/stm32f2xx_hal_can.h

+5-5
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/STM32F2xx_HAL_Driver/Inc/stm32f2xx_hal_dac.h

+33-25
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 */
@@ -162,13 +165,13 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
162165
/** @defgroup DAC_trigger_selection DAC trigger selection
163166
* @{
164167
*/
165-
#define DAC_TRIGGER_NONE 0x00000000U /*!< Conversion is automatic once the DAC1_DHRxxxx register has been loaded, and not by external trigger */
168+
#define DAC_TRIGGER_NONE 0x00000000UL /*!< Conversion is automatic once the DAC1_DHRxxxx register has been loaded, and not by external trigger */
166169
#define DAC_TRIGGER_T2_TRGO (DAC_CR_TSEL1_2 | DAC_CR_TEN1) /*!< TIM2 TRGO selected as external conversion trigger for DAC channel */
167170
#define DAC_TRIGGER_T4_TRGO (DAC_CR_TSEL1_2 | DAC_CR_TSEL1_0 | DAC_CR_TEN1) /*!< TIM4 TRGO selected as external conversion trigger for DAC channel */
168171
#define DAC_TRIGGER_T5_TRGO ( DAC_CR_TSEL1_1 | DAC_CR_TSEL1_0 | DAC_CR_TEN1) /*!< TIM3 TRGO selected as external conversion trigger for DAC channel */
169172
#define DAC_TRIGGER_T6_TRGO ( DAC_CR_TEN1) /*!< Conversion started by software trigger for DAC channel */
170173
#define DAC_TRIGGER_T7_TRGO ( DAC_CR_TSEL1_1 | DAC_CR_TEN1) /*!< TIM7 TRGO selected as external conversion trigger for DAC channel */
171-
#define DAC_TRIGGER_T8_TRGO ( DAC_CR_TSEL1_0 | DAC_CR_TEN1) /*!< TIM8 TRGO selected as external conversion trigger for DAC channel */
174+
#define DAC_TRIGGER_T8_TRGO ( DAC_CR_TSEL1_0 | DAC_CR_TEN1) /*!< TIM8 TRGO selected as external conversion trigger for DAC channel */
172175
#define DAC_TRIGGER_EXT_IT9 (DAC_CR_TSEL1_2 | DAC_CR_TSEL1_1 | DAC_CR_TEN1) /*!< EXTI Line9 event selected as external conversion trigger for DAC channel */
173176
#define DAC_TRIGGER_SOFTWARE (DAC_CR_TSEL1 | DAC_CR_TEN1) /*!< Conversion started by software trigger for DAC channel */
174177

@@ -190,7 +193,9 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
190193
* @{
191194
*/
192195
#define DAC_CHANNEL_1 0x00000000U
196+
193197
#define DAC_CHANNEL_2 0x00000010U
198+
194199
/**
195200
* @}
196201
*/
@@ -210,8 +215,10 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
210215
* @{
211216
*/
212217
#define DAC_FLAG_DMAUDR1 (DAC_SR_DMAUDR1)
218+
213219
#define DAC_FLAG_DMAUDR2 (DAC_SR_DMAUDR2)
214220

221+
215222
/**
216223
* @}
217224
*/
@@ -220,8 +227,10 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
220227
* @{
221228
*/
222229
#define DAC_IT_DMAUDR1 (DAC_SR_DMAUDR1)
230+
223231
#define DAC_IT_DMAUDR2 (DAC_SR_DMAUDR2)
224232

233+
225234
/**
226235
* @}
227236
*/
@@ -270,26 +279,28 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
270279
* @param __ALIGNMENT__ specifies the DAC alignment
271280
* @retval None
272281
*/
273-
#define DAC_DHR12R1_ALIGNMENT(__ALIGNMENT__) (0x00000008U + (__ALIGNMENT__))
282+
#define DAC_DHR12R1_ALIGNMENT(__ALIGNMENT__) (0x00000008UL + (__ALIGNMENT__))
283+
274284

275285
/** @brief Set DHR12R2 alignment.
276286
* @param __ALIGNMENT__ specifies the DAC alignment
277287
* @retval None
278288
*/
279-
#define DAC_DHR12R2_ALIGNMENT(__ALIGNMENT__) (0x00000014U + (__ALIGNMENT__))
289+
#define DAC_DHR12R2_ALIGNMENT(__ALIGNMENT__) (0x00000014UL + (__ALIGNMENT__))
290+
280291

281292
/** @brief Set DHR12RD alignment.
282293
* @param __ALIGNMENT__ specifies the DAC alignment
283294
* @retval None
284295
*/
285-
#define DAC_DHR12RD_ALIGNMENT(__ALIGNMENT__) (0x00000020U + (__ALIGNMENT__))
296+
#define DAC_DHR12RD_ALIGNMENT(__ALIGNMENT__) (0x00000020UL + (__ALIGNMENT__))
286297

287298
/** @brief Enable the DAC interrupt.
288299
* @param __HANDLE__ specifies the DAC handle
289300
* @param __INTERRUPT__ specifies the DAC interrupt.
290301
* This parameter can be any combination of the following values:
291-
* @arg DAC_IT_DMAUDR1: DAC channel 1 DMA underrun interrupt
292-
* @arg DAC_IT_DMAUDR2: DAC channel 2 DMA underrun interrupt
302+
* @arg DAC_IT_DMAUDR1 DAC channel 1 DMA underrun interrupt
303+
* @arg DAC_IT_DMAUDR2 DAC channel 2 DMA underrun interrupt
293304
* @retval None
294305
*/
295306
#define __HAL_DAC_ENABLE_IT(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->CR) |= (__INTERRUPT__))
@@ -298,8 +309,8 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
298309
* @param __HANDLE__ specifies the DAC handle
299310
* @param __INTERRUPT__ specifies the DAC interrupt.
300311
* This parameter can be any combination of the following values:
301-
* @arg DAC_IT_DMAUDR1: DAC channel 1 DMA underrun interrupt
302-
* @arg DAC_IT_DMAUDR2: DAC channel 2 DMA underrun interrupt
312+
* @arg DAC_IT_DMAUDR1 DAC channel 1 DMA underrun interrupt
313+
* @arg DAC_IT_DMAUDR2 DAC channel 2 DMA underrun interrupt
303314
* @retval None
304315
*/
305316
#define __HAL_DAC_DISABLE_IT(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->CR) &= ~(__INTERRUPT__))
@@ -308,18 +319,19 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
308319
* @param __HANDLE__ DAC handle
309320
* @param __INTERRUPT__ DAC interrupt source to check
310321
* This parameter can be any combination of the following values:
311-
* @arg DAC_IT_DMAUDR1: DAC channel 1 DMA underrun interrupt
312-
* @arg DAC_IT_DMAUDR2: DAC channel 2 DMA underrun interrupt
322+
* @arg DAC_IT_DMAUDR1 DAC channel 1 DMA underrun interrupt
323+
* @arg DAC_IT_DMAUDR2 DAC channel 2 DMA underrun interrupt
313324
* @retval State of interruption (SET or RESET)
314325
*/
315-
#define __HAL_DAC_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->CR & (__INTERRUPT__)) == (__INTERRUPT__))
326+
#define __HAL_DAC_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) (((__HANDLE__)->Instance->CR\
327+
& (__INTERRUPT__)) == (__INTERRUPT__))
316328

317329
/** @brief Get the selected DAC's flag status.
318330
* @param __HANDLE__ specifies the DAC handle.
319331
* @param __FLAG__ specifies the DAC flag to get.
320332
* This parameter can be any combination of the following values:
321-
* @arg DAC_FLAG_DMAUDR1: DAC channel 1 DMA underrun flag
322-
* @arg DAC_FLAG_DMAUDR2: DAC channel 2 DMA underrun flag
333+
* @arg DAC_FLAG_DMAUDR1 DAC channel 1 DMA underrun flag
334+
* @arg DAC_FLAG_DMAUDR2 DAC channel 2 DMA underrun flag
323335
* @retval None
324336
*/
325337
#define __HAL_DAC_GET_FLAG(__HANDLE__, __FLAG__) ((((__HANDLE__)->Instance->SR) & (__FLAG__)) == (__FLAG__))
@@ -328,8 +340,8 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
328340
* @param __HANDLE__ specifies the DAC handle.
329341
* @param __FLAG__ specifies the DAC flag to clear.
330342
* This parameter can be any combination of the following values:
331-
* @arg DAC_FLAG_DMAUDR1: DAC channel 1 DMA underrun flag
332-
* @arg DAC_FLAG_DMAUDR2: DAC channel 2 DMA underrun flag
343+
* @arg DAC_FLAG_DMAUDR1 DAC channel 1 DMA underrun flag
344+
* @arg DAC_FLAG_DMAUDR2 DAC channel 2 DMA underrun flag
333345
* @retval None
334346
*/
335347
#define __HAL_DAC_CLEAR_FLAG(__HANDLE__, __FLAG__) (((__HANDLE__)->Instance->SR) = (__FLAG__))
@@ -353,7 +365,7 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
353365
((ALIGN) == DAC_ALIGN_12B_L) || \
354366
((ALIGN) == DAC_ALIGN_8B_R))
355367

356-
#define IS_DAC_DATA(DATA) ((DATA) <= 0xFFF0U)
368+
#define IS_DAC_DATA(DATA) ((DATA) <= 0xFFF0UL)
357369

358370
/**
359371
* @}
@@ -390,9 +402,7 @@ HAL_StatusTypeDef HAL_DAC_Stop(DAC_HandleTypeDef *hdac, uint32_t Channel);
390402
HAL_StatusTypeDef HAL_DAC_Start_DMA(DAC_HandleTypeDef *hdac, uint32_t Channel, uint32_t *pData, uint32_t Length,
391403
uint32_t Alignment);
392404
HAL_StatusTypeDef HAL_DAC_Stop_DMA(DAC_HandleTypeDef *hdac, uint32_t Channel);
393-
394405
void HAL_DAC_IRQHandler(DAC_HandleTypeDef *hdac);
395-
396406
HAL_StatusTypeDef HAL_DAC_SetValue(DAC_HandleTypeDef *hdac, uint32_t Channel, uint32_t Alignment, uint32_t Data);
397407

398408
void HAL_DAC_ConvCpltCallbackCh1(DAC_HandleTypeDef *hdac);
@@ -416,7 +426,6 @@ HAL_StatusTypeDef HAL_DAC_UnRegisterCallback(DAC_HandleTypeDef *hdac, HAL_DA
416426
*/
417427
/* Peripheral Control functions ***********************************************/
418428
uint32_t HAL_DAC_GetValue(DAC_HandleTypeDef *hdac, uint32_t Channel);
419-
420429
HAL_StatusTypeDef HAL_DAC_ConfigChannel(DAC_HandleTypeDef *hdac, DAC_ChannelConfTypeDef *sConfig, uint32_t Channel);
421430
/**
422431
* @}
@@ -462,7 +471,6 @@ void DAC_DMAHalfConvCpltCh1(DMA_HandleTypeDef *hdma);
462471
#endif
463472

464473

465-
#endif /*STM32F2xx_HAL_DAC_H */
474+
#endif /* STM32F2xx_HAL_DAC_H */
466475

467476
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
468-

‎system/Drivers/STM32F2xx_HAL_Driver/Inc/stm32f2xx_hal_dac_ex.h

+9-8
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 */
@@ -104,7 +104,6 @@ extern "C" {
104104
((TRIGGER) == DAC_TRIGGER_EXT_IT9) || \
105105
((TRIGGER) == DAC_TRIGGER_SOFTWARE))
106106

107-
108107
#define IS_DAC_LFSR_UNMASK_TRIANGLE_AMPLITUDE(VALUE) (((VALUE) == DAC_LFSRUNMASK_BIT0) || \
109108
((VALUE) == DAC_LFSRUNMASK_BITS1_0) || \
110109
((VALUE) == DAC_LFSRUNMASK_BITS2_0) || \
@@ -148,6 +147,8 @@ extern "C" {
148147
HAL_StatusTypeDef HAL_DACEx_TriangleWaveGenerate(DAC_HandleTypeDef *hdac, uint32_t Channel, uint32_t Amplitude);
149148
HAL_StatusTypeDef HAL_DACEx_NoiseWaveGenerate(DAC_HandleTypeDef *hdac, uint32_t Channel, uint32_t Amplitude);
150149

150+
HAL_StatusTypeDef HAL_DACEx_DualStart(DAC_HandleTypeDef *hdac);
151+
HAL_StatusTypeDef HAL_DACEx_DualStop(DAC_HandleTypeDef *hdac);
151152
HAL_StatusTypeDef HAL_DACEx_DualSetValue(DAC_HandleTypeDef *hdac, uint32_t Alignment, uint32_t Data1, uint32_t Data2);
152153
uint32_t HAL_DACEx_DualGetValue(DAC_HandleTypeDef *hdac);
153154

@@ -165,6 +166,10 @@ void HAL_DACEx_DMAUnderrunCallbackCh2(DAC_HandleTypeDef *hdac);
165166
* @}
166167
*/
167168

169+
/**
170+
* @}
171+
*/
172+
168173
/** @addtogroup DACEx_Private_Functions
169174
* @{
170175
*/
@@ -183,10 +188,6 @@ void DAC_DMAHalfConvCpltCh2(DMA_HandleTypeDef *hdma);
183188
* @}
184189
*/
185190

186-
/**
187-
* @}
188-
*/
189-
190191
#endif /* DAC */
191192

192193
/**
@@ -197,6 +198,6 @@ void DAC_DMAHalfConvCpltCh2(DMA_HandleTypeDef *hdma);
197198
}
198199
#endif
199200

200-
#endif /*STM32F2xx_HAL_DAC_EX_H */
201+
#endif /* STM32F2xx_HAL_DAC_EX_H */
201202

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

‎system/Drivers/STM32F2xx_HAL_Driver/Inc/stm32f2xx_hal_eth.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ typedef struct
591591

592592

593593
/**
594-
* @brief Received Frame Informations structure definition
594+
* @brief Received Frame Information structure definition
595595
*/
596596
typedef struct
597597
{

‎system/Drivers/STM32F2xx_HAL_Driver/Inc/stm32f2xx_hal_exti.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -207,19 +207,19 @@ typedef struct
207207
/** @defgroup EXTI_Private_Macros EXTI Private Macros
208208
* @{
209209
*/
210-
#define IS_EXTI_LINE(__LINE__) ((((__LINE__) & ~(EXTI_PROPERTY_MASK | EXTI_PIN_MASK)) == 0x00u) && \
211-
((((__LINE__) & EXTI_PROPERTY_MASK) == EXTI_CONFIG) || \
212-
(((__LINE__) & EXTI_PROPERTY_MASK) == EXTI_GPIO)) && \
213-
(((__LINE__) & EXTI_PIN_MASK) < EXTI_LINE_NB))
210+
#define IS_EXTI_LINE(__EXTI_LINE__) ((((__EXTI_LINE__) & ~(EXTI_PROPERTY_MASK | EXTI_PIN_MASK)) == 0x00u) && \
211+
((((__EXTI_LINE__) & EXTI_PROPERTY_MASK) == EXTI_CONFIG) || \
212+
(((__EXTI_LINE__) & EXTI_PROPERTY_MASK) == EXTI_GPIO)) && \
213+
(((__EXTI_LINE__) & EXTI_PIN_MASK) < EXTI_LINE_NB))
214214

215-
#define IS_EXTI_MODE(__LINE__) ((((__LINE__) & EXTI_MODE_MASK) != 0x00u) && \
216-
(((__LINE__) & ~EXTI_MODE_MASK) == 0x00u))
215+
#define IS_EXTI_MODE(__EXTI_LINE__) ((((__EXTI_LINE__) & EXTI_MODE_MASK) != 0x00u) && \
216+
(((__EXTI_LINE__) & ~EXTI_MODE_MASK) == 0x00u))
217217

218-
#define IS_EXTI_TRIGGER(__LINE__) (((__LINE__) & ~EXTI_TRIGGER_MASK) == 0x00u)
218+
#define IS_EXTI_TRIGGER(__EXTI_LINE__) (((__EXTI_LINE__) & ~EXTI_TRIGGER_MASK) == 0x00u)
219219

220-
#define IS_EXTI_PENDING_EDGE(__LINE__) ((__LINE__) == EXTI_TRIGGER_RISING_FALLING)
220+
#define IS_EXTI_PENDING_EDGE(__EXTI_LINE__) ((__EXTI_LINE__) == EXTI_TRIGGER_RISING_FALLING)
221221

222-
#define IS_EXTI_CONFIG_LINE(__LINE__) (((__LINE__) & EXTI_CONFIG) != 0x00u)
222+
#define IS_EXTI_CONFIG_LINE(__EXTI_LINE__) (((__EXTI_LINE__) & EXTI_CONFIG) != 0x00u)
223223

224224
#define IS_EXTI_GPIO_PORT(__PORT__) (((__PORT__) == EXTI_GPIOA) || \
225225
((__PORT__) == EXTI_GPIOB) || \

0 commit comments

Comments
 (0)