From 2d269f44878c3190e9a6db6f4a20980225ffd677 Mon Sep 17 00:00:00 2001 From: tfateba Date: Wed, 4 Jan 2017 20:03:48 +0000 Subject: Correction of AVR hal_ext_lld to respect the project code style. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10018 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/AVR/hal_adc_lld.c | 2 +- os/hal/ports/AVR/hal_adc_lld.h | 2 +- os/hal/ports/AVR/hal_ext_lld.c | 72 ++++++++++++++++++++++++++---------------- os/hal/ports/AVR/hal_ext_lld.h | 20 ++++++------ 4 files changed, 57 insertions(+), 39 deletions(-) diff --git a/os/hal/ports/AVR/hal_adc_lld.c b/os/hal/ports/AVR/hal_adc_lld.c index 7cc11bf76..def5b6c1e 100644 --- a/os/hal/ports/AVR/hal_adc_lld.c +++ b/os/hal/ports/AVR/hal_adc_lld.c @@ -15,7 +15,7 @@ */ /** - * @file AVR/adc_lld.c + * @file hal_adc_lld.c * @brief ADC Driver subsystem low level driver source. * * @addtogroup ADC diff --git a/os/hal/ports/AVR/hal_adc_lld.h b/os/hal/ports/AVR/hal_adc_lld.h index 8e2231724..13fef24b3 100644 --- a/os/hal/ports/AVR/hal_adc_lld.h +++ b/os/hal/ports/AVR/hal_adc_lld.h @@ -15,7 +15,7 @@ */ /** - * @file AVR/adc_lld.h + * @file hal_adc_lld.h * @brief ADC Driver subsystem low level driver source. * * @addtogroup ADC diff --git a/os/hal/ports/AVR/hal_ext_lld.c b/os/hal/ports/AVR/hal_ext_lld.c index 7459806f1..225bd7e15 100644 --- a/os/hal/ports/AVR/hal_ext_lld.c +++ b/os/hal/ports/AVR/hal_ext_lld.c @@ -15,8 +15,8 @@ */ /** - * @file AVR/hal_ext_lld.c - * @brief AVR EXT subsystem low level driver source. + * @file hal_ext_lld.c + * @brief AVR EXT subsystem low level driver source. * * @addtogroup EXT * @{ @@ -35,7 +35,7 @@ /*===========================================================================*/ /** - * @brief EXTD1 driver identifier. + * @brief EXTD1 driver identifier. */ EXTDriver EXTD1; @@ -59,13 +59,16 @@ void ext_lld_set_intx_edges(expchannel_t channel, uint8_t edge) { if (edge == EXT_CH_MODE_RISING_EDGE) { EICRA |= (1 << 0); EICRA |= (1 << 1); - } else if (edge == EXT_CH_MODE_FALLING_EDGE) { + } + else if (edge == EXT_CH_MODE_FALLING_EDGE) { EICRA &= ~(1 << 0); EICRA |= (1 << 1); - } else if (edge == EXT_CH_MODE_BOTH_EDGES) { + } + else if (edge == EXT_CH_MODE_BOTH_EDGES) { EICRA |= (1 << 0); EICRA &= ~(1 << 1); - } else if (edge == EXT_CH_MODE_LOW_LEVEL) { + } + else if (edge == EXT_CH_MODE_LOW_LEVEL) { EICRA &= ~(1 << 0); EICRA &= ~(1 << 1); } @@ -76,13 +79,16 @@ void ext_lld_set_intx_edges(expchannel_t channel, uint8_t edge) { if (edge == EXT_CH_MODE_RISING_EDGE) { EICRA |= (1 << 2); EICRA |= (1 << 3); - } else if (edge == EXT_CH_MODE_FALLING_EDGE) { + } + else if (edge == EXT_CH_MODE_FALLING_EDGE) { EICRA &= ~(1 << 2); EICRA |= (1 << 3); - } else if (edge == EXT_CH_MODE_BOTH_EDGES) { + } + else if (edge == EXT_CH_MODE_BOTH_EDGES) { EICRA |= (1 << 2); EICRA &= ~(1 << 3); - } else if (edge == EXT_CH_MODE_LOW_LEVEL) { + } + else if (edge == EXT_CH_MODE_LOW_LEVEL) { EICRA &= ~(1 << 2); EICRA &= ~(1 << 3); } @@ -93,13 +99,16 @@ void ext_lld_set_intx_edges(expchannel_t channel, uint8_t edge) { if (edge == EXT_CH_MODE_RISING_EDGE) { EICRA |= (1 << 4); EICRA |= (1 << 5); - } else if (edge == EXT_CH_MODE_FALLING_EDGE) { + } + else if (edge == EXT_CH_MODE_FALLING_EDGE) { EICRA &= ~(1 << 4); EICRA |= (1 << 5); - } else if (edge == EXT_CH_MODE_BOTH_EDGES) { + } + else if (edge == EXT_CH_MODE_BOTH_EDGES) { EICRA |= (1 << 4); EICRA &= ~(1 << 5); - } else if (edge == EXT_CH_MODE_LOW_LEVEL) { + } + else if (edge == EXT_CH_MODE_LOW_LEVEL) { EICRA &= ~(1 << 4); EICRA &= ~(1 << 5); } @@ -110,13 +119,16 @@ void ext_lld_set_intx_edges(expchannel_t channel, uint8_t edge) { if (edge == EXT_CH_MODE_RISING_EDGE) { EICRA |= (1 << 6); EICRA |= (1 << 7); - } else if (edge == EXT_CH_MODE_FALLING_EDGE) { + } + else if (edge == EXT_CH_MODE_FALLING_EDGE) { EICRA &= ~(1 << 6); EICRA |= (1 << 7); - } else if (edge == EXT_CH_MODE_BOTH_EDGES) { + } + else if (edge == EXT_CH_MODE_BOTH_EDGES) { EICRA |= (1 << 6); EICRA &= ~(1 << 7); - } else if (edge == EXT_CH_MODE_LOW_LEVEL) { + } + else if (edge == EXT_CH_MODE_LOW_LEVEL) { EICRA &= ~(1 << 6); EICRA &= ~(1 << 7); } @@ -127,13 +139,16 @@ void ext_lld_set_intx_edges(expchannel_t channel, uint8_t edge) { if (edge == EXT_CH_MODE_RISING_EDGE) { EICRB |= (1 << 0); EICRB |= (1 << 1); - } else if (edge == EXT_CH_MODE_FALLING_EDGE) { + } + else if (edge == EXT_CH_MODE_FALLING_EDGE) { EICRB &= ~(1 << 0); EICRB |= (1 << 1); - } else if (edge == EXT_CH_MODE_BOTH_EDGES) { + } + else if (edge == EXT_CH_MODE_BOTH_EDGES) { EICRB |= (1 << 0); EICRB &= ~(1 << 1); - } else if (edge == EXT_CH_MODE_LOW_LEVEL) { + } + else if (edge == EXT_CH_MODE_LOW_LEVEL) { EICRB &= ~(1 << 0); EICRB &= ~(1 << 1); } @@ -144,13 +159,16 @@ void ext_lld_set_intx_edges(expchannel_t channel, uint8_t edge) { if (edge == EXT_CH_MODE_RISING_EDGE) { EICRB |= (1 << 2); EICRB |= (1 << 3); - } else if (edge == EXT_CH_MODE_FALLING_EDGE) { + } + else if (edge == EXT_CH_MODE_FALLING_EDGE) { EICRB &= ~(1 << 2); EICRB |= (1 << 3); - } else if (edge == EXT_CH_MODE_BOTH_EDGES) { + } + else if (edge == EXT_CH_MODE_BOTH_EDGES) { EICRB |= (1 << 2); EICRB &= ~(1 << 3); - } else if (edge == EXT_CH_MODE_LOW_LEVEL) { + } + else if (edge == EXT_CH_MODE_LOW_LEVEL) { EICRB &= ~(1 << 2); EICRB &= ~(1 << 3); } @@ -164,7 +182,7 @@ void ext_lld_set_intx_edges(expchannel_t channel, uint8_t edge) { #if AVR_EXT_USE_INT0 || defined(__DOXYGEN__) /** - * @brief EXTI[INT0] interrupt handler. + * @brief EXTI[INT0] interrupt handler. * * @isr */ @@ -177,7 +195,7 @@ OSAL_IRQ_HANDLER(INT0_vect) { #if AVR_EXT_USE_INT1 || defined(__DOXYGEN__) /** - * @brief EXTI[INT1] interrupt handler. + * @brief EXTI[INT1] interrupt handler. * * @isr */ @@ -190,7 +208,7 @@ OSAL_IRQ_HANDLER(INT1_vect) { #if AVR_EXT_USE_INT2 || defined(__DOXYGEN__) /** - * @brief EXTI[INT2] interrupt handler. + * @brief EXTI[INT2] interrupt handler. * * @isr */ @@ -203,7 +221,7 @@ OSAL_IRQ_HANDLER(INT2_vect) { #if AVR_EXT_USE_INT3 || defined(__DOXYGEN__) /** - * @brief EXTI[INT3] interrupt handler. + * @brief EXTI[INT3] interrupt handler. * * @isr */ @@ -216,7 +234,7 @@ OSAL_IRQ_HANDLER(INT3_vect) { #if AVR_EXT_USE_INT4 || defined(__DOXYGEN__) /** - * @brief EXTI[INT4] interrupt handler. + * @brief EXTI[INT4] interrupt handler. * * @isr */ @@ -228,7 +246,7 @@ OSAL_IRQ_HANDLER(INT4_vect) { #endif #if AVR_EXT_USE_INT5 || defined(__DOXYGEN__) /** - * @brief EXTI[INT5] interrupt handler. + * @brief EXTI[INT5] interrupt handler. * * @isr */ diff --git a/os/hal/ports/AVR/hal_ext_lld.h b/os/hal/ports/AVR/hal_ext_lld.h index 1a93c2803..883972419 100644 --- a/os/hal/ports/AVR/hal_ext_lld.h +++ b/os/hal/ports/AVR/hal_ext_lld.h @@ -15,8 +15,8 @@ */ /** - * @file AVR/hal_ext_lld.h - * @brief EXT Driver subsystem low level driver source. + * @file hal_ext_lld.h + * @brief EXT Driver subsystem low level driver source. * * @addtogroup EXT * @{ @@ -32,12 +32,12 @@ /*===========================================================================*/ /** - * @brief Maximum number of EXT channels. + * @brief Maximum number of EXT channels. */ #define AVR_INT_NUM_LINES 6 /**< INT0 to INT5 */ /** - * @brief Available number of EXT channels. + * @brief Available number of EXT channels. */ #define EXT_MAX_CHANNELS AVR_INT_NUM_LINES @@ -54,12 +54,12 @@ /*===========================================================================*/ /** - * @brief EXT channel identifier. + * @brief EXT channel identifier. */ typedef uint16_t expchannel_t; /** - * @brief Type of an EXT generic notification callback. + * @brief Type of an EXT generic notification callback. * * @param[in] extp pointer to the @p EXPDriver object triggering the * callback @@ -67,7 +67,7 @@ typedef uint16_t expchannel_t; typedef void (*extcallback_t)(EXTDriver *extp, expchannel_t channel); /** - * @brief Channel configuration structure. + * @brief Channel configuration structure. */ typedef struct { /** @@ -81,8 +81,8 @@ typedef struct { } EXTChannelConfig; /** - * @brief Driver configuration structure. - * @note It could be empty on some architectures. + * @brief Driver configuration structure. + * @note It could be empty on some architectures. */ typedef struct { /** @@ -93,7 +93,7 @@ typedef struct { } EXTConfig; /** - * @brief Structure representing an EXT driver. + * @brief Structure representing an EXT driver. */ struct EXTDriver { /** -- cgit v1.2.3