X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=bertos%2Fdrv%2Ftimer.c;h=91784f9a8c96a2a033cfe0a4846a6bc2cd361f12;hb=f248bd5d8be37c741ef62386d82e4975723e09c3;hp=dfc27aefb53ccee74c8edaa141052e0b98010ee5;hpb=62c64455f33dd53639f04d35014ef5e50f9acd50;p=bertos.git

diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c
index dfc27aef..91784f9a 100644
--- a/bertos/drv/timer.c
+++ b/bertos/drv/timer.c
@@ -52,7 +52,7 @@
 #include <cpu/irq.h>
 #include <cpu/power.h> // cpu_relax()
 
-#include <kern/preempt.h> // proc_decQuantun()
+#include <kern/proc_p.h> // proc_decQuantun()
 
 /*
  * Include platform-specific binding code if we're hosted.
@@ -252,14 +252,13 @@ void timer_delayTicks(ticks_t delay)
 
 #if CONFIG_KERN_SIGNALS
 	Timer t;
-
+	DB(t.magic = TIMER_MAGIC_INACTIVE;)
 	if (proc_preemptAllowed())
 	{
-		ASSERT(!sig_check(SIG_SINGLE));
-		timer_setSignal(&t, proc_current(), SIG_SINGLE);
+		timer_setEvent(&t);
 		timer_setDelay(&t, delay);
 		timer_add(&t);
-		sig_wait(SIG_SINGLE);
+		timer_waitEvent(&t);
 	}
 	else
 #endif /* !CONFIG_KERN_SIGNALS */
@@ -286,15 +285,30 @@ void timer_busyWait(hptime_t delay)
 	hptime_t now, prev = timer_hw_hpread();
 	hptime_t delta;
 
-	for(;;)
+	for (;;)
 	{
 		now = timer_hw_hpread();
 		/*
-		 * We rely on hptime_t being unsigned here to
-		 * reduce the modulo to an AND in the common
-		 * case of TIMER_HW_CNT.
+		 * The timer counter may wrap here and "prev" can become
+		 * greater than "now". So, be sure to always evaluate a
+		 * coherent timer difference:
+		 *
+		 * 0     prev            now   TIMER_HW_CNT
+		 * |_____|_______________|_____|
+		 *        ^^^^^^^^^^^^^^^
+		 * delta = now - prev
+		 *
+		 * 0     now             prev  TIMER_HW_CNT
+		 * |_____|_______________|_____|
+		 *  ^^^^^                 ^^^^^
+		 * delta = (TIMER_HW_CNT - prev) + now
+		 *
+		 * NOTE: TIMER_HW_CNT can be any value, not necessarily a power
+		 * of 2. For this reason the "%" operator is not suitable for
+		 * the generic case.
 		 */
-		delta = (now - prev) % TIMER_HW_CNT;
+		delta = (now < prev) ? ((hptime_t)TIMER_HW_CNT - prev + now) :
+						(now - prev);
 		if (delta >= delay)
 			break;
 		delay -= delta;
@@ -357,7 +371,7 @@ DEFINE_TIMER_ISR
 
 	/* Perform hw IRQ handling */
 	timer_hw_irq();
-	
+
 	TIMER_STROBE_OFF;
 }