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

diff --git a/drv/timer.c b/drv/timer.c
index 06213368..b2caf90d 100755
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -15,6 +15,18 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -44,24 +56,12 @@
 #include "hw.h"
 #include "kdebug.h"
 #include "timer.h"
+#include CPU_HEADER(timer)
 
 #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 +97,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 +106,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 +119,7 @@ Timer *timer_abort(Timer *timer)
 {
 	cpuflags_t flags;
 	DISABLE_IRQSAVE(flags);
-	REMOVE((Node *)timer);
+	REMOVE(&timer->link);
 	ENABLE_IRQRESTORE(flags);
 
 	return timer;
@@ -144,10 +144,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 +163,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 +222,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 */