X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fbuzzer.c;h=d0c0264f9ab9412ce7d43d85f286f7bf2797bde5;hb=af9c555446161016fdd76c1cdff96ce76bb6cba2;hp=e5bedfd04c0806d0b89d76eee2b6cb514f43ccba;hpb=96f0ef786b54356c56cc3d4e4f0838df2505cfcc;p=bertos.git diff --git a/drv/buzzer.c b/drv/buzzer.c index e5bedfd0..d0c0264f 100755 --- a/drv/buzzer.c +++ b/drv/buzzer.c @@ -1,33 +1,49 @@ /*! * \file * * * \version $Id$ * - * \author Bernardo Innocenti + * \brief Buzzer driver (implementation) * - * \brief Buzzer driver + * \version $Id$ + * \author Bernardo Innocenti */ -/* - * $Log$ - * Revision 1.3 2004/06/03 11:27:09 bernie - * Add dual-license information. - * - * Revision 1.2 2004/05/23 18:21:53 bernie - * Trim CVS logs and cleanup header info. - * - */ +/*#* + *#* $Log$ + *#* Revision 1.14 2005/04/11 19:10:27 bernie + *#* Include top-level headers from cfg/ subdir. + *#* + *#* Revision 1.13 2005/02/18 11:20:15 bernie + *#* Use mware/event.h; Update copyright info. + *#* + *#* Revision 1.12 2004/12/13 12:07:06 bernie + *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE. + *#* + *#* Revision 1.11 2004/12/08 09:11:53 bernie + *#* Rename time_t to mtime_t. + *#* + *#* Revision 1.10 2004/10/03 18:38:51 bernie + *#* Add missing AVR header; Fix header. + *#* + *#* Revision 1.9 2004/09/14 21:01:25 bernie + *#* Use new AVR port pin names. + *#*/ -#include "hw.h" -#include "kdebug.h" -#include "timer.h" #include "buzzer.h" -#include + +#include +#include + +#include /* BV() */ +#include +#include +#include #if (ARCH & ARCH_EMUL) @@ -37,62 +53,45 @@ void Emul_BuzzerOff(void); void Emul_BuzzerInit(void); -# define IS_BUZZER_ON (Emul_IsBuzzerOn()) -# define BUZZER_ON (Emul_BuzzerOn()) -# define BUZZER_OFF (Emul_BuzzerOff()) -# define BUZZER_INIT (Emul_BuzzerInit()) + #define IS_BUZZER_ON (Emul_IsBuzzerOn()) + #define BUZZER_ON (Emul_BuzzerOn()) + #define BUZZER_OFF (Emul_BuzzerOff()) + #define BUZZER_INIT (Emul_BuzzerInit()) #elif defined(__AVR__) -# define IS_BUZZER_ON (PORTG & BV(PORTG0)) + #include + + #define IS_BUZZER_ON (PORTG & BV(PG0)) - /** - * Buzzer manipulation macros + /*! + * \name Buzzer manipulation macros. * * \note Some PORTG functions are being used from * interrupt code, so we must be careful to * avoid race conditions. + * \{ */ -# define BUZZER_ON \ - do { \ - cpuflags_t _flags; \ - DISABLE_IRQSAVE(_flags); \ - PORTG |= BV(PORTG0); \ - ENABLE_IRQRESTORE(_flags); \ - } while (0) - -# define BUZZER_OFF \ - do { \ - cpuflags_t _flags; \ - DISABLE_IRQSAVE(_flags); \ - PORTG &= ~BV(PORTG0); \ - ENABLE_IRQRESTORE(_flags); \ - } while (0) - -# define BUZZER_INIT \ - do { \ - cpuflags_t _flags; \ - DISABLE_IRQSAVE(_flags); \ - PORTG &= ~BV(PORTG0); \ - DDRG |= BV(PORTG0); \ - ENABLE_IRQRESTORE(_flags); \ - } while (0) + #define BUZZER_ON ATOMIC(PORTG |= BV(PG0)) + #define BUZZER_OFF ATOMIC(PORTG &= ~BV(PG0)) + #define BUZZER_INIT ATOMIC(PORTG &= ~BV(PG0); DDRG |= BV(PG0);) + /*\}*/ #elif defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__) /* 80C196 */ -# define IS_BUZZER_ON (cpld->Buzzer & 1) -# define BUZZER_ON (cpld->Buzzer = 1) -# define BUZZER_OFF (cpld->Buzzer = 0) -# define BUZZER_INIT (cpld->Buzzer = 0) + #define IS_BUZZER_ON (cpld->Buzzer & 1) + #define BUZZER_ON (cpld->Buzzer = 1) + #define BUZZER_OFF (cpld->Buzzer = 0) + #define BUZZER_INIT (cpld->Buzzer = 0) #endif /* ARCH, __AVR__, __IAR_SYSTEM_ICC */ /* Local vars */ -static Timer *buz_timer; +static Timer buz_timer; static bool buz_timer_running; -static time_t buz_repeat_interval; -static time_t buz_repeat_duration; +static mtime_t buz_repeat_interval; +static mtime_t buz_repeat_duration; /*! @@ -106,8 +105,8 @@ static void buz_softint(void) if (buz_repeat_interval) { /* Wait for interval time */ - buz_timer->delay = buz_repeat_interval; - timer_add(buz_timer); + buz_timer.delay = buz_repeat_interval; + timer_add(&buz_timer); } else buz_timer_running = false; @@ -116,8 +115,8 @@ static void buz_softint(void) { /* Wait for beep time */ BUZZER_ON; - buz_timer->delay = buz_repeat_duration; - timer_add(buz_timer); + buz_timer.delay = buz_repeat_duration; + timer_add(&buz_timer); } else buz_timer_running = false; @@ -127,31 +126,31 @@ static void buz_softint(void) /*! * Beep for the specified ms time */ -void buz_beep(time_t time) +void buz_beep(mtime_t time) { cpuflags_t flags; + IRQ_SAVE_DISABLE(flags); /* Remove the software interrupt if it was already queued */ - DISABLE_IRQSAVE(flags); if (buz_timer_running) - timer_abort(buz_timer); + timer_abort(&buz_timer); /* Turn on buzzer */ BUZZER_ON; /* Add software interrupt to turn the buzzer off later */ buz_timer_running = true; - buz_timer->delay = time; - timer_add(buz_timer); + buz_timer.delay = time; + timer_add(&buz_timer); - ENABLE_IRQRESTORE(flags); + IRQ_RESTORE(flags); } /*! * Start buzzer repetition */ -void buz_repeat_start(time_t duration, time_t interval) +void buz_repeat_start(mtime_t duration, mtime_t interval) { buz_repeat_interval = interval; buz_repeat_duration = duration; @@ -165,19 +164,19 @@ void buz_repeat_start(time_t duration, time_t interval) void buz_repeat_stop(void) { cpuflags_t flags; - DISABLE_IRQSAVE(flags); + IRQ_SAVE_DISABLE(flags); /* Remove the software interrupt if it was already queued */ if (buz_timer_running) { - timer_abort(buz_timer); + timer_abort(&buz_timer); buz_timer_running = false; } buz_repeat_interval = 0; BUZZER_OFF; - ENABLE_IRQRESTORE(flags); + IRQ_RESTORE(flags); } @@ -189,7 +188,5 @@ void buz_init(void) BUZZER_INIT; /* Inizializza software interrupt */ - buz_timer = timer_new(); - ASSERT(buz_timer != NULL); - INITEVENT_INT(&buz_timer->expire, (Hook)buz_softint, 0); + event_initSoftInt(&buz_timer.expire, (Hook)buz_softint, 0); }