/*#*
*#* $Log$
+ *#* Revision 1.24 2005/04/11 19:10:28 bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* 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.
*#*
*#*/
#include "timer.h"
-#include <cpu.h>
+#include <cfg/cpu.h>
#include <hw.h>
#include CPU_HEADER(timer)
-#include <debug.h>
-#include <config.h>
+#include <cfg/debug.h>
+#include <cfg/config.h>
/*
* Sanity check for config parameters required by this module.
//! Master system clock (1ms accuracy)
-volatile time_t _clock;
+volatile mtime_t _clock;
#ifndef CONFIG_TIMER_DISABLE_EVENTS
Timer *node;
cpuflags_t flags;
- DISABLE_IRQSAVE(flags);
+ IRQ_SAVE_DISABLE(flags);
/* Calculate expiration time for this timer */
timer->tick = _clock + timer->delay;
/* 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;
}
/*!
- * 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 */
#else /* !CONFIG_KERN_SIGNALS */
- time_t start = timer_ticks();
+ mtime_t start = timer_ticks();
/* Busy wait */
while (timer_ticks() - start < 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
TIMER_STROBE_INIT;
#ifndef CONFIG_TIMER_DISABLE_EVENTS
- INITLIST(&timers_queue);
+ LIST_INIT(&timers_queue);
#endif
_clock = 0;