X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fbuzzer.c;h=fd478a6b34db694e1120316573b0a0c2cc654b61;hb=13d2ba0a36c45317f42abc2567e5e59effe4691b;hp=89af625d9c281336092a492d73751e05e68f24d9;hpb=680ecaecd7ed77d044fbf333ce97e533b04bbfa3;p=bertos.git

diff --git a/drv/buzzer.c b/drv/buzzer.c
index 89af625d..fd478a6b 100755
--- a/drv/buzzer.c
+++ b/drv/buzzer.c
@@ -1,9 +1,9 @@
 /*!
  * \file
  * <!--
- * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * 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 devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \version $Id$
@@ -12,10 +12,23 @@
  *
  * \version $Id$
  * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Francesco Sacchi <batt@develer.com>
  */
 
 /*#*
  *#* $Log$
+ *#* Revision 1.16  2005/11/04 16:19:33  bernie
+ *#* buz_init(): Restore IRQ protection as in project_bko.
+ *#*
+ *#* Revision 1.15  2005/06/27 21:25:50  bernie
+ *#* Modularize hardware access; Port to new timer interface.
+ *#*
+ *#* 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.
  *#*
@@ -27,78 +40,18 @@
  *#*
  *#* 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 "buzzer.h"
-
-#include <drv/timer.h>
-#include <kern/event.h>
-#include <debug.h>
-#include <hw.h>
-#include <arch_config.h>
 
+#include <hw_buzzer.h>
+#include <drv/buzzer.h>
 
-#if (ARCH & ARCH_EMUL)
-
-	int Emul_IsBuzzerOn(void);
-	void Emul_BuzzerOn(void);
-	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())
-
-#elif defined(__AVR__)
-
-	#include <avr/io.h>
-
-	#define IS_BUZZER_ON  (PORTG & BV(PG0))
-
-	/*!
-	 * \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 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 */
+#include <drv/timer.h>
+#include <drv/sipo.h>
 
-	#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)
+#include <mware/event.h>
 
-#endif /* ARCH, __AVR__, __IAR_SYSTEM_ICC */
+#include <cfg/debug.h>
 
 
 /* Local vars */
@@ -119,7 +72,7 @@ static void buz_softint(void)
 		if (buz_repeat_interval)
 		{
 			/* Wait for interval time */
-			buz_timer.delay = buz_repeat_interval;
+			timer_setDelay(&buz_timer, ms_to_ticks(buz_repeat_interval));
 			timer_add(&buz_timer);
 		}
 		else
@@ -129,7 +82,7 @@ static void buz_softint(void)
 	{
 		/* Wait for beep time */
 		BUZZER_ON;
-		buz_timer.delay = buz_repeat_duration;
+		timer_setDelay(&buz_timer, ms_to_ticks(buz_repeat_duration));
 		timer_add(&buz_timer);
 	}
 	else
@@ -154,7 +107,7 @@ void buz_beep(mtime_t time)
 
 	/* Add software interrupt to turn the buzzer off later */
 	buz_timer_running = true;
-	buz_timer.delay = time;
+	timer_setDelay(&buz_timer, ms_to_ticks(time));
 	timer_add(&buz_timer);
 
 	IRQ_RESTORE(flags);
@@ -195,12 +148,17 @@ void buz_repeat_stop(void)
 
 
 /*!
- * Initialize buzzer
+ * Initialize buzzer.
  */
 void buz_init(void)
 {
-	BUZZER_INIT;
+	cpuflags_t flags;
+	IRQ_SAVE_DISABLE(flags);
+
+	BUZZER_HW_INIT;
+
+	IRQ_RESTORE(flags);
 
-	/* Inizializza software interrupt */
-	event_initSoftInt(&buz_timer.expire, (Hook)buz_softint, 0);
+	/* Init software interrupt. */
+	timer_set_event_softint(&buz_timer, (Hook)buz_softint, 0);
 }