X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer.c;h=d832059086a563134303e16f87146f5cd1691bba;hb=fbb255258c626502f8d7ba583ca138f903e03b75;hp=285d67c55e1242bfd772e0f2602c1637424a68e2;hpb=0eeba5822b3ff0e76ae0fd0272536d371d272d7d;p=bertos.git

diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c
index 285d67c5..d8320590 100644
--- a/bertos/drv/timer.c
+++ b/bertos/drv/timer.c
@@ -40,7 +40,8 @@
 
 #include "cfg/cfg_timer.h"
 #include "cfg/cfg_wdt.h"
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
 #include <cfg/os.h>
 #include <cfg/debug.h>
 #include <cfg/module.h>
@@ -48,6 +49,7 @@
 #include <cpu/attr.h>
 #include <cpu/types.h>
 #include <cpu/irq.h>
+#include <cpu/power.h> // cpu_relax()
 
 /*
  * Include platform-specific binding code if we're hosted.
@@ -57,7 +59,10 @@
 	//#include OS_CSOURCE(timer)
 	#include <emul/timer_posix.c>
 #else
-	#include CPU_CSOURCE(timer)
+	#ifndef WIZ_AUTOGEN
+		#warning Deprecated: now you should include timer_<cpu> directly in the makefile. Remove this line and the following once done.
+		#include CPU_CSOURCE(timer)
+	#endif
 #endif
 
 /*
@@ -120,7 +125,7 @@ REGISTER static List timers_queue;
 void timer_add(Timer *timer)
 {
 	Timer *node;
-	cpuflags_t flags;
+	cpu_flags_t flags;
 
 
 	/* Inserting timers twice causes mayhem. */
@@ -197,11 +202,7 @@ void timer_delayTicks(ticks_t delay)
 
 	/* Busy wait */
 	while (timer_clock() - start < delay)
-	{
-#if CONFIG_WATCHDOG
-		wdt_reset();
-#endif
-	}
+		cpu_relax();
 
 #endif /* !CONFIG_KERN_SIGNALS */
 }