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

diff --git a/drv/timer.c b/drv/timer.c
index 5a62332f..60261e1f 100755
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -14,6 +14,12 @@
 
 /*#*
  *#* $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.
  *#*
@@ -75,8 +81,23 @@
 #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
 
@@ -192,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 */
 }
@@ -286,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;