Fix spacing

[bertos.git] / drv / timer.c

diff --git a/drv/timer.c b/drv/timer.c
index 0bd5defef8e623c91a7a1607ae96f7c24bef180c..24287cb982569748ea4e0165355aa1865ae0174b 100755 (executable)
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -15,6 +15,24 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -32,77 +50,22 @@
 #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;
 
 
 /*!
@@ -156,6 +119,8 @@ Timer *timer_abort(Timer *timer)
        return timer;
 }
 
+#endif /* CONFIG_TIMER_DISABLE_EVENTS */
+
 
 /*!
  * Wait for the specified amount of time (expressed in ms)
@@ -182,8 +147,13 @@ void timer_delay(time_t time)
 }
 
 
+#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)
 {
@@ -202,6 +172,7 @@ void timer_udelay(utime_t usec_delay)
        while (timer_hw_hpread() - start < delay)
        {}
 }
+#endif /* CONFIG_TIMER_DISABLE_UDELAY */
 
 
 /*!
@@ -210,20 +181,27 @@ void timer_udelay(utime_t usec_delay)
  */
 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
@@ -241,10 +219,12 @@ DEFINE_TIMER_ISR
                REMOVE((Node *)timer);
 
                /* Execute the associated event */
-               event_doIntr(&timer->expire);
+               event_do(&timer->expire);
        }
-}
+#endif /* CONFIG_TIMER_DISABLE_EVENTS */
 
+       TIMER_STROBE_OFF;
+}
 
 
 /*!
@@ -252,17 +232,13 @@ DEFINE_TIMER_ISR
  */
 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();
 }
-