X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer.h;h=a71dfb68a852e5dd2eaabec288347299472b2849;hb=57408cb30e19f535e59dc2f47418e032dbe59076;hp=cd7aa1b48f6344f8bda8d235a4557b1b901b3f4b;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/drv/timer.h b/bertos/drv/timer.h
index cd7aa1b4..a71dfb68 100644
--- a/bertos/drv/timer.h
+++ b/bertos/drv/timer.h
@@ -27,15 +27,16 @@
  * the GNU General Public License.
  *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bernardo Innocenti <bernie@develer.com>
+ * Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
+ * \brief Hardware independent timer driver (interface)
+ *
  * \version $Id$
  *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  *
- * \brief Hardware independent timer driver (interface)
  */
 
 #ifndef DRV_TIMER_H
@@ -43,6 +44,7 @@
 
 #include <cfg/os.h>
 #include <cfg/macros.h>
+
 #include <cpu/attr.h>
 #include <cpu/irq.h>
 
@@ -57,10 +59,11 @@
 	#include CPU_HEADER(timer)
 #endif
 
-#include <mware/list.h>
+#include "cfg/cfg_timer.h"
 #include <cfg/debug.h>
 #include <cfg/compiler.h>
-#include <appconfig.h>
+
+#include <mware/list.h>
 
 
 extern volatile ticks_t _clock;
@@ -175,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);
@@ -216,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)