X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer.h;h=12f74b3fd9cb6f8ddfa77a37490bfe5c695f7a5b;hb=c273ae81bac91c7eaaecb71482992803539dd0eb;hp=5a9c93e2b3f2a633bfe715e761046930eae9857e;hpb=2708af4ade1a189c58adb4a6e543ea80be781730;p=bertos.git

diff --git a/drv/timer.h b/drv/timer.h
index 5a9c93e2..12f74b3f 100755
--- a/drv/timer.h
+++ b/drv/timer.h
@@ -15,6 +15,12 @@
 
 /*
  * $Log$
+ * Revision 1.11  2004/07/29 22:40:12  bernie
+ * Spelling fix.
+ *
+ * Revision 1.10  2004/07/21 00:13:57  bernie
+ * Put timer driver on diet.
+ *
  * Revision 1.9  2004/07/20 23:45:01  bernie
  * Finally remove redundant protos.
  *
@@ -50,15 +56,33 @@
 #include "compiler.h"
 #include <mware/list.h>
 
+/*! Number of timer ticks per second. */
+#define TICKS_PER_SEC       1000
+
+/* Function protos */
+extern void timer_init(void);
+extern void timer_delay(time_t time);
+
+#ifndef CONFIG_TIMER_DISABLE_UDELAY
+extern void timer_udelay(utime_t utime);
+#endif
+
+
+#ifndef CONFIG_TIMER_DISABLE_EVENTS
+
 #ifdef CONFIG_KERNEL
 	#include <kern/event.h>
 #else
 	#include <mware/event.h>
 #endif
 
-/*! Number of timer ticks per second. */
-#define TICKS_PER_SEC       1000
-
+/*!
+ * The timer driver supports multiple synchronous timers
+ * that can trigger an event when they expire.
+ *
+ * \sa timer_add()
+ * \sa timer_abort()
+ */
 typedef struct Timer
 {
 	Node   link;      /*!< Link into timers queue */
@@ -67,12 +91,8 @@ typedef struct Timer
 	Event  expire;    /*!< Event to execute when the timer expires */
 } Timer;
 
-/* Function protos */
-extern void timer_init(void);
 extern void timer_add(Timer *timer);
 extern Timer *timer_abort(Timer *timer);
-extern void timer_delay(time_t time);
-extern void timer_udelay(utime_t utime);
 
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 
@@ -96,6 +116,7 @@ INLINE void timer_set_delay(Timer* timer, time_t delay)
 	timer->delay = delay;
 }
 
+#endif /* CONFIG_TIMER_DISABLE_EVENTS */
 
 extern volatile time_t _clock;
 
@@ -140,8 +161,9 @@ INLINE time_t timer_tick(void)
 
 
 /*!
- * Like \c timer_tick, faster version to be called
- * from interrupt context only.
+ * Faster version of timer_tick(), to be called only when the timer
+ * interrupt is disabled (DISABLE_INTS) or overridden by a
+ * higher-priority or non-nesting interrupt.
  *
  * \sa timer_tick
  */