X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fcpu.h;h=51b142d6157bfd04e0573bb4f1a789e4f76bd9a3;hb=ff16c7e3fd2184d58a87d5fe1576cd246ecb719e;hp=c69b9c6f02129472c96de7de277361b21e09ba49;hpb=377c8e6cb7776c1b7d0368928fc619e20077b87f;p=bertos.git

diff --git a/cfg/cpu.h b/cfg/cpu.h
index c69b9c6f..51b142d6 100755
--- a/cfg/cpu.h
+++ b/cfg/cpu.h
@@ -17,6 +17,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.7  2005/11/27 03:04:38  bernie
+ *#* Add POSIX emulation for IRQ_* macros; Add Qt support.
+ *#*
+ *#* Revision 1.6  2005/07/19 07:26:49  bernie
+ *#* Add missing #endif.
+ *#*
  *#* Revision 1.5  2005/06/27 21:24:17  bernie
  *#* CPU_CSOURCE(): New macro.
  *#*
@@ -90,12 +96,17 @@
 #elif CPU_X86
 
 	#define NOP                     asm volatile ("nop")
-	#define IRQ_DISABLE             FIXME
-	#define IRQ_ENABLE              FIXME
-	#define IRQ_SAVE_DISABLE(x)     FIXME
-	#define IRQ_RESTORE(x)          FIXME
 
-	typedef uint32_t cpuflags_t; // FIXME
+	/* Get IRQ_* definitions from the hosting environment. */
+	#include <cfg/os.h>
+	#if OS_EMBEDDED
+		#define IRQ_DISABLE             FIXME
+		#define IRQ_ENABLE              FIXME
+		#define IRQ_SAVE_DISABLE(x)     FIXME
+		#define IRQ_RESTORE(x)          FIXME
+		typedef uint32_t cpuflags_t; // FIXME
+	#endif /* OS_EMBEDDED */
+
 
 	#define CPU_REGS_CNT            7
 	#define CPU_STACK_GROWS_UPWARD  0
@@ -118,6 +129,7 @@
 
 #elif CPU_PPC
 	#define NOP                 asm volatile ("nop" ::)
+
 	#define IRQ_DISABLE         FIXME
 	#define IRQ_ENABLE          FIXME
 	#define IRQ_SAVE_DISABLE(x) FIXME
@@ -380,6 +392,7 @@
 #else /* CPU_REG_BITS > 32 */
 	#define SIZEOF_PTR   8
 #endif
+#endif
 
 #ifndef CPU_BITS_PER_CHAR
 #define CPU_BITS_PER_CHAR   (SIZEOF_CHAR * 8)