X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fbuzzer.c;h=63cbc4a8c7c01694c0b5a0bee5b16005f06bcd39;hb=2535cb94ec2183791128f8bbd109ca69a960cf78;hp=dedc4fa81dc732fc242ea79d0fcfad789cf630e2;hpb=2a151186046dba77e2675e5efc7b675753c34916;p=bertos.git diff --git a/drv/buzzer.c b/drv/buzzer.c old mode 100755 new mode 100644 index dedc4fa8..63cbc4a8 --- a/drv/buzzer.c +++ b/drv/buzzer.c @@ -1,9 +1,34 @@ -/*! +/** * \file * * * \version $Id$ @@ -12,116 +37,64 @@ * * \version $Id$ * \author Bernardo Innocenti + * \author Francesco Sacchi */ /*#* *#* $Log$ - *#* Revision 1.10 2004/10/03 18:38:51 bernie - *#* Add missing AVR header; Fix header. + *#* Revision 1.19 2006/07/19 12:56:25 bernie + *#* Convert to new Doxygen style. *#* - *#* Revision 1.9 2004/09/14 21:01:25 bernie - *#* Use new AVR port pin names. + *#* Revision 1.18 2006/02/17 21:15:25 bernie + *#* Add MOD_CHECK() checks. *#* - *#* Revision 1.8 2004/08/25 14:12:08 rasky - *#* Aggiornato il comment block dei log RCS + *#* Revision 1.17 2006/02/10 12:30:18 bernie + *#* Push interrupt protection inside hw module. *#* - *#* Revision 1.7 2004/08/24 16:53:43 bernie - *#* Add missing headers. + *#* Revision 1.16 2005/11/04 16:19:33 bernie + *#* buz_init(): Restore IRQ protection as in project_bko. *#* - *#* Revision 1.6 2004/06/07 18:10:06 aleph - *#* Remove free pool of timers; use user-provided Timer structure instead + *#* Revision 1.15 2005/06/27 21:25:50 bernie + *#* Modularize hardware access; Port to new timer interface. *#* - *#* Revision 1.5 2004/06/07 15:54:23 aleph - *#* Update to new event.h naming + *#* Revision 1.14 2005/04/11 19:10:27 bernie + *#* Include top-level headers from cfg/ subdir. *#* - *#* Revision 1.4 2004/06/06 16:09:22 bernie - *#* Reformat (from project_ks). + *#* Revision 1.13 2005/02/18 11:20:15 bernie + *#* Use mware/event.h; Update copyright info. *#* - *#* Revision 1.3 2004/06/03 11:27:09 bernie - *#* Add dual-license information. + *#* Revision 1.12 2004/12/13 12:07:06 bernie + *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE. *#* - *#* Revision 1.2 2004/05/23 18:21:53 bernie - *#* Trim CVS logs and cleanup header info. + *#* 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 "buzzer.h" +#include #include -#include -#include -#include -#include - - -#if (ARCH & ARCH_EMUL) - - int Emul_IsBuzzerOn(void); - void Emul_BuzzerOn(void); - 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()) - -#elif defined(__AVR__) - - #include - - #define IS_BUZZER_ON (PORTG & BV(PG0)) - - /*! - * 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(PG0); \ - ENABLE_IRQRESTORE(_flags); \ - } while (0) - - #define BUZZER_OFF \ - do { \ - cpuflags_t _flags; \ - DISABLE_IRQSAVE(_flags); \ - PORTG &= ~BV(PG0); \ - ENABLE_IRQRESTORE(_flags); \ - } while (0) - - #define BUZZER_INIT \ - do { \ - cpuflags_t _flags; \ - DISABLE_IRQSAVE(_flags); \ - PORTG &= ~BV(PG0); \ - DDRG |= BV(PG0); \ - ENABLE_IRQRESTORE(_flags); \ - } while (0) - -#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) - -#endif /* ARCH, __AVR__, __IAR_SYSTEM_ICC */ + +#include + +#include +#include /* Local vars */ 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; -/*! +/** * Turn off buzzer, called by software timer */ static void buz_softint(void) @@ -132,7 +105,7 @@ static void buz_softint(void) if (buz_repeat_interval) { /* Wait for interval time */ - buz_timer.delay = buz_repeat_interval; + timer_setDelay(&buz_timer, ms_to_ticks(buz_repeat_interval)); timer_add(&buz_timer); } else @@ -142,7 +115,7 @@ static void buz_softint(void) { /* Wait for beep time */ BUZZER_ON; - buz_timer.delay = buz_repeat_duration; + timer_setDelay(&buz_timer, ms_to_ticks(buz_repeat_duration)); timer_add(&buz_timer); } else @@ -150,15 +123,15 @@ 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); @@ -167,17 +140,17 @@ void buz_beep(time_t time) /* Add software interrupt to turn the buzzer off later */ buz_timer_running = true; - buz_timer.delay = time; + timer_setDelay(&buz_timer, ms_to_ticks(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; @@ -185,13 +158,13 @@ void buz_repeat_start(time_t duration, time_t interval) } -/*! +/** * Stop buzzer repetition */ 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) @@ -203,17 +176,22 @@ void buz_repeat_stop(void) buz_repeat_interval = 0; BUZZER_OFF; - ENABLE_IRQRESTORE(flags); + IRQ_RESTORE(flags); } +MOD_DEFINE(buzzer) -/*! - * Initialize buzzer +/** + * Initialize buzzer. */ void buz_init(void) { - BUZZER_INIT; + MOD_CHECK(timer); + + BUZZER_HW_INIT; + + /* Init software interrupt. */ + timer_set_event_softint(&buz_timer, (Hook)buz_softint, 0); - /* Inizializza software interrupt */ - event_initSoftInt(&buz_timer.expire, (Hook)buz_softint, 0); + MOD_INIT(buzzer); }