DISABLE_INTS/ENABLE_INTS: Convert to IRQ_DISABLE/IRQ_ENABLE.

[bertos.git] / drv / buzzer.c

diff --git a/drv/buzzer.c b/drv/buzzer.c
index 1f8f15d9c3e752549438f85cb3b102a7ec1ce364..1d2c6e12bb2d07768a89e40849e014054b6399d7 100755 (executable)
--- a/drv/buzzer.c
+++ b/drv/buzzer.c
@@ -1,20 +1,30 @@
 /*!
  * \file
  * <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999,2003 Bernardo Innocenti <bernie@develer.com>
+ * 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.
  * -->
  *
  * \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.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.
+ *#*
  *#* Revision 1.8  2004/08/25 14:12:08  rasky
  *#* Aggiornato il comment block dei log RCS
  *#*
@@ -41,8 +51,8 @@
 #include "buzzer.h"
 
 #include <drv/timer.h>
-#include <drv/kdebug.h>
 #include <kern/event.h>
+#include <debug.h>
 #include <hw.h>
 #include <arch_config.h>
 
@@ -61,7 +71,9 @@
 
 #elif defined(__AVR__)
 
-       #define IS_BUZZER_ON  (PORTG & BV(PORTG0))
+       #include <avr/io.h>
+
+       #define IS_BUZZER_ON  (PORTG & BV(PG0))
 
        /*!
         * Buzzer manipulation macros
@@ -74,7 +86,7 @@
        do { \
                cpuflags_t _flags; \
                DISABLE_IRQSAVE(_flags); \
-               PORTG |= BV(PORTG0); \
+               PORTG |= BV(PG0); \
                ENABLE_IRQRESTORE(_flags); \
        } while (0)
 
@@ -82,7 +94,7 @@
        do { \
                cpuflags_t _flags; \
                DISABLE_IRQSAVE(_flags); \
-               PORTG &= ~BV(PORTG0); \
+               PORTG &= ~BV(PG0); \
                ENABLE_IRQRESTORE(_flags); \
        } while (0)
 
@@ -90,8 +102,8 @@
        do { \
                cpuflags_t _flags; \
                DISABLE_IRQSAVE(_flags); \
-               PORTG &= ~BV(PORTG0); \
-               DDRG |= BV(PORTG0); \
+               PORTG &= ~BV(PG0); \
+               DDRG |= BV(PG0); \
                ENABLE_IRQRESTORE(_flags); \
        } while (0)
 
@@ -108,8 +120,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;
 
 
 /*!
@@ -144,7 +156,7 @@ 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;
 
@@ -168,7 +180,7 @@ void buz_beep(time_t time)
 /*!
  * 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;