===================================================================
RCS file: /cvs/funnyos/dev/cpuvar.h,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -r1.1 -r1.3
--- funnyos/dev/cpuvar.h	2007/10/16 18:30:35	1.1
+++ funnyos/dev/cpuvar.h	2007/11/12 13:10:19	1.3
@@ -1,22 +1,17 @@
 /*
- * $Id: cpuvar.h,v 1.1 2007/10/16 17:30:35 init Exp $
+ * $Id: cpuvar.h,v 1.3 2007/11/12 13:10:19 nbrk Exp $
  */
 #ifndef _DEV_CPUVAR_H
 #define _DEV_CPUVAR_H
 
-/*
- * CPU capabilities.
- */
-/* TODO when CPU identification will work */
-#define CPU_HAVE_ICACHE 	0x00000001
-#define CPU_HAVE_DCACHE 	0x00000002
-#define CPU_HAVE_MMU 		0x00000004
+/* Interrupt enable/disable */
+/* XXX should move somewhere else */
+#define __cpu_enable_irq() do { __asm __volatile("mrs r0, cpsr\nbic r0, r0, #0x80\nmsr cpsr, r0"); } while(0);
+#define __cpu_disable_irq() do { __asm __volatile("mrs r0, cpsr\norr r0, r0, #0x80\nmsr cpsr, r0"); } while(0);
 
 
 struct cpu_dd {
-	uint32_t 	cpu_freq;
-	char 		*cpu_name;
-	uint32_t 	cpu_flags;
+	uint32_t 	cd_dummy;
 };
 
 #endif /* _DEV_CPUVAR_H */