projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add the CPU select page
[bertos.git]
/
bertos
/
cpu
/
irq.h
diff --git
a/bertos/cpu/irq.h
b/bertos/cpu/irq.h
index 22d11e1fbedb1ae23514f4ffde30a6c6804b0fc3..011524b8f098bd874ab38d967aea34f6bde31426 100644
(file)
--- a/
bertos/cpu/irq.h
+++ b/
bertos/cpu/irq.h
@@
-69,8
+69,8
@@
#if __CPU_MODE__ == 1 /* Thumb */
/* Use stubs */
#if __CPU_MODE__ == 1 /* Thumb */
/* Use stubs */
- extern cpuflags_t get_CPSR(void);
- extern void set_CPSR(cpuflags_t flags);
+ extern cpu
_
flags_t get_CPSR(void);
+ extern void set_CPSR(cpu
_
flags_t flags);
#else
#define get_CPSR __get_CPSR
#define set_CPSR __set_CPSR
#else
#define get_CPSR __get_CPSR
#define set_CPSR __set_CPSR
@@
-138,7
+138,7
@@
#define CPU_READ_FLAGS() \
({ \
#define CPU_READ_FLAGS() \
({ \
- cpuflags_t sreg; \
+ cpu
_
flags_t sreg; \
asm volatile ( \
"mrs %0, cpsr\n\t" \
: "=r" (sreg) \
asm volatile ( \
"mrs %0, cpsr\n\t" \
: "=r" (sreg) \
@@
-252,10
+252,6
@@
#define IRQ_ASSERT_DISABLED() do {} while(0)
#endif
#define IRQ_ASSERT_DISABLED() do {} while(0)
#endif
-// OBSOLETE names
-#define ASSERT_IRQ_ENABLED() IRQ_ASSERT_ENABLED()
-#define ASSERT_IRQ_DISABLED() IRQ_ASSERT_DISABLED()
-
/**
* Execute \a CODE atomically with respect to interrupts.
*
/**
* Execute \a CODE atomically with respect to interrupts.
*
@@
-263,12
+259,10
@@
*/
#define ATOMIC(CODE) \
do { \
*/
#define ATOMIC(CODE) \
do { \
- cpuflags_t __flags; \
+ cpu
_
flags_t __flags; \
IRQ_SAVE_DISABLE(__flags); \
CODE; \
IRQ_RESTORE(__flags); \
} while (0)
IRQ_SAVE_DISABLE(__flags); \
CODE; \
IRQ_RESTORE(__flags); \
} while (0)
-
-
#endif /* CPU_IRQ_H */
#endif /* CPU_IRQ_H */