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

diff --git a/drv/timer.h b/drv/timer.h
index 3484c5a6..88d9f249 100755
--- a/drv/timer.h
+++ b/drv/timer.h
@@ -15,6 +15,15 @@
 
 /*
  * $Log$
+ * Revision 1.7  2004/06/27 15:26:17  aleph
+ * Declaration fix for build with GCC 3.4
+ *
+ * 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:57:12  aleph
+ * Add function prototypes
+ *
  * Revision 1.4  2004/06/06 18:25:44  bernie
  * Rename event macros to look like regular functions.
  *
@@ -47,23 +56,27 @@ typedef struct Timer
 	Event  expire;    /*!< Event to execute when the timer expires */
 } Timer;
 
+/* Function protos */
 extern void timer_init(void);
-extern Timer *timer_new(void);
-extern void timer_delete(Timer *timer);
 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);
 INLINE time_t timer_gettick(void);
 INLINE time_t timer_gettick_irq(void);
+INLINE void timer_set_event_softint(Timer* timer, Hook func, void* user_data);
+INLINE void timer_set_delay(Timer* timer, time_t delay);
+
+#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 
-#ifdef CONFIG_KERN_SIGNALS
 /*! Set the timer so that it sends a signal when it expires */
+INLINE void timer_set_event_signal(Timer* timer, struct Process* proc, sigset_t sigs);
 INLINE void timer_set_event_signal(Timer* timer, struct Process* proc, sigset_t sigs)
 {
 	event_initSignal(&timer->expire, proc, sigs);
 }
-#endif
+
+#endif /* CONFIG_KERN_SIGNALS */
 
 /*! Set the timer so that it calls an user hook when it expires */
 INLINE void timer_set_event_softint(Timer* timer, Hook func, void* user_data)
@@ -78,6 +91,8 @@ INLINE void timer_set_delay(Timer* timer, time_t delay)
 }
 
 
+extern volatile time_t _clock;
+
 /*!
  * Return the system tick counter (expressed in ms)
  * This function must disable interrupts on 8/16bit CPUs because the
@@ -86,8 +101,6 @@ INLINE void timer_set_delay(Timer* timer, time_t delay)
  */
 INLINE time_t timer_gettick(void)
 {
-	extern volatile time_t _clock;
-
 	time_t result;
 	cpuflags_t flags;
 
@@ -105,8 +118,6 @@ INLINE time_t timer_gettick(void)
  */
 INLINE time_t timer_gettick_irq(void)
 {
-	extern volatile time_t _clock;
-
 	return _clock;
 }