X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer.c;h=0e756dbb6cb01c435062380cbd60536d0e165520;hb=45add65abd59bd79f528501c85f3e5891a9c2c29;hp=bb1e5cfba3bc6cfdb1aaa6813b57b717e9109dbb;hpb=ac3dc4364ae7ec13d5dd8462d4da1b26a86f788f;p=bertos.git

diff --git a/drv/timer.c b/drv/timer.c
index bb1e5cfb..0e756dbb 100644
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -38,7 +38,11 @@
  */
 
 #include "timer.h"
-#include <cfg/cpu.h>
+
+#include <cpu/attr.h>
+#include <cpu/types.h>
+#include <cpu/irq.h>
+
 #include <cfg/os.h>
 #include <cfg/debug.h>
 #include <cfg/module.h>
@@ -70,6 +74,9 @@
 
 #if CONFIG_KERNEL
 	#include <config_kern.h>
+	#if CONFIG_KERN_PREEMPTIVE
+		#include <hw/switch.h>
+	#endif
 	#if CONFIG_KERN_SIGNALS
 		#include <kern/signal.h> /* sig_wait(), sig_check() */
 		#include <kern/proc.h>   /* proc_current() */
@@ -173,9 +180,9 @@ Timer *timer_abort(Timer *timer)
  */
 void timer_delayTicks(ticks_t delay)
 {
-#if defined(IRQ_GETSTATE)
+#if defined(IRQ_ENABLED)
 	/* We shouldn't sleep with interrupts disabled */
-	ASSERT(IRQ_GETSTATE());
+	ASSERT(IRQ_ENABLED());
 #endif
 
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS