/*!
* \file
* <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
* Copyright 2000 Bernardo Innocenti <bernie@develer.com>
* This file is part of DevLib - See devlib/README for information.
* -->
* \brief Hardware independent timer driver (implementation)
*/
-/*
- * $Log$
- * Revision 1.10 2004/07/30 14:15:53 rasky
- * Nuovo supporto unificato per detect della CPU
- *
- * Revision 1.9 2004/07/21 00:15:13 bernie
- * Put timer driver on diet.
- *
- * Revision 1.8 2004/07/18 21:57:07 bernie
- * Fix preprocessor warning with potentially undefined symbol.
- *
- * Revision 1.6 2004/06/07 18:10:06 aleph
- * Remove free pool of timers; use user-provided Timer structure instead
- *
- * Revision 1.5 2004/06/07 15:56:55 aleph
- * Some tabs cleanup and add timer strobe macros
- *
- * Revision 1.4 2004/06/06 18:25:44 bernie
- * Rename event macros to look like regular functions.
- *
- * Revision 1.3 2004/06/06 17:18:42 bernie
- * Fix \!CONFIG_KERN_SIGNALS code paths.
- *
- * Revision 1.2 2004/06/03 11:27:09 bernie
- * Add dual-license information.
- *
- * Revision 1.1 2004/05/23 18:23:30 bernie
- * Import drv/timer module.
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.15 2004/09/14 21:07:18 bernie
+ *#* Use debug.h instead of kdebug.h.
+ *#*
+ *#* Revision 1.14 2004/08/25 14:12:08 rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.13 2004/08/10 06:59:09 bernie
+ *#* timer_gettick(): Rename to timer_ticks() and add backwards compatibility inline.
+ *#*
+ *#* Revision 1.12 2004/08/08 05:59:37 bernie
+ *#* Remove a few useless casts.
+ *#*
+ *#* Revision 1.11 2004/08/02 20:20:29 aleph
+ *#* Merge from project_ks
+ *#*
+ *#* Revision 1.10 2004/07/30 14:15:53 rasky
+ *#* Nuovo supporto unificato per detect della CPU
+ *#*
+ *#* Revision 1.9 2004/07/21 00:15:13 bernie
+ *#* Put timer driver on diet.
+ *#*
+ *#* Revision 1.8 2004/07/18 21:57:07 bernie
+ *#* Fix preprocessor warning with potentially undefined symbol.
+ *#*
+ *#* Revision 1.6 2004/06/07 18:10:06 aleph
+ *#* Remove free pool of timers; use user-provided Timer structure instead
+ *#*
+ *#* Revision 1.5 2004/06/07 15:56:55 aleph
+ *#* Some tabs cleanup and add timer strobe macros
+ *#*
+ *#* Revision 1.4 2004/06/06 18:25:44 bernie
+ *#* Rename event macros to look like regular functions.
+ *#*
+ *#* Revision 1.3 2004/06/06 17:18:42 bernie
+ *#* Fix \!CONFIG_KERN_SIGNALS code paths.
+ *#*
+ *#* Revision 1.2 2004/06/03 11:27:09 bernie
+ *#* Add dual-license information.
+ *#*
+ *#* Revision 1.1 2004/05/23 18:23:30 bernie
+ *#* Import drv/timer module.
+ *#*
+ *#*/
-#include "hw.h"
-#include "kdebug.h"
#include "timer.h"
+#include <cpu.h>
#include CPU_HEADER(timer)
+#include <debug.h>
#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
#include <kern/proc.h>
node = (Timer *)timers_queue.head;
while (node->link.succ)
{
- /* Stop just after the insert point */
+ /* Stop just after the insertion point */
if (node->tick > timer->tick)
break;
}
/* Enqueue timer request into the list */
- INSERTBEFORE((Node *)timer, (Node *)node);
+ INSERTBEFORE(&timer->link, &node->link);
ENABLE_IRQRESTORE(flags);
}
{
cpuflags_t flags;
DISABLE_IRQSAVE(flags);
- REMOVE((Node *)timer);
+ REMOVE(&timer->link);
ENABLE_IRQRESTORE(flags);
return timer;
#else /* !CONFIG_KERN_SIGNALS */
- time_t start = timer_gettick();
+ time_t start = timer_ticks();
/* Busy wait */
- while (timer_gettick() - start < time) { /* nop */ }
+ while (timer_ticks() - start < time) { /* nop */ }
#endif /* !CONFIG_KERN_SIGNALS */
}
*/
void timer_udelay(utime_t usec_delay)
{
- if (usec_delay > 1000)
+ if (UNLIKELY(usec_delay > 1000))
{
timer_delay(usec_delay / 1000);
usec_delay %= 1000;
break;
/* Retreat the expired timer */
- REMOVE((Node *)timer);
+ REMOVE(&timer->link);
/* Execute the associated event */
- event_doIntr(&timer->expire);
+ event_do(&timer->expire);
}
#endif /* CONFIG_TIMER_DISABLE_EVENTS */