projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix timer when run in bertos emulator.
[bertos.git]
/
bertos
/
drv
/
timer.c
diff --git
a/bertos/drv/timer.c
b/bertos/drv/timer.c
index 81f87942716989f62d3fe375a8e59dfd50993597..808a6a7fba25fa24d59b5d955ae760fb70ef992f 100644
(file)
--- 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)
{
*/
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
/* We shouldn't sleep with interrupts disabled */
ASSERT(IRQ_ENABLED());
#endif
+
#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
Timer t;
#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
Timer t;