trac#29: Cleanup timer on demo exit

[bertos.git] / bertos / drv / timer.h

diff --git a/bertos/drv/timer.h b/bertos/drv/timer.h
index 4d781549f4dd025519516221c274854b794f5486..a71dfb68a852e5dd2eaabec288347299472b2849 100644 (file)
--- a/bertos/drv/timer.h
+++ b/bertos/drv/timer.h
@@ -178,14 +178,19 @@ INLINE utime_t hptime_to_us(hptime_t hpticks)
 #endif /* TIMER_HW_HPTICKS_PER_SEC < 100000UL */
 }
 
-
-void timer_init(void);
 void timer_delayTicks(ticks_t delay);
 INLINE void timer_delay(mtime_t delay)
 {
        timer_delayTicks(ms_to_ticks(delay));
 }
 
+void timer_init(void);
+void timer_cleanup(void);
+
+int timer_testSetup(void);
+int timer_testRun(void);
+int timer_testTearDown(void);
+
 #if !defined(CONFIG_TIMER_DISABLE_UDELAY)
 void timer_busyWait(hptime_t delay);
 void timer_delayHp(hptime_t delay);
@@ -219,8 +224,8 @@ typedef struct Timer
 #define TIMER_MAGIC_ACTIVE    0xABBA
 #define TIMER_MAGIC_INACTIVE  0xBAAB
 
-extern void timer_add(Timer *timer);
-extern Timer *timer_abort(Timer *timer);
+void timer_add(Timer *timer);
+Timer *timer_abort(Timer *timer);
 
 /** Set the timer so that it calls an user hook when it expires */
 INLINE void timer_set_event_softint(Timer *timer, Hook func, iptr_t user_data)