X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer.c;h=c347deb56608c669029990f6c20a27f22878fc07;hb=1f9a4aef45e0bf55a31bf88a828ebd867cf32a34;hp=0621336856fb561587d4d7ea00a68ae2f4be7ad0;hpb=1da31e2b251edb8174ea591b67da33b1ac27b554;p=bertos.git

diff --git a/drv/timer.c b/drv/timer.c
index 06213368..c347deb5 100755
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -1,7 +1,7 @@
 /*!
  * \file
  * <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernardo Innocenti <bernie@develer.com>
  * This file is part of DevLib - See devlib/README for information.
  * -->
@@ -13,55 +13,64 @@
  * \brief Hardware independent timer driver (implementation)
  */
 
-/*
- * $Log$
- * Revision 1.9  2004/07/21 00:15:13  bernie
- * Put timer driver on diet.
- *
- * Revision 1.8  2004/07/18 21:57:07  bernie
- * Fix preprocessor warning with potentially undefined symbol.
- *
- * 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:56:55  aleph
- * Some tabs cleanup and add timer strobe macros
- *
- * Revision 1.4  2004/06/06 18:25:44  bernie
- * Rename event macros to look like regular functions.
- *
- * Revision 1.3  2004/06/06 17:18:42  bernie
- * Fix \!CONFIG_KERN_SIGNALS code paths.
- *
- * Revision 1.2  2004/06/03 11:27:09  bernie
- * Add dual-license information.
- *
- * Revision 1.1  2004/05/23 18:23:30  bernie
- * Import drv/timer module.
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.16  2004/10/03 18:48:01  bernie
+ *#* timer_delay(): Add a sanity check to avoid sleeping forever.
+ *#*
+ *#* Revision 1.15  2004/09/14 21:07:18  bernie
+ *#* Use debug.h instead of kdebug.h.
+ *#*
+ *#* Revision 1.14  2004/08/25 14:12:08  rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.13  2004/08/10 06:59:09  bernie
+ *#* timer_gettick(): Rename to timer_ticks() and add backwards compatibility inline.
+ *#*
+ *#* Revision 1.12  2004/08/08 05:59:37  bernie
+ *#* Remove a few useless casts.
+ *#*
+ *#* Revision 1.11  2004/08/02 20:20:29  aleph
+ *#* Merge from project_ks
+ *#*
+ *#* Revision 1.10  2004/07/30 14:15:53  rasky
+ *#* Nuovo supporto unificato per detect della CPU
+ *#*
+ *#* Revision 1.9  2004/07/21 00:15:13  bernie
+ *#* Put timer driver on diet.
+ *#*
+ *#* Revision 1.8  2004/07/18 21:57:07  bernie
+ *#* Fix preprocessor warning with potentially undefined symbol.
+ *#*
+ *#* 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:56:55  aleph
+ *#* Some tabs cleanup and add timer strobe macros
+ *#*
+ *#* Revision 1.4  2004/06/06 18:25:44  bernie
+ *#* Rename event macros to look like regular functions.
+ *#*
+ *#* Revision 1.3  2004/06/06 17:18:42  bernie
+ *#* Fix \!CONFIG_KERN_SIGNALS code paths.
+ *#*
+ *#* Revision 1.2  2004/06/03 11:27:09  bernie
+ *#* Add dual-license information.
+ *#*
+ *#* Revision 1.1  2004/05/23 18:23:30  bernie
+ *#* Import drv/timer module.
+ *#*
+ *#*/
 
-#include "hw.h"
-#include "kdebug.h"
 #include "timer.h"
+#include <cpu.h>
+#include CPU_HEADER(timer)
+#include <debug.h>
 
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 	#include <kern/proc.h>
 #endif
 
-#if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
-	#error To be recoded
-#elif defined(__AVR__)
-	#include "timer_avr.h"
-#elif defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__) /* 80C196 */
-	#include "timer_i196.h"
-#elif defined (__m56800__)
-	#include "timer_dsp56k.h"
-#else
-	#error Unknown system
-#endif
-
-
 //! Master system clock (1ms accuracy)
 volatile time_t _clock;
 
@@ -97,7 +106,7 @@ void timer_add(Timer *timer)
 	node = (Timer *)timers_queue.head;
 	while (node->link.succ)
 	{
-		/* Stop just after the insert point */
+		/* Stop just after the insertion point */
 		if (node->tick > timer->tick)
 			break;
 
@@ -106,7 +115,7 @@ void timer_add(Timer *timer)
 	}
 
 	/* Enqueue timer request into the list */
-	INSERTBEFORE((Node *)timer, (Node *)node);
+	INSERTBEFORE(&timer->link, &node->link);
 
 	ENABLE_IRQRESTORE(flags);
 }
@@ -119,7 +128,7 @@ Timer *timer_abort(Timer *timer)
 {
 	cpuflags_t flags;
 	DISABLE_IRQSAVE(flags);
-	REMOVE((Node *)timer);
+	REMOVE(&timer->link);
 	ENABLE_IRQRESTORE(flags);
 
 	return timer;
@@ -133,6 +142,11 @@ Timer *timer_abort(Timer *timer)
  */
 void timer_delay(time_t time)
 {
+#if defined(IRQ_GETSTATE)
+	/* We shouldn't sleep with interrupts disabled */
+	ASSERT(IRQ_GETSTATE());
+#endif
+
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 	Timer t;
 
@@ -144,10 +158,10 @@ void timer_delay(time_t time)
 
 #else /* !CONFIG_KERN_SIGNALS */
 
-	time_t start = timer_gettick();
+	time_t start = timer_ticks();
 
 	/* Busy wait */
-	while (timer_gettick() - start < time) { /* nop */ }
+	while (timer_ticks() - start < time) { /* nop */ }
 
 #endif /* !CONFIG_KERN_SIGNALS */
 }
@@ -163,7 +177,7 @@ void timer_delay(time_t time)
  */
 void timer_udelay(utime_t usec_delay)
 {
-	if (usec_delay > 1000)
+	if (UNLIKELY(usec_delay > 1000))
 	{
 		timer_delay(usec_delay / 1000);
 		usec_delay %= 1000;
@@ -222,10 +236,10 @@ DEFINE_TIMER_ISR
 			break;
 
 		/* Retreat the expired timer */
-		REMOVE((Node *)timer);
+		REMOVE(&timer->link);
 
 		/* Execute the associated event */
-		event_doIntr(&timer->expire);
+		event_do(&timer->expire);
 	}
 #endif /* CONFIG_TIMER_DISABLE_EVENTS */