From 9c41a52cad9f3a8e7c7ec1c29f8722c722d4698d Mon Sep 17 00:00:00 2001 From: qwert Date: Tue, 29 Jul 2008 15:13:42 +0000 Subject: [PATCH] Fix timer when run in bertos emulator. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1531 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/drv/timer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bertos/drv/timer.c b/bertos/drv/timer.c index 81f87942..808a6a7f 100644 --- a/bertos/drv/timer.c +++ b/bertos/drv/timer.c @@ -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; -- 2.25.1