X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cpu.h;h=fb249c223edad3726bcd4047af791b87cf7c83e8;hb=0168eb0bee0da568cd3ea8f8dfffa9343175efd9;hp=562d8619aa3800134c56cbfb4249a39ebb51ad7e;hpb=75021d741d1a55013d98e8e67748009d87835341;p=bertos.git

diff --git a/cpu.h b/cpu.h
index 562d8619..fb249c22 100755
--- a/cpu.h
+++ b/cpu.h
@@ -17,6 +17,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.19  2004/10/03 20:43:54  bernie
+ *#* Fix Doxygen markup.
+ *#*
+ *#* Revision 1.18  2004/10/03 18:36:31  bernie
+ *#* IRQ_GETSTATE(): New macro; Rename IRQ macros for consistency.
+ *#*
  *#* Revision 1.17  2004/09/06 21:48:27  bernie
  *#* ATOMIC(): New macro.
  *#*
@@ -116,11 +122,11 @@
 
 #elif CPU_AVR
 
-	#define NOP                     asm volatile ("nop" ::)
-	#define DISABLE_INTS            asm volatile ("cli" ::)
-	#define ENABLE_INTS             asm volatile ("sei" ::)
+	#define NOP           asm volatile ("nop" ::)
+	#define IRQ_DISABLE   asm volatile ("cli" ::)
+	#define IRQ_ENABLE    asm volatile ("sei" ::)
 
-	#define DISABLE_IRQSAVE(x) \
+	#define IRQ_SAVE_DISABLE(x) \
 	do { \
 		__asm__ __volatile__( \
 			"in %0,__SREG__\n\t" \
@@ -129,13 +135,29 @@
 		); \
 	} while (0)
 
-	#define ENABLE_IRQRESTORE(x) \
+	#define IRQ_RESTORE(x) \
 	do { \
 		__asm__ __volatile__( \
 			"out __SREG__,%0" : /* no outputs */ : "r" (x) : "cc" \
 		); \
 	} while (0)
 
+	#define IRQ_GETSTATE() \
+	({ \
+		uint8_t sreg; \
+		__asm__ __volatile__( \
+			"in %0,__SREG__\n\t" \
+			: "=r" (sreg)  /* no inputs & no clobbers */ \
+		); \
+		(bool)(sreg & 0x80); \
+	})
+
+	/* OBSOLETE NAMES */
+	#define DISABLE_INTS IRQ_DISABLE
+	#define ENABLE_INTS  IRQ_ENABLE
+	#define DISABLE_IRQSAVE(x)   IRQ_SAVE_DISABLE(x)
+	#define ENABLE_IRQRESTORE(x) IRQ_RESTORE(x)
+
 	typedef uint8_t cpuflags_t;
 	typedef uint8_t cpustack_t;
 
@@ -267,7 +289,7 @@
  *   CPU_BITS_PER_SHORT >= 8
  *   CPU_BITS_PER_INT   >= 16
  *   CPU_BITS_PER_LONG  >= 32
- * \end code
+ * \endcode
  * \{
  */
 #ifndef SIZEOF_CHAR