*/
#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>
#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() */
*/
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