From 8cdc1b5e85f12f6667843a2ad5d83cc0b5b4733c Mon Sep 17 00:00:00 2001 From: asterix Date: Fri, 7 May 2010 13:55:10 +0000 Subject: [PATCH] Clean up. Reformat. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3627 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cpu/avr/drv/adc_avr.c | 1 - bertos/cpu/avr/drv/adc_avr.h | 30 ++++++++++++++++++++++++++---- examples/triface/cmd_ctor.h | 3 --- examples/triface/hw/hw_adc.c | 2 -- examples/triface/hw/hw_adc.h | 2 -- examples/triface/hw/hw_buzzer.h | 8 +++----- examples/triface/hw/hw_input.h | 7 ++----- examples/triface/hw/hw_sipo.h | 2 -- examples/triface/protocol.c | 2 -- examples/triface/protocol.h | 2 -- examples/triface/triface.c | 2 -- 11 files changed, 31 insertions(+), 30 deletions(-) diff --git a/bertos/cpu/avr/drv/adc_avr.c b/bertos/cpu/avr/drv/adc_avr.c index 0aae6743..9a6f2d39 100644 --- a/bertos/cpu/avr/drv/adc_avr.c +++ b/bertos/cpu/avr/drv/adc_avr.c @@ -31,7 +31,6 @@ * * \brief ADC hardware-specific definition * - * \version $Id$ * \author Francesco Sacchi * * This module is automatically included so no need to include diff --git a/bertos/cpu/avr/drv/adc_avr.h b/bertos/cpu/avr/drv/adc_avr.h index fc076f19..417e4536 100644 --- a/bertos/cpu/avr/drv/adc_avr.h +++ b/bertos/cpu/avr/drv/adc_avr.h @@ -1,14 +1,36 @@ -/*! +/** * \file * * - * \version $Id$ - * * \brief ADC hardware-specific definition * - * \version $Id$ * \author Francesco Sacchi */ diff --git a/examples/triface/cmd_ctor.h b/examples/triface/cmd_ctor.h index bf073f1e..0e38c836 100644 --- a/examples/triface/cmd_ctor.h +++ b/examples/triface/cmd_ctor.h @@ -31,9 +31,6 @@ * * \brief Macro for defining command for protocol. * - * - * \version $Id$ - * * \author Marco Benelli */ diff --git a/examples/triface/hw/hw_adc.c b/examples/triface/hw/hw_adc.c index 8c603eb8..db51bf28 100644 --- a/examples/triface/hw/hw_adc.c +++ b/examples/triface/hw/hw_adc.c @@ -34,8 +34,6 @@ * \brief ADC: Analogic to Digital Converter * * - * \version $Id$ - * * \author Andrea Grandi */ diff --git a/examples/triface/hw/hw_adc.h b/examples/triface/hw/hw_adc.h index 817b190c..1c6e99b8 100644 --- a/examples/triface/hw/hw_adc.h +++ b/examples/triface/hw/hw_adc.h @@ -34,8 +34,6 @@ * \brief Macro for HW_AIN_H * * - * \version $Id$ - * * \author Andrea Grandi */ diff --git a/examples/triface/hw/hw_buzzer.h b/examples/triface/hw/hw_buzzer.h index c3cc6d36..a2b683ad 100644 --- a/examples/triface/hw/hw_buzzer.h +++ b/examples/triface/hw/hw_buzzer.h @@ -33,10 +33,8 @@ * * \brief Buzzer hardware-specific definitions * - * \version $Id$ - * - * \author Francesco Sacchi - * Andrea Grandi + * \author Francesco Sacchi + * \author Andrea Grandi */ #ifndef HW_BUZZER_H @@ -46,7 +44,7 @@ #include #define BUZZER_BIT BV(PE3) -#define IS_BUZZER_ON (PORTE & BUZZER_BIT) +#define IS_BUZZER_ON (PORTE & BUZZER_BIT) #define BUZZER_HW_INIT do { DDRE |= BV(DDE3); } while (0) #define BUZZER_ON do { PORTE |= BUZZER_BIT; } while (0) #define BUZZER_OFF do { PORTE &= ~BUZZER_BIT; } while (0) diff --git a/examples/triface/hw/hw_input.h b/examples/triface/hw/hw_input.h index e3dcf1c4..f0ef721c 100644 --- a/examples/triface/hw/hw_input.h +++ b/examples/triface/hw/hw_input.h @@ -33,9 +33,6 @@ * * \brief Macro for HW_INPUT_H * - * - * \version $Id$ - * * \author Andrea Grandi */ @@ -45,14 +42,14 @@ #include /* Set pins as input and enable pull-up */ -#define INPUT_INIT_D do \ +#define INPUT_INIT_D do \ { \ (DDRD &= ~(BV(PD4) | BV(PD5) | BV(PD6) | BV(PD7))); \ (PORTD |= (BV(PD4) | BV(PD5) | BV(PD6) | BV(PD7))); \ } while(0) #define INPUT_INIT_E do \ -{ \ +{ \ (DDRE &= ~(BV(PE4) | BV(PE5) | BV(PE6) | BV(PE7))); \ ATOMIC((PORTE |= (BV(PE4) | BV(PE5) | BV(PE6) | BV(PE7)))); \ } while(0) diff --git a/examples/triface/hw/hw_sipo.h b/examples/triface/hw/hw_sipo.h index 87e5736a..9922c052 100644 --- a/examples/triface/hw/hw_sipo.h +++ b/examples/triface/hw/hw_sipo.h @@ -34,8 +34,6 @@ * \brief Macro for HW_SIPO_H * * - * \version $Id$ - * * \author Andrea Grandi * \author Daniele Basile */ diff --git a/examples/triface/protocol.c b/examples/triface/protocol.c index 254880e5..eec73684 100644 --- a/examples/triface/protocol.c +++ b/examples/triface/protocol.c @@ -34,8 +34,6 @@ * \brief Implementation of the command protocol between the board and the host * * - * \version $Id$ - * * \author Giovanni Bajo * \author Marco Benelli * \author Bernie Innocenti diff --git a/examples/triface/protocol.h b/examples/triface/protocol.h index 0c250076..8075bc87 100644 --- a/examples/triface/protocol.h +++ b/examples/triface/protocol.h @@ -33,8 +33,6 @@ * * \brief Implementation of the command protocol between the board and the host * - * \version $Id$ - * * \author Marco Benelli */ diff --git a/examples/triface/triface.c b/examples/triface/triface.c index 3707aaa5..c64b6ceb 100644 --- a/examples/triface/triface.c +++ b/examples/triface/triface.c @@ -31,8 +31,6 @@ * * --> * - * \version $Id$ - * * \author Marco Benelli * \author Bernie Innocenti * \author Daniele Basile -- 2.25.1