Remove plenty of legacy names marked as OBSOLETE

[bertos.git] / bertos / cpu / irq.h

diff --git a/bertos/cpu/irq.h b/bertos/cpu/irq.h
index 5fddfdc9cee57f08da34b6cbd70db60579a8e3fa..0d0d46861646dda34877b8971b16f0fc103b5573 100644 (file)
--- a/bertos/cpu/irq.h
+++ b/bertos/cpu/irq.h
@@ -60,6 +60,7 @@
                #define IRQ_RESTORE(x)          FIXME
        #endif /* OS_EMBEDDED */
 
+
 #elif CPU_ARM
 
        #ifdef __IAR_SYSTEMS_ICC__
@@ -92,8 +93,6 @@
                #define IRQ_ENABLED() \
                        ((bool)(get_CPSR() & 0xb0))
 
-               #define BREAKPOINT  /* asm("bkpt 0") DOES NOT WORK */
-
        #else /* !__IAR_SYSTEMS_ICC__ */
 
                #define IRQ_DISABLE \
@@ -166,7 +165,6 @@
 
 #elif CPU_DSP56K
 
-       #define BREAKPOINT              asm(debug)
        #define IRQ_DISABLE             do { asm(bfset #0x0200,SR); asm(nop); } while (0)
        #define IRQ_ENABLE              do { asm(bfclr #0x0200,SR); asm(nop); } while (0)
 
@@ -245,13 +243,13 @@
 
 #ifdef IRQ_ENABLED
        /// Ensure interrupts are enabled
-       #define ASSERT_IRQ_ENABLED()  ASSERT(IRQ_ENABLED())
+       #define IRQ_ASSERT_ENABLED()  ASSERT(IRQ_ENABLED())
 
        /// Ensure interrupts are not enabled
-       #define ASSERT_IRQ_DISABLED() ASSERT(IRQ_ENABLED())
+       #define IRQ_ASSERT_DISABLED() ASSERT(!IRQ_ENABLED())
 #else
-       #define ASSERT_IRQ_ENABLED() do {} while(0)
-       #define ASSERT_IRQ_DISABLED() do {} while(0)
+       #define IRQ_ASSERT_ENABLED() do {} while(0)
+       #define IRQ_ASSERT_DISABLED() do {} while(0)
 #endif
 
 /**
@@ -267,10 +265,4 @@
                IRQ_RESTORE(__flags); \
        } while (0)
 
-
-#ifndef BREAKPOINT
-#define BREAKPOINT /* nop */
-#endif
-
-
 #endif /* CPU_IRQ_H */