X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer.c;h=c0106d85bbe515a32747c977e1ced7e48016b5e8;hb=b0f0b3a926d4cb1e8d65b1eca28f37acba9e6016;hp=bfc4feb2c1a02a619a3acb02ee25473353afa145;hpb=46cacdd7cf98dd977225deceb6ec3f08ef11a81f;p=bertos.git

diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c
index bfc4feb2..c0106d85 100644
--- a/bertos/drv/timer.c
+++ b/bertos/drv/timer.c
@@ -54,7 +54,8 @@
  * Try the CPU specific one for bare-metal environments.
  */
 #if OS_HOSTED
-	#include OS_CSOURCE(timer)
+	//#include OS_CSOURCE(timer)
+	#include <emul/timer_posix.c>
 #else
 	#include CPU_CSOURCE(timer)
 #endif
@@ -187,7 +188,7 @@ void timer_delayTicks(ticks_t delay)
 	Timer t;
 
 	ASSERT(!sig_check(SIG_SINGLE));
-	timer_set_event_signal(&t, proc_current(), SIG_SINGLE);
+	timer_setSignal(&t, proc_current(), SIG_SINGLE);
 	timer_setDelay(&t, delay);
 	timer_add(&t);
 	sig_wait(SIG_SINGLE);
@@ -324,11 +325,15 @@ MOD_DEFINE(timer)
  */
 void timer_init(void)
 {
-	TIMER_STROBE_INIT;
+	#if CONFIG_KERN_IRQ
+		MOD_CHECK(irq);
+	#endif
 
-#if CONFIG_TIMER_EVENTS
-	LIST_INIT(&timers_queue);
-#endif
+	#if CONFIG_TIMER_EVENTS
+		LIST_INIT(&timers_queue);
+	#endif
+
+	TIMER_STROBE_INIT;
 
 	_clock = 0;