X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fbuzzer.c;h=1f8f15d9c3e752549438f85cb3b102a7ec1ce364;hb=9250b166f2d62d6e38bca6cea5c6210266a12128;hp=cb722398a5ebd1da4d04377f8f27982e15b1f4d9;hpb=0375780817109b6ab5cd4f36ccf80650b2fe77d5;p=bertos.git diff --git a/drv/buzzer.c b/drv/buzzer.c index cb722398..1f8f15d9 100755 --- a/drv/buzzer.c +++ b/drv/buzzer.c @@ -1,9 +1,9 @@ /*! * \file * * * \version $Id$ @@ -13,33 +13,38 @@ * \brief Buzzer driver */ -/* - * $Log$ - * Revision 1.1 2004/05/23 18:10:11 bernie - * Import drv/ modules. - * - * Revision 1.5 2004/04/04 17:44:51 aleph - * Move event.h from mware to kern dir - * - * Revision 1.4 2004/03/24 15:03:45 bernie - * Use explicit include paths; clean Doxygen comments - * - * Revision 1.3 2004/03/03 18:27:44 bernie - * Fixed race conds with IRQ when fiddling with I/O ports - * - * Revision 1.2 2003/12/18 18:15:24 aleph - * Use new IRQ disable/enable reentrant macros - * - * Revision 1.1 2003/12/13 23:53:37 aleph - * Add buzzer driver - * - */ +/*#* + *#* $Log$ + *#* Revision 1.8 2004/08/25 14:12:08 rasky + *#* Aggiornato il comment block dei log RCS + *#* + *#* Revision 1.7 2004/08/24 16:53:43 bernie + *#* Add missing headers. + *#* + *#* Revision 1.6 2004/06/07 18:10:06 aleph + *#* Remove free pool of timers; use user-provided Timer structure instead + *#* + *#* Revision 1.5 2004/06/07 15:54:23 aleph + *#* Update to new event.h naming + *#* + *#* Revision 1.4 2004/06/06 16:09:22 bernie + *#* Reformat (from project_ks). + *#* + *#* 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. + *#* + *#*/ -#include "hw.h" -#include "kdebug.h" -#include "timer.h" #include "buzzer.h" + +#include +#include #include +#include +#include #if (ARCH & ARCH_EMUL) @@ -49,23 +54,23 @@ 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)) + #define IS_BUZZER_ON (PORTG & BV(PORTG0)) - /** + /*! * 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 \ + #define BUZZER_ON \ do { \ cpuflags_t _flags; \ DISABLE_IRQSAVE(_flags); \ @@ -73,7 +78,7 @@ ENABLE_IRQRESTORE(_flags); \ } while (0) -# define BUZZER_OFF \ + #define BUZZER_OFF \ do { \ cpuflags_t _flags; \ DISABLE_IRQSAVE(_flags); \ @@ -81,7 +86,7 @@ ENABLE_IRQRESTORE(_flags); \ } while (0) -# define BUZZER_INIT \ + #define BUZZER_INIT \ do { \ cpuflags_t _flags; \ DISABLE_IRQSAVE(_flags); \ @@ -92,16 +97,16 @@ #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; @@ -118,8 +123,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; @@ -128,8 +133,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; @@ -146,15 +151,15 @@ void buz_beep(time_t time) /* 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); } @@ -182,7 +187,7 @@ void buz_repeat_stop(void) /* 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; } @@ -201,7 +206,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); }