/*
* $Log$
+ * 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.
*
#include "hw.h"
#include "kdebug.h"
#include "timer.h"
+#include CPU_HEADER(timer)
#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
#include <kern/proc.h>
#endif
-#if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
- #error To be recoded
-#elif defined(__AVR__)
- #include "timer_avr.h"
-#elif defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__) /* 80C196 */
- #include "timer_i196.h"
-#elif defined (__m56800__)
- #include "timer_dsp56k.h"
-#else
- #error Unknown system
-#endif
-
-
//! Master system clock (1ms accuracy)
volatile time_t _clock;
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 */