Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / i386 / mach-es7000 / es7000.h

diff --git a/arch/i386/mach-es7000/es7000.h b/arch/i386/mach-es7000/es7000.h
index ec6dea5..80566ca 100644 (file)
--- a/arch/i386/mach-es7000/es7000.h
+++ b/arch/i386/mach-es7000/es7000.h
@@ -24,12 +24,22 @@
  * http://www.unisys.com
  */
 
+/*
+ * ES7000 chipsets
+ */
+
+#define NON_UNISYS             0
+#define ES7000_CLASSIC         1
+#define ES7000_ZORRO           2
+
+
 #define        MIP_REG                 1
 #define        MIP_PSAI_REG            4
 
 #define        MIP_BUSY                1
 #define        MIP_SPIN                0xf0000
-#define        MIP_VALID               0x0100000000000000
+#define        MIP_VALID               0x0100000000000000ULL
+#define        MIP_PORT(VALUE) ((VALUE >> 32) & 0xffff)
 
 #define        MIP_RD_LO(VALUE)        (VALUE & 0xffffffff)   
 
@@ -73,6 +83,7 @@ struct es7000_oem_table {
        struct psai psai;
 };
 
+#ifdef CONFIG_ACPI
 struct acpi_table_sdt {
        unsigned long pa;
        unsigned long count;
@@ -89,6 +100,9 @@ struct oem_table {
        u32 OEMTableSize;
 };
 
+extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
+#endif
+
 struct mip_reg {
        unsigned long long off_0;
        unsigned long long off_8;
@@ -103,7 +117,7 @@ struct mip_reg {
 #define        MIP_SW_APIC             0x1020b
 #define        MIP_FUNC(VALUE)         (VALUE & 0xff)
 
-extern void parse_unisys_oem (char *oemptr, int oem_entries);
-extern int find_unisys_acpi_oem_table(unsigned long *oem_addr, int *length);
+extern int parse_unisys_oem (char *oemptr);
+extern void setup_unisys(void);
 extern int es7000_start_cpu(int cpu, unsigned long eip);
 extern void es7000_sw_apic(void);