X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer.c;h=d75f15abcf85324e525444bd3ad060404f196c56;hb=4bef9e1478a89338bece87b04c3872e76b64068e;hp=4ace035cdac9875ba5df10119a7892e34c70fac9;hpb=32d1445272120a254d77ce8d1af1f527da7a2c17;p=bertos.git

diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c
index 4ace035c..d75f15ab 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.
@@ -286,15 +286,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;
@@ -345,9 +360,6 @@ DEFINE_TIMER_ISR
 
 	TIMER_STROBE_ON;
 
-	/* Perform hw IRQ handling */
-	timer_hw_irq();
-
 	/* Update the master ms counter */
 	++_clock;
 
@@ -358,6 +370,9 @@ DEFINE_TIMER_ISR
 		timer_poll(&timers_queue);
 	#endif
 
+	/* Perform hw IRQ handling */
+	timer_hw_irq();
+
 	TIMER_STROBE_OFF;
 }