Changes in kernel/arch/ppc32/include/cpu.h [b3f8fb7:3500f75] in mainline

File:

• kernel/arch/ppc32/include/cpu.h (modified) (1 diff)

kernel/arch/ppc32/include/cpu.h

@@ -36 +36 @@
 #define KERN_ppc32_CPU_H_
 
-#include <arch/asm.h>
+/* MSR bits */
+#define MSR_DR  (1 << 4)
+#define MSR_IR  (1 << 5)
+#define MSR_PR  (1 << 14)
+#define MSR_EE  (1 << 15)
+
+/* HID0 bits */
+#define HID0_STEN  (1 << 24)
+#define HID0_ICE   (1 << 15)
+#define HID0_DCE   (1 << 14)
+#define HID0_ICFI  (1 << 11)
+#define HID0_DCI   (1 << 10)
+
+#ifndef __ASM__
+
+#include <typedefs.h>
 
 typedef struct {
-        int version;
-        int revision;
-} cpu_arch_t;
-        
+        uint16_t version;
+        uint16_t revision;
+} __attribute__ ((packed)) cpu_arch_t;
+
+static inline void cpu_version(cpu_arch_t *info)
+{
+        asm volatile (
+                "mfpvr %[cpu_info]\n"
+                : [cpu_info] "=r" (*info)
+        );
+}
+
+#endif /* __ASM__ */
+
 #endif