X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fbuzzer.c;h=89af625d9c281336092a492d73751e05e68f24d9;hb=c4c18f25df8d88b4dc8a9eb7a63940ea13fd59fa;hp=a3e71d99a6697c0da6df9391aea3fb6f221de8ed;hpb=27c90e14b9a2600bc38486f046187a7e690b24fb;p=bertos.git

diff --git a/drv/buzzer.c b/drv/buzzer.c
index a3e71d99..89af625d 100755
--- a/drv/buzzer.c
+++ b/drv/buzzer.c
@@ -1,42 +1,63 @@
 /*!
  * \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.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.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.
+ *#*
+ *#* 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 <drv/timer.h>
 #include <kern/event.h>
+#include <debug.h>
+#include <hw.h>
+#include <arch_config.h>
 
 
 #if (ARCH & ARCH_EMUL)
@@ -53,39 +74,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 */
 
@@ -100,8 +104,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;
 
 
 /*!
@@ -136,12 +140,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);
 
@@ -153,14 +157,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;
@@ -174,7 +178,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)
@@ -186,7 +190,7 @@ void buz_repeat_stop(void)
 	buz_repeat_interval = 0;
 	BUZZER_OFF;
 
-	ENABLE_IRQRESTORE(flags);
+	IRQ_RESTORE(flags);
 }