X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fbuzzer.c;h=940bad6a8a2acef0bb78182f5fa8884d20fe8695;hb=f4c89bc436e098ec88d46c1cf57f134814f35ee3;hp=6f91a7e7bb09306fc1a5b3f1e80a653580ecb418;hpb=ab6edea3c046f969d2a0075625cbd8106a30d848;p=bertos.git

diff --git a/drv/buzzer.c b/drv/buzzer.c
index 6f91a7e7..940bad6a 100755
--- a/drv/buzzer.c
+++ b/drv/buzzer.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
@@ -12,10 +12,29 @@
  *
  * \version $Id$
  * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Francesco Sacchi <batt@develer.com>
  */
 
 /*#*
  *#* $Log$
+ *#* Revision 1.19  2006/07/19 12:56:25  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.18  2006/02/17 21:15:25  bernie
+ *#* Add MOD_CHECK() checks.
+ *#*
+ *#* Revision 1.17  2006/02/10 12:30:18  bernie
+ *#* Push interrupt protection inside hw module.
+ *#*
+ *#* 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.
  *#*
@@ -34,54 +53,13 @@
 
 #include "buzzer.h"
 
+#include <hw_buzzer.h>
 #include <drv/timer.h>
-#include <mware/event.h>
-
-#include <macros.h> /* BV() */
-#include <debug.h>
-#include <hw.h>
-#include <arch_config.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 */
-
-	#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>
+#include <cfg/module.h>
 
 
 /* Local vars */
@@ -91,7 +69,7 @@ static mtime_t buz_repeat_interval;
 static mtime_t buz_repeat_duration;
 
 
-/*!
+/**
  * Turn off buzzer, called by software timer
  */
 static void buz_softint(void)
@@ -102,7 +80,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
@@ -112,7 +90,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
@@ -120,7 +98,7 @@ static void buz_softint(void)
 }
 
 
-/*!
+/**
  * Beep for the specified ms time
  */
 void buz_beep(mtime_t time)
@@ -137,14 +115,14 @@ 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);
 }
 
 
-/*!
+/**
  * Start buzzer repetition
  */
 void buz_repeat_start(mtime_t duration, mtime_t interval)
@@ -155,7 +133,7 @@ void buz_repeat_start(mtime_t duration, mtime_t interval)
 }
 
 
-/*!
+/**
  * Stop buzzer repetition
  */
 void buz_repeat_stop(void)
@@ -176,14 +154,19 @@ void buz_repeat_stop(void)
 	IRQ_RESTORE(flags);
 }
 
+MOD_DEFINE(buzzer)
 
-/*!
- * Initialize buzzer
+/**
+ * Initialize buzzer.
  */
 void buz_init(void)
 {
-	BUZZER_INIT;
+	MOD_CHECK(timer);
+
+	BUZZER_HW_INIT;
+
+	/* Init software interrupt. */
+	timer_set_event_softint(&buz_timer, (Hook)buz_softint, 0);
 
-	/* Inizializza software interrupt */
-	event_initSoftInt(&buz_timer.expire, (Hook)buz_softint, 0);
+	MOD_INIT(buzzer);
 }