X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer.c;h=5a62332f1816656f8f09a41bc35a8038aebd0e64;hb=73037040c1e642ddc06f56ea0db6793d67d56023;hp=22512251278fb347f08890999bb40f1f0e136246;hpb=277b540c0764dd376dcf583acdc97a2b2fd3d8e6;p=bertos.git

diff --git a/drv/timer.c b/drv/timer.c
index 22512251..5a62332f 100755
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -1,20 +1,34 @@
 /*!
  * \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.
  * -->
  *
- * \version $Id$
+ * \brief Hardware independent timer driver (implementation)
  *
+ * \version $Id$
  * \author Bernardo Innocenti <bernie@develer.com>
- *
- * \brief Hardware independent timer driver (implementation)
  */
 
 /*#*
  *#* $Log$
+ *#* Revision 1.19  2004/10/19 08:56:49  bernie
+ *#* TIMER_STROBE_ON, TIMER_STROBE_OFF, TIMER_STROBE_INIT: Move from timer_avr.h to timer.h, where they really belong.
+ *#*
+ *#* Revision 1.18  2004/10/14 23:14:05  bernie
+ *#* Fix longstanding problem with wrap-arounds.
+ *#*
+ *#* Revision 1.17  2004/10/03 18:52:08  bernie
+ *#* Move \brief on top in header to please Doxygen.
+ *#*
+ *#* 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
  *#*
@@ -56,15 +70,34 @@
  *#*
  *#*/
 
-#include "hw.h"
-#include "kdebug.h"
 #include "timer.h"
+#include <cpu.h>
+#include <hw.h>
 #include CPU_HEADER(timer)
+#include <debug.h>
 
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 	#include <kern/proc.h>
 #endif
 
+
+/*!
+ * \def CONFIG_TIMER_STROBE
+ *
+ * This is a debug facility that can be used to
+ * monitor timer interrupt activity on an external pin.
+ *
+ * To use strobes, redefine the macros TIMER_STROBE_ON,
+ * TIMER_STROBE_OFF and TIMER_STROBE_INIT and set
+ * CONFIG_TIMER_STROBE to 1.
+ */
+#if !defined(CONFIG_TIMER_STROBE) || !CONFIG_TIMER_STROBE
+	#define TIMER_STROBE_ON    do {/*nop*/} while(0)
+	#define TIMER_STROBE_OFF   do {/*nop*/} while(0)
+	#define TIMER_STROBE_INIT  do {/*nop*/} while(0)
+#endif
+
+
 //! Master system clock (1ms accuracy)
 volatile time_t _clock;
 
@@ -94,14 +127,18 @@ void timer_add(Timer *timer)
 	/* Calculate expiration time for this timer */
 	timer->tick = _clock + timer->delay;
 
-	/* Search for the first node whose expiration time is
+	/*
+	 * Search for the first node whose expiration time is
 	 * greater than the timer we want to add.
 	 */
 	node = (Timer *)timers_queue.head;
 	while (node->link.succ)
 	{
-		/* Stop just after the insertion point */
-		if (node->tick > timer->tick)
+		/*
+		 * Stop just after the insertion point.
+		 * (this fancy compare takes care of wrap-arounds).
+		 */
+		if (node->tick - timer->tick > 0)
 			break;
 
 		/* Go to next node */
@@ -136,6 +173,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;