Include top-level headers from cfg/ subdir.

[bertos.git] / drv / buzzer.c

diff --git a/drv/buzzer.c b/drv/buzzer.c
index 810dd8e889f5b9fb78adbad4665b317620f120c2..d0c0264f9ab9412ce7d43d85f286f7bf2797bde5 100755 (executable)
--- a/drv/buzzer.c
+++ b/drv/buzzer.c
@@ -1,47 +1,49 @@
 /*!
  * \file
  * <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999,2003 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 1999, 2003 Bernardo Innocenti <bernie@develer.com>
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \version $Id$
  *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \brief Buzzer driver (implementation)
  *
- * \brief Buzzer driver
+ * \version $Id$
+ * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*
- * $Log$
- * 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.
- *
- */
+/*#*
+ *#* $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 "buzzer.h"
 
 #include <drv/timer.h>
-#include <drv/kdebug.h>
-#include <kern/event.h>
+#include <mware/event.h>
+
+#include <cfg/macros.h> /* BV() */
+#include <cfg/debug.h>
 #include <hw.h>
-#include <arch_config.h>
+#include <cfg/arch_config.h>
 
 
 #if (ARCH & ARCH_EMUL)
@@ -58,39 +60,22 @@
 
 #elif defined(__AVR__)
 
-       #define IS_BUZZER_ON  (PORTG & BV(PORTG0))
+       #include <avr/io.h>
+
+       #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 */
 
@@ -105,8 +90,8 @@
 /* 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;
 
 
 /*!
@@ -141,12 +126,12 @@ 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);
 
@@ -158,14 +143,14 @@ void buz_beep(time_t time)
        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;
@@ -179,7 +164,7 @@ 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)
@@ -191,7 +176,7 @@ void buz_repeat_stop(void)
        buz_repeat_interval = 0;
        BUZZER_OFF;
 
-       ENABLE_IRQRESTORE(flags);
+       IRQ_RESTORE(flags);
 }