X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer.c;h=24287cb982569748ea4e0165355aa1865ae0174b;hb=22240d0455c6bd837fe928b29068e795be3febae;hp=a941f355db4b968b3dabc9d3741238b8711c108d;hpb=27c90e14b9a2600bc38486f046187a7e690b24fb;p=bertos.git

diff --git a/drv/timer.c b/drv/timer.c
index a941f355..24287cb9 100755
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -15,6 +15,18 @@
 
 /*
  * $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
  *
@@ -38,28 +50,22 @@
 #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 (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;
 
-REGISTER static List timers_queue;      /*!< Active timers */
+
+#ifndef CONFIG_TIMER_DISABLE_EVENTS
+
+/*!
+ * List of active asynchronous timers.
+ */
+REGISTER static List timers_queue;
 
 
 /*!
@@ -113,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)
@@ -139,6 +147,7 @@ void timer_delay(time_t time)
 }
 
 
+#ifndef CONFIG_TIMER_DISABLE_UDELAY
 /*!
  * Wait for the specified amount of time (expressed in microseconds)
  *
@@ -163,6 +172,7 @@ void timer_udelay(utime_t usec_delay)
 	while (timer_hw_hpread() - start < delay)
 	{}
 }
+#endif /* CONFIG_TIMER_DISABLE_UDELAY */
 
 
 /*!
@@ -171,14 +181,18 @@ 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;
 
@@ -187,6 +201,7 @@ DEFINE_TIMER_ISR
 	/* 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
@@ -204,8 +219,9 @@ 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;
 }
@@ -218,7 +234,9 @@ void timer_init(void)
 {
 	TIMER_STROBE_INIT;
 
+#ifndef CONFIG_TIMER_DISABLE_EVENTS
 	INITLIST(&timers_queue);
+#endif
 
 	_clock = 0;