projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Demo: remove unneeded locks.
[bertos.git]
/
bertos
/
cpu
/
irq.h
diff --git
a/bertos/cpu/irq.h
b/bertos/cpu/irq.h
index 83b0496415751f3fa601cb0649fc3c39579aa5c8..466b524da2959f637f495be8121a3ef7ab63f624 100644
(file)
--- a/
bertos/cpu/irq.h
+++ b/
bertos/cpu/irq.h
@@
-44,7
+44,7
@@
#include "detect.h"
#include "types.h"
#include "detect.h"
#include "types.h"
-#include <kern/pr
eempt.h>
+#include <kern/pr
oc.h> /* proc_needPreempt() / proc_preempt() */
#include <cfg/compiler.h> /* for uintXX_t */
#include "cfg/cfg_proc.h" /* CONFIG_KERN_PREEMPT */
#include <cfg/compiler.h> /* for uintXX_t */
#include "cfg/cfg_proc.h" /* CONFIG_KERN_PREEMPT */
@@
-336,12
+336,6
@@
} \
INLINE void __isr_##vect(void)
} \
INLINE void __isr_##vect(void)
- /**
- * Interrupt service routine prototype: can be used for
- * forward declarations.
- */
- #define ISR_PROTO(vect) ISR(vect)
-
/**
* With task priorities enabled each ISR is used a point to
* check if we need to perform a context switch.
/**
* With task priorities enabled each ISR is used a point to
* check if we need to perform a context switch.
@@
-355,14
+349,17
@@
#if CONFIG_KERN_PRI
#define DECLARE_ISR(func) \
DECLARE_ISR_CONTEXT_SWITCH(func)
#if CONFIG_KERN_PRI
#define DECLARE_ISR(func) \
DECLARE_ISR_CONTEXT_SWITCH(func)
-
+ /**
+ * Interrupt service routine prototype: can be used for
+ * forward declarations.
+ */
#define ISR_PROTO(func) \
ISR_PROTO_CONTEXT_SWITCH(func)
#endif /* !CONFIG_KERN_PRI */
#endif
#define ISR_PROTO(func) \
ISR_PROTO_CONTEXT_SWITCH(func)
#endif /* !CONFIG_KERN_PRI */
#endif
- #ifndef
DECLARE_ISR
- #define ISR_PROTO(vect) ISR(vect)
+ #ifndef
ISR_PROTO
+ #define ISR_PROTO(vect) ISR(vect)
#endif
#ifndef DECLARE_ISR
#define DECLARE_ISR(vect) ISR(vect)
#endif
#ifndef DECLARE_ISR
#define DECLARE_ISR(vect) ISR(vect)
@@
-370,9
+367,6
@@
#ifndef DECLARE_ISR_CONTEXT_SWITCH
#define DECLARE_ISR_CONTEXT_SWITCH(vect) ISR(vect)
#endif
#ifndef DECLARE_ISR_CONTEXT_SWITCH
#define DECLARE_ISR_CONTEXT_SWITCH(vect) ISR(vect)
#endif
- #ifndef ISR_PROTO
- #define ISR_PROTO(func) ISR(vect)
- #endif
#ifndef ISR_PROTO_CONTEXT_SWITCH
#define ISR_PROTO_CONTEXT_SWITCH(func) ISR(vect)
#endif
#ifndef ISR_PROTO_CONTEXT_SWITCH
#define ISR_PROTO_CONTEXT_SWITCH(func) ISR(vect)
#endif