Add and cleanup comments

[bertos.git] / drv / buzzer.c

diff --git a/drv/buzzer.c b/drv/buzzer.c
index e5bedfd04c0806d0b89d76eee2b6cb514f43ccba..a3e71d99a6697c0da6df9391aea3fb6f221de8ed 100755 (executable)
--- a/drv/buzzer.c
+++ b/drv/buzzer.c
@@ -15,6 +15,15 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -37,23 +46,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); \
@@ -61,7 +70,7 @@
                ENABLE_IRQRESTORE(_flags); \
        } while (0)
 
-#      define BUZZER_OFF \
+       #define BUZZER_OFF \
        do { \
                cpuflags_t _flags; \
                DISABLE_IRQSAVE(_flags); \
@@ -69,7 +78,7 @@
                ENABLE_IRQRESTORE(_flags); \
        } while (0)
 
-#      define BUZZER_INIT \
+       #define BUZZER_INIT \
        do { \
                cpuflags_t _flags; \
                DISABLE_IRQSAVE(_flags); \
@@ -80,16 +89,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;
@@ -106,8 +115,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 +125,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;
@@ -134,15 +143,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);
 }
@@ -170,7 +179,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;
        }
 
@@ -189,7 +198,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);
 }