git.droids-corp.org
/
aversive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
43d1641
)
scheduler: avoid using a poisoned macro
author
Gregor Riepl
<onitake@gmail.com>
Tue, 16 Dec 2014 15:15:51 +0000
(16:15 +0100)
committer
Olivier Matz
<zer0@droids-corp.org>
Sun, 8 Feb 2015 21:34:19 +0000
(22:34 +0100)
Change the timer overflow interrupt name evaluation order in
base/scheduler to avoid hitting a poisened macro.
Signed-off-by: Gregor Riepl <onitake@gmail.com>
modules/base/scheduler/scheduler.c
patch
|
blob
|
history
diff --git
a/modules/base/scheduler/scheduler.c
b/modules/base/scheduler/scheduler.c
index
13716e7
..
268e1a9
100644
(file)
--- a/
modules/base/scheduler/scheduler.c
+++ b/
modules/base/scheduler/scheduler.c
@@
-61,11
+61,12
@@
void scheduler_init(void)
#ifdef CONFIG_MODULE_SCHEDULER_TIMER0
#ifdef CONFIG_MODULE_SCHEDULER_TIMER0
+#ifndef TIMER0_OVF_vect
#if defined(SIG_OVERFLOW0)
#if defined(SIG_OVERFLOW0)
-SIGNAL(SIG_OVERFLOW0)
-#else
-SIGNAL(TIMER0_OVF_vect)
+#define TIMER0_OVF_vect SIG_OVERFLOW0
+#endif
#endif
#endif
+SIGNAL(TIMER0_OVF_vect)
{
scheduler_interrupt();
}
{
scheduler_interrupt();
}