X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer.c;h=a941f355db4b968b3dabc9d3741238b8711c108d;hb=3ddfa890ceeff1a89e7a978517e30466935c0698;hp=0bd5defef8e623c91a7a1607ae96f7c24bef180c;hpb=357026e01c5b8305bfca0ab67193f25fbd49e5ee;p=bertos.git

diff --git a/drv/timer.c b/drv/timer.c
index 0bd5defe..a941f355 100755
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -15,6 +15,12 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -33,78 +39,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
-
+	#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
@@ -184,6 +141,10 @@ void timer_delay(time_t time)
 
 /*!
  * 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)
 {
@@ -219,6 +180,8 @@ DEFINE_TIMER_ISR
 
 	Timer *timer;
 
+	TIMER_STROBE_ON;
+
 	timer_hw_irq();
 
 	/* Update the master ms counter */
@@ -243,8 +206,9 @@ DEFINE_TIMER_ISR
 		/* Execute the associated event */
 		event_doIntr(&timer->expire);
 	}
-}
 
+	TIMER_STROBE_OFF;
+}
 
 
 /*!
@@ -252,17 +216,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();
 }
-