X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer.h;h=5696823a3e156ce7ef1ceebff01bbecbf2c0b44e;hb=702bedb30a235a64f61f1d06653f8b22e39b5c5f;hp=41f43f655d5cc191201fd0c7c8fa1736d334c965;hpb=9d38debd0d2b2eaeeeec7f82d7c39e749ac729e5;p=bertos.git

diff --git a/bertos/drv/timer.h b/bertos/drv/timer.h
index 41f43f65..5696823a 100644
--- a/bertos/drv/timer.h
+++ b/bertos/drv/timer.h
@@ -34,6 +34,12 @@
  *
  * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
+ *
+ * $WIZARD_MODULE = {
+ * "name" : "timer",
+ * "depends" : [],
+ * "configuration" : "bertos/cfg/cfg_timer.h"
+ * }
  */
 
 #ifndef DRV_TIMER_H
@@ -51,7 +57,8 @@
  * Try the CPU specific one for bare-metal environments.
  */
 #if OS_HOSTED
-	#include OS_HEADER(timer)
+	//#include OS_HEADER(timer)
+	#include <emul/timer_posix.h>
 #else
 	#include CPU_HEADER(timer)
 #endif
@@ -248,12 +255,9 @@ Timer *timer_abort(Timer *timer);
 /** Set the timer so that it calls an user hook when it expires */
 INLINE void timer_setSoftint(Timer *timer, Hook func, iptr_t user_data)
 {
-	event_initSoftInt(&timer->expire, func, user_data);
+	event_initSoftint(&timer->expire, func, user_data);
 }
 
-// OBSOLETE
-#define  timer_set_event_softint timer_setSoftint
-
 /** Set the timer delay (the time before the event will be triggered) */
 INLINE void timer_setDelay(Timer *timer, ticks_t delay)
 {