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

diff --git a/drv/timer.c b/drv/timer.c
index 5a62332f..e0208b88 100755
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -14,6 +14,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.23  2004/12/13 12:07:06  bernie
+ *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
+ *#*
+ *#* Revision 1.22  2004/12/08 09:12:09  bernie
+ *#* Rename time_t to mtime_t.
+ *#*
+ *#* 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 +87,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
 
@@ -99,7 +126,7 @@
 
 
 //! Master system clock (1ms accuracy)
-volatile time_t _clock;
+volatile mtime_t _clock;
 
 
 #ifndef CONFIG_TIMER_DISABLE_EVENTS
@@ -122,7 +149,7 @@ void timer_add(Timer *timer)
 	Timer *node;
 	cpuflags_t flags;
 
-	DISABLE_IRQSAVE(flags);
+	IRQ_SAVE_DISABLE(flags);
 
 	/* Calculate expiration time for this timer */
 	timer->tick = _clock + timer->delay;
@@ -148,19 +175,16 @@ void timer_add(Timer *timer)
 	/* Enqueue timer request into the list */
 	INSERTBEFORE(&timer->link, &node->link);
 
-	ENABLE_IRQRESTORE(flags);
+	IRQ_RESTORE(flags);
 }
 
 
 /*!
- * Remove a timer from the timer queue before it has expired
+ * Remove a timer from the timer queue before it has expired.
  */
 Timer *timer_abort(Timer *timer)
 {
-	cpuflags_t flags;
-	DISABLE_IRQSAVE(flags);
-	REMOVE(&timer->link);
-	ENABLE_IRQRESTORE(flags);
+	ATOMIC(REMOVE(&timer->link));
 
 	return timer;
 }
@@ -169,9 +193,9 @@ Timer *timer_abort(Timer *timer)
 
 
 /*!
- * Wait for the specified amount of time (expressed in ms)
+ * Wait for the specified amount of time (expressed in ms).
  */
-void timer_delay(time_t time)
+void timer_delay(mtime_t time)
 {
 #if defined(IRQ_GETSTATE)
 	/* We shouldn't sleep with interrupts disabled */
@@ -189,10 +213,15 @@ void timer_delay(time_t time)
 
 #else /* !CONFIG_KERN_SIGNALS */
 
-	time_t start = timer_ticks();
+	mtime_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 */
 }
@@ -200,7 +229,7 @@ void timer_delay(time_t time)
 
 #ifndef CONFIG_TIMER_DISABLE_UDELAY
 /*!
- * Wait for the specified amount of time (expressed in microseconds)
+ * Wait for the specified amount of time (expressed in microseconds).
  *
  * \bug In AVR arch the maximum amount of time that can be used as
  *      delay could be very limited, depending on the hardware timer
@@ -286,7 +315,7 @@ void timer_init(void)
 	TIMER_STROBE_INIT;
 
 #ifndef CONFIG_TIMER_DISABLE_EVENTS
-	INITLIST(&timers_queue);
+	LIST_INIT(&timers_queue);
 #endif
 
 	_clock = 0;