X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Ftimer.c;h=fbe7c695c9ee3455cd6cdde428c4ca860b6426a8;hb=4128f7132429072564952d3244d41e92bd3cfd46;hp=ca0605a792f8f9d92624ff403809943dabbca984;hpb=0fbabc305e65dfc5538cfcae10c04f6be9daf657;p=bertos.git

diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c
index ca0605a7..fbe7c695 100644
--- a/bertos/drv/timer.c
+++ b/bertos/drv/timer.c
@@ -27,21 +27,21 @@
  * the GNU General Public License.
  *
  * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bernardo Innocenti <bernie@develer.com>
+ * Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
  * \brief Hardware independent timer driver (implementation)
  *
  * \version $Id$
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
 #include "timer.h"
 
-#include <cfg/cfg_timer.h>
-#include <cfg/cfg_wdt.h>
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_timer.h"
+#include "cfg/cfg_wdt.h"
+#include "cfg/cfg_kern.h"
 #include <cfg/os.h>
 #include <cfg/debug.h>
 #include <cfg/module.h>
@@ -181,11 +181,12 @@ Timer *timer_abort(Timer *timer)
  */
 void timer_delayTicks(ticks_t delay)
 {
-#if defined(IRQ_ENABLED)
+#if defined(IRQ_ENABLED) && (!(ARCH & ARCH_EMUL))
 	/* We shouldn't sleep with interrupts disabled */
 	ASSERT(IRQ_ENABLED());
 #endif
 
+
 #if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
 	Timer t;