/*#*
*#* $Log$
+ *#* 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.
+ *#*
*#* Revision 1.18 2004/10/14 23:14:05 bernie
*#* Fix longstanding problem with wrap-arounds.
*#*
#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;
+volatile mtime_t _clock;
#ifndef CONFIG_TIMER_DISABLE_EVENTS
/*!
* 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 */
#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 */
}
TIMER_STROBE_INIT;
#ifndef CONFIG_TIMER_DISABLE_EVENTS
- INITLIST(&timers_queue);
+ LIST_INIT(&timers_queue);
#endif
_clock = 0;