X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Firq.h;h=011524b8f098bd874ab38d967aea34f6bde31426;hb=bb26872e115380a4354346bce26a0e1ec94f7628;hp=22d11e1fbedb1ae23514f4ffde30a6c6804b0fc3;hpb=e6339d49f97766bd1825d6f07ec44ec864d5ebfe;p=bertos.git

diff --git a/bertos/cpu/irq.h b/bertos/cpu/irq.h
index 22d11e1f..011524b8 100644
--- a/bertos/cpu/irq.h
+++ b/bertos/cpu/irq.h
@@ -69,8 +69,8 @@
 
 		#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
@@ -138,7 +138,7 @@
 
 		#define CPU_READ_FLAGS() \
 		({ \
-			cpuflags_t sreg; \
+			cpu_flags_t sreg; \
 			asm volatile ( \
 				"mrs %0, cpsr\n\t" \
 				: "=r" (sreg) \
@@ -252,10 +252,6 @@
 	#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.
  *
@@ -263,12 +259,10 @@
  */
 #define ATOMIC(CODE) \
 	do { \
-		cpuflags_t __flags; \
+		cpu_flags_t __flags; \
 		IRQ_SAVE_DISABLE(__flags); \
 		CODE; \
 		IRQ_RESTORE(__flags); \
 	} while (0)
 
-
-
 #endif /* CPU_IRQ_H */