Fix two errors introduced by previous commit.

[bertos.git] / drv / timer.c

diff --git a/drv/timer.c b/drv/timer.c
index a01f6f3cb88e4cc52d1f4883c5e4bae99b41678a..64eaf9443503a05ab2c814612b94f0072c7bbf88 100755 (executable)
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -3,7 +3,7 @@
  * <!--
  * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernardo Innocenti <bernie@develer.com>
- * All Rights Reserved.
+ * This file is part of DevLib - See devlib/README for information.
  * -->
  *
  * \version $Id$
@@ -15,6 +15,24 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -24,78 +42,29 @@
 #include "kdebug.h"
 #include "timer.h"
 
-#ifdef CONFIG_KERN_SIGNALS
-#include <kern/proc.h>
+#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
+       #include <kern/proc.h>
 #endif
 
-#if (ARCH & ARCH_EMUL)
-
-# error To be recoded
-
+#if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
+       #error To be recoded
 #elif defined(__AVR__)
-#      include "timer_avr.h"
+       #include "timer_avr.h"
 #elif defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__) /* 80C196 */
-#      include "timer_i196.h"
+       #include "timer_i196.h"
 #elif defined (__m56800__)
-#      include "timer_dsp56k.h"
+       #include "timer_dsp56k.h"
 #else
-#      error Unknown system
+       #error Unknown system
 #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 */
 
 
-/*!
- * Return a new timer picking and removing it from the available
- * timers pool. Return NULL if no more timers are available.
- */
-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);
-}
-
-
 /*!
  * Add the specified timer to the software timer service queue.
  * When the delay indicated by the timer expires, the timer
@@ -153,7 +122,7 @@ Timer *timer_abort(Timer *timer)
  */
 void timer_delay(time_t time)
 {
-#ifdef CONFIG_KERN_SIGNALS
+#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
        Timer t;
 
        ASSERT(!sig_check(SIG_SINGLE));
@@ -161,15 +130,24 @@ void timer_delay(time_t time)
        timer_set_delay(&t, time);
        timer_add(&t);
        sig_wait(SIG_SINGLE);
-#else
+
+#else /* !CONFIG_KERN_SIGNALS */
+
        time_t start = timer_gettick();
 
+       /* Busy wait */
        while (timer_gettick() - start < time) { /* nop */ }
-#endif
+
+#endif /* !CONFIG_KERN_SIGNALS */
 }
 
+
 /*!
  * 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)
 {
@@ -185,7 +163,7 @@ void timer_udelay(utime_t usec_delay)
        hptime_t start = timer_hw_hpread();
        hptime_t delay = (uint32_t)usec_delay * TIMER_HW_HPTICKS_PER_SEC / 1000000ul;
 
-       while (timer_hw_hpread() - start < delay) 
+       while (timer_hw_hpread() - start < delay)
        {}
 }
 
@@ -205,6 +183,8 @@ DEFINE_TIMER_ISR
 
        Timer *timer;
 
+       TIMER_STROBE_ON;
+
        timer_hw_irq();
 
        /* Update the master ms counter */
@@ -227,10 +207,11 @@ DEFINE_TIMER_ISR
                REMOVE((Node *)timer);
 
                /* Execute the associated event */
-               DOEVENT_INTR(&timer->expire);
+               event_doIntr(&timer->expire);
        }
-}
 
+       TIMER_STROBE_OFF;
+}
 
 
 /*!
@@ -238,17 +219,11 @@ DEFINE_TIMER_ISR
  */
 void timer_init(void)
 {
-       int i;
+       TIMER_STROBE_INIT;
 
        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]);
 
        _clock = 0;
 
        timer_hw_init();
 }
-