X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer.c;h=60261e1f80328f928623947cdebfb53ed3502c45;hb=f530f9a7018684f5ad744076220f845ed7732244;hp=92152bc1059f6a1063a45d70c219ba72f300eacb;hpb=32a25be9d3f71b6e913c1e80d3678b19b9bed966;p=bertos.git

diff --git a/drv/timer.c b/drv/timer.c
index 92152bc1..60261e1f 100755
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -14,6 +14,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.21  2004/11/28 23:20:25  bernie
+ *#* Remove obsolete INITLIST macro.
+ *#*
+ *#* Revision 1.20  2004/11/16 20:59:06  bernie
+ *#* Add watchdog timer support.
+ *#*
+ *#* 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.
  *#*
@@ -66,13 +78,47 @@
 
 #include "timer.h"
 #include <cpu.h>
+#include <hw.h>
 #include CPU_HEADER(timer)
 #include <debug.h>
+#include <config.h>
 
-#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
+/*
+ * Sanity check for config parameters required by this module.
+ */
+#if !defined(CONFIG_KERNEL) || ((CONFIG_KERNEL != 0) && CONFIG_KERNEL != 1)
+	#error CONFIG_KERNEL must be set to either 0 or 1 in config.h
+#endif
+#if !defined(CONFIG_WATCHDOG) || ((CONFIG_WATCHDOG != 0) && CONFIG_WATCHDOG != 1)
+	#error CONFIG_WATCHDOG must be set to either 0 or 1 in config.h
+#endif
+
+#if CONFIG_WATCHDOG
+	#include <drv/wdt.h>
+#endif
+
+#if CONFIG_KERNEL && 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;
 
@@ -102,14 +148,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 */
@@ -163,7 +213,12 @@ void timer_delay(time_t time)
 	time_t start = timer_ticks();
 
 	/* Busy wait */
-	while (timer_ticks() - start < time) { /* nop */ }
+	while (timer_ticks() - start < time)
+	{
+#if CONFIG_WATCHDOG
+		wdt_reset();
+#endif
+	}
 
 #endif /* !CONFIG_KERN_SIGNALS */
 }
@@ -257,7 +312,7 @@ void timer_init(void)
 	TIMER_STROBE_INIT;
 
 #ifndef CONFIG_TIMER_DISABLE_EVENTS
-	INITLIST(&timers_queue);
+	LIST_INIT(&timers_queue);
 #endif
 
 	_clock = 0;