@@ -76,7 +76,8 @@ typedef struct
7676
7777/**
7878 * @brief HAL IRDA State definition
79- * @note HAL IRDA State value is a combination of 2 different substates: gState and RxState (see @ref IRDA_State_Definition).
79+ * @note HAL IRDA State value is a combination of 2 different substates:
80+ * gState and RxState (see @ref IRDA_State_Definition).
8081 * - gState contains IRDA state information related to global Handle management
8182 * and also information related to Tx operations.
8283 * gState value coding follow below described bitmap :
@@ -87,7 +88,7 @@ typedef struct
8788 * 11 : Error
8889 * b5 Peripheral initialization status
8990 * 0 : Reset (Peripheral not initialized)
90- * 1 : Init done (Peripheral not initialized. HAL IRDA Init function already called)
91+ * 1 : Init done (Peripheral initialized. HAL IRDA Init function already called)
9192 * b4-b3 (not used)
9293 * xx : Should be set to 00
9394 * b2 Intrinsic process state
@@ -104,7 +105,7 @@ typedef struct
104105 * xx : Should be set to 00
105106 * b5 Peripheral initialization status
106107 * 0 : Reset (Peripheral not initialized)
107- * 1 : Init done (Peripheral not initialized)
108+ * 1 : Init done (Peripheral initialized)
108109 * b4-b2 (not used)
109110 * xxx : Should be set to 000
110111 * b1 Rx state
@@ -245,7 +246,8 @@ typedef void (*pIRDA_CallbackTypeDef)(IRDA_HandleTypeDef *hirda); /*!< pointer
245246 Value is allowed for RxState only */
246247#define HAL_IRDA_STATE_BUSY_TX_RX 0x00000023U /*!< Data Transmission and Reception process is ongoing
247248 Not to be used for neither gState nor RxState.
248- Value is result of combination (Or) between gState and RxState values */
249+ Value is result of combination (Or) between
250+ gState and RxState values */
249251#define HAL_IRDA_STATE_TIMEOUT 0x000000A0U /*!< Timeout state
250252 Value is allowed for gState only */
251253#define HAL_IRDA_STATE_ERROR 0x000000E0U /*!< Error
@@ -257,15 +259,15 @@ typedef void (*pIRDA_CallbackTypeDef)(IRDA_HandleTypeDef *hirda); /*!< pointer
257259/** @defgroup IRDA_Error_Definition IRDA Error Code Definition
258260 * @{
259261 */
260- #define HAL_IRDA_ERROR_NONE ((uint32_t) 0x00000000U) /*!< No error */
261- #define HAL_IRDA_ERROR_PE ((uint32_t) 0x00000001U) /*!< Parity error */
262- #define HAL_IRDA_ERROR_NE ((uint32_t) 0x00000002U) /*!< Noise error */
263- #define HAL_IRDA_ERROR_FE ((uint32_t) 0x00000004U) /*!< frame error */
264- #define HAL_IRDA_ERROR_ORE ((uint32_t) 0x00000008U) /*!< Overrun error */
265- #define HAL_IRDA_ERROR_DMA ((uint32_t) 0x00000010U) /*!< DMA transfer error */
266- #define HAL_IRDA_ERROR_BUSY ((uint32_t) 0x00000020U) /*!< Busy Error */
262+ #define HAL_IRDA_ERROR_NONE (0x00000000U) /*!< No error */
263+ #define HAL_IRDA_ERROR_PE (0x00000001U) /*!< Parity error */
264+ #define HAL_IRDA_ERROR_NE (0x00000002U) /*!< Noise error */
265+ #define HAL_IRDA_ERROR_FE (0x00000004U) /*!< frame error */
266+ #define HAL_IRDA_ERROR_ORE (0x00000008U) /*!< Overrun error */
267+ #define HAL_IRDA_ERROR_DMA (0x00000010U) /*!< DMA transfer error */
268+ #define HAL_IRDA_ERROR_BUSY (0x00000020U) /*!< Busy Error */
267269#if (USE_HAL_IRDA_REGISTER_CALLBACKS == 1 )
268- #define HAL_IRDA_ERROR_INVALID_CALLBACK ((uint32_t) 0x00000040U) /*!< Invalid Callback error */
270+ #define HAL_IRDA_ERROR_INVALID_CALLBACK (0x00000040U) /*!< Invalid Callback error */
269271#endif /* USE_HAL_IRDA_REGISTER_CALLBACKS */
270272/**
271273 * @}
@@ -549,9 +551,14 @@ typedef void (*pIRDA_CallbackTypeDef)(IRDA_HandleTypeDef *hirda); /*!< pointer
549551 * @arg @ref IRDA_IT_ERR Error interrupt(Frame error, noise error, overrun error)
550552 * @retval None
551553 */
552- #define __HAL_IRDA_ENABLE_IT (__HANDLE__ , __INTERRUPT__ ) (((((__INTERRUPT__) & IRDA_CR_MASK) >> IRDA_CR_POS) == 1U)? ((__HANDLE__)->Instance->CR1 |= ((uint32_t)1U << ((__INTERRUPT__) & IRDA_IT_MASK))): \
553- ((((__INTERRUPT__) & IRDA_CR_MASK) >> IRDA_CR_POS) == 2U)? ((__HANDLE__)->Instance->CR2 |= ((uint32_t)1U << ((__INTERRUPT__) & IRDA_IT_MASK))): \
554- ((__HANDLE__)->Instance->CR3 |= ((uint32_t)1U << ((__INTERRUPT__) & IRDA_IT_MASK))))
554+ #define __HAL_IRDA_ENABLE_IT (__HANDLE__ , __INTERRUPT__ ) (((((__INTERRUPT__) & IRDA_CR_MASK) >> IRDA_CR_POS) == 1U)? \
555+ ((__HANDLE__)->Instance->CR1 |= (1U << \
556+ ((__INTERRUPT__) & IRDA_IT_MASK))):\
557+ ((((__INTERRUPT__) & IRDA_CR_MASK) >> IRDA_CR_POS) == 2U)? \
558+ ((__HANDLE__)->Instance->CR2 |= (1U << \
559+ ((__INTERRUPT__) & IRDA_IT_MASK))):\
560+ ((__HANDLE__)->Instance->CR3 |= (1U << \
561+ ((__INTERRUPT__) & IRDA_IT_MASK))))
555562
556563/** @brief Disable the specified IRDA interrupt.
557564 * @param __HANDLE__ specifies the IRDA Handle.
@@ -565,10 +572,14 @@ typedef void (*pIRDA_CallbackTypeDef)(IRDA_HandleTypeDef *hirda); /*!< pointer
565572 * @arg @ref IRDA_IT_ERR Error interrupt(Frame error, noise error, overrun error)
566573 * @retval None
567574 */
568- #define __HAL_IRDA_DISABLE_IT (__HANDLE__ , __INTERRUPT__ ) (((((__INTERRUPT__) & IRDA_CR_MASK) >> IRDA_CR_POS) == 1U)? ((__HANDLE__)->Instance->CR1 &= ~ ((uint32_t)1U << ((__INTERRUPT__) & IRDA_IT_MASK))): \
569- ((((__INTERRUPT__) & IRDA_CR_MASK) >> IRDA_CR_POS) == 2U)? ((__HANDLE__)->Instance->CR2 &= ~ ((uint32_t)1U << ((__INTERRUPT__) & IRDA_IT_MASK))): \
570- ((__HANDLE__)->Instance->CR3 &= ~ ((uint32_t)1U << ((__INTERRUPT__) & IRDA_IT_MASK))))
571-
575+ #define __HAL_IRDA_DISABLE_IT (__HANDLE__ , __INTERRUPT__ ) (((((__INTERRUPT__) & IRDA_CR_MASK) >> IRDA_CR_POS) == 1U)? \
576+ ((__HANDLE__)->Instance->CR1 &= ~ (1U << \
577+ ((__INTERRUPT__) & IRDA_IT_MASK))): \
578+ ((((__INTERRUPT__) & IRDA_CR_MASK) >> IRDA_CR_POS) == 2U)? \
579+ ((__HANDLE__)->Instance->CR2 &= ~ (1U << \
580+ ((__INTERRUPT__) & IRDA_IT_MASK))): \
581+ ((__HANDLE__)->Instance->CR3 &= ~ (1U << \
582+ ((__INTERRUPT__) & IRDA_IT_MASK))))
572583
573584/** @brief Check whether the specified IRDA interrupt has occurred or not.
574585 * @param __HANDLE__ specifies the IRDA Handle.
@@ -584,8 +595,8 @@ typedef void (*pIRDA_CallbackTypeDef)(IRDA_HandleTypeDef *hirda); /*!< pointer
584595 * @arg @ref IRDA_IT_PE Parity Error interrupt
585596 * @retval The new state of __IT__ (SET or RESET).
586597 */
587- #define __HAL_IRDA_GET_IT (__HANDLE__ , __INTERRUPT__ ) ((((__HANDLE__)->Instance->ISR \
588- & (0x01U << (((__INTERRUPT__) & IRDA_ISR_MASK)>> IRDA_ISR_POS))) != 0U) ? SET : RESET)
598+ #define __HAL_IRDA_GET_IT (__HANDLE__ , __INTERRUPT__ ) \
599+ ((((__HANDLE__)->Instance->ISR & (0x01U << (((__INTERRUPT__) & IRDA_ISR_MASK)>>IRDA_ISR_POS))) != 0U) ? SET : RESET)
589600
590601/** @brief Check whether the specified IRDA interrupt source is enabled or not.
591602 * @param __HANDLE__ specifies the IRDA Handle.
@@ -599,9 +610,10 @@ typedef void (*pIRDA_CallbackTypeDef)(IRDA_HandleTypeDef *hirda); /*!< pointer
599610 * @arg @ref IRDA_IT_PE Parity Error interrupt
600611 * @retval The new state of __IT__ (SET or RESET).
601612 */
602- #define __HAL_IRDA_GET_IT_SOURCE (__HANDLE__ , __INTERRUPT__ ) ((((((((__INTERRUPT__) & IRDA_CR_MASK) >> IRDA_CR_POS) == 0x01U)? (__HANDLE__)->Instance->CR1 : \
603- (((((__INTERRUPT__) & IRDA_CR_MASK) >> IRDA_CR_POS) == 0x02U)? (__HANDLE__)->Instance->CR2 : \
604- (__HANDLE__)->Instance->CR3)) & ((uint32_t)0x01U << (((uint16_t)(__INTERRUPT__)) & IRDA_IT_MASK))) != 0U) ? SET : RESET)
613+ #define __HAL_IRDA_GET_IT_SOURCE (__HANDLE__ , __INTERRUPT__ ) \
614+ ((((((((__INTERRUPT__) & IRDA_CR_MASK) >>IRDA_CR_POS) == 0x01U)? (__HANDLE__)->Instance->CR1 :(((((__INTERRUPT__) \
615+ & IRDA_CR_MASK) >> IRDA_CR_POS)== 0x02U)? (__HANDLE__)->Instance->CR2 :(__HANDLE__)->Instance->CR3)) \
616+ & (0x01U <<(((uint16_t)(__INTERRUPT__)) & IRDA_IT_MASK))) != 0U) ? SET : RESET)
605617
606618/** @brief Clear the specified IRDA ISR flag, in setting the proper ICR register flag.
607619 * @param __HANDLE__ specifies the IRDA Handle.
@@ -833,7 +845,7 @@ uint32_t HAL_IRDA_GetError(IRDA_HandleTypeDef *hirda);
833845/**
834846 * @}
835847 */
836- #endif /* USART_IRDA_SUPPORT */
848+ #endif /* USART_IRDA_SUPPORT */
837849
838850#ifdef __cplusplus
839851}
0 commit comments