X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=bertos%2Fcpu%2Firq.h;h=22d11e1fbedb1ae23514f4ffde30a6c6804b0fc3;hb=b0f0b3a926d4cb1e8d65b1eca28f37acba9e6016;hp=5fddfdc9cee57f08da34b6cbd70db60579a8e3fa;hpb=547a273e4edd84b2a2e2d69b5698a7b88374578c;p=bertos.git

diff --git a/bertos/cpu/irq.h b/bertos/cpu/irq.h
index 5fddfdc9..22d11e1f 100644
--- 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,15 +243,19 @@
 
 #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
 
+// OBSOLETE names
+#define ASSERT_IRQ_ENABLED()  IRQ_ASSERT_ENABLED()
+#define ASSERT_IRQ_DISABLED() IRQ_ASSERT_DISABLED()
+
 /**
  * Execute \a CODE atomically with respect to interrupts.
  *
@@ -268,9 +270,5 @@
 	} while (0)
 
 
-#ifndef BREAKPOINT
-#define BREAKPOINT /* nop */
-#endif
-
 
 #endif /* CPU_IRQ_H */