X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fbuzzer.c;h=a3e71d99a6697c0da6df9391aea3fb6f221de8ed;hb=18a2224fc3265deda8bc692a66bcbe489bc1837a;hp=d0df8fc1c7dab3d05639aef68737be9c6b016d3b;hpb=3605c2189ab724bceedc302538feb01cc0083de2;p=bertos.git

diff --git a/drv/buzzer.c b/drv/buzzer.c
index d0df8fc1..a3e71d99 100755
--- a/drv/buzzer.c
+++ b/drv/buzzer.c
@@ -15,6 +15,12 @@
 
 /*
  * $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).
  *
@@ -92,7 +98,7 @@
 
 
 /* Local vars */
-static Timer *buz_timer;
+static Timer buz_timer;
 static bool buz_timer_running;
 static time_t buz_repeat_interval;
 static time_t buz_repeat_duration;
@@ -109,8 +115,8 @@ static void buz_softint(void)
 		if (buz_repeat_interval)
 		{
 			/* Wait for interval time */
-			buz_timer->delay = buz_repeat_interval;
-			timer_add(buz_timer);
+			buz_timer.delay = buz_repeat_interval;
+			timer_add(&buz_timer);
 		}
 		else
 			buz_timer_running = false;
@@ -119,8 +125,8 @@ static void buz_softint(void)
 	{
 		/* Wait for beep time */
 		BUZZER_ON;
-		buz_timer->delay = buz_repeat_duration;
-		timer_add(buz_timer);
+		buz_timer.delay = buz_repeat_duration;
+		timer_add(&buz_timer);
 	}
 	else
 		buz_timer_running = false;
@@ -137,15 +143,15 @@ void buz_beep(time_t time)
 	/* Remove the software interrupt if it was already queued */
 	DISABLE_IRQSAVE(flags);
 	if (buz_timer_running)
-		timer_abort(buz_timer);
+		timer_abort(&buz_timer);
 
 	/* Turn on buzzer */
 	BUZZER_ON;
 
 	/* Add software interrupt to turn the buzzer off later */
 	buz_timer_running = true;
-	buz_timer->delay = time;
-	timer_add(buz_timer);
+	buz_timer.delay = time;
+	timer_add(&buz_timer);
 
 	ENABLE_IRQRESTORE(flags);
 }
@@ -173,7 +179,7 @@ void buz_repeat_stop(void)
 	/* Remove the software interrupt if it was already queued */
 	if (buz_timer_running)
 	{
-		timer_abort(buz_timer);
+		timer_abort(&buz_timer);
 		buz_timer_running = false;
 	}
 
@@ -192,7 +198,5 @@ void buz_init(void)
 	BUZZER_INIT;
 
 	/* Inizializza software interrupt */
-	buz_timer = timer_new();
-	ASSERT(buz_timer != NULL);
-	INITEVENT_INT(&buz_timer->expire, (Hook)buz_softint, 0);
+	event_initSoftInt(&buz_timer.expire, (Hook)buz_softint, 0);
 }