* \brief Hardware independent timer driver (implementation)
*/
-/*
- * $Log$
- * 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.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_HEADER(timer)
-#ifdef CONFIG_KERN_SIGNALS
-#include <kern/proc.h>
-#endif
-
-#if (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
+#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
+ #include <kern/proc.h>
#endif
-
-/*! Number of available timers */
-#define MAX_TIMERS 4
-
-
//! Master system clock (1ms accuracy)
volatile time_t _clock;
-static Timer soft_timers[MAX_TIMERS]; /*!< Pool of Timer structures */
-static List timers_pool; /*!< Pool of free timers */
-REGISTER static List timers_queue; /*!< Active timers */
+#ifndef CONFIG_TIMER_DISABLE_EVENTS
/*!
- * Return a new timer picking and removing it from the available
- * timers pool. Return NULL if no more timers are available.
+ * List of active asynchronous timers.
*/
-Timer *timer_new(void)
-{
- Timer *timer;
- cpuflags_t flags;
-
- DISABLE_IRQSAVE(flags);
-
- /* Should never happen */
- if (ISLISTEMPTY(&timers_pool))
- {
- ENABLE_IRQRESTORE(flags);
- DB(kprintf("Tmrspool empty\n");)
- return NULL;
- }
-
- /* Get a timer from the free pool */
- timer = (Timer *)timers_pool.head;
- REMOVE((Node *)timer);
-
- ENABLE_IRQRESTORE(flags);
-
- return timer;
-}
-
-
-/*!
- * Delete a timer, putting it in the available timers queue.
- */
-void timer_delete(Timer *timer)
-{
- cpuflags_t flags;
- DISABLE_IRQSAVE(flags);
- ADDHEAD(&timers_pool, &timer->link);
- ENABLE_IRQRESTORE(flags);
-}
+REGISTER static List timers_queue;
/*!
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;
}
+#endif /* CONFIG_TIMER_DISABLE_EVENTS */
+
/*!
* Wait for the specified amount of time (expressed in ms)
#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 */
}
+#ifndef CONFIG_TIMER_DISABLE_UDELAY
/*!
* 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
+ * used. Check timer_avr.h, and what register is used as hptime_t.
*/
void timer_udelay(utime_t usec_delay)
{
- if (usec_delay > 1000)
+ if (UNLIKELY(usec_delay > 1000))
{
timer_delay(usec_delay / 1000);
usec_delay %= 1000;
while (timer_hw_hpread() - start < delay)
{}
}
+#endif /* CONFIG_TIMER_DISABLE_UDELAY */
/*!
*/
DEFINE_TIMER_ISR
{
- /* With the Metrowerks compiler, the only way to force the compiler generate
- an interrupt service routine is to put a pragma directive within the function
- body. */
+ /*
+ * With the Metrowerks compiler, the only way to force the compiler generate
+ * an interrupt service routine is to put a pragma directive within the function
+ * body.
+ */
#ifdef __MWERKS__
#pragma interrupt saveall
#endif
+#ifndef CONFIG_TIMER_DISABLE_EVENTS
Timer *timer;
+#endif
+
+ TIMER_STROBE_ON;
timer_hw_irq();
/* Update the master ms counter */
++_clock;
+#ifndef CONFIG_TIMER_DISABLE_EVENTS
/*
* Check the first timer request in the list and process
* it when it has expired. Repeat this check until the
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 */
+ TIMER_STROBE_OFF;
+}
/*!
*/
void timer_init(void)
{
- int i;
+ TIMER_STROBE_INIT;
+#ifndef CONFIG_TIMER_DISABLE_EVENTS
INITLIST(&timers_queue);
- INITLIST(&timers_pool);
-
- /* Init all software timers in the free pool */
- for (i = 0; i < MAX_TIMERS; i++)
- ADDTAIL(&timers_pool, (Node *)&soft_timers[i]);
+#endif
_clock = 0;
timer_hw_init();
}
-