upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / include / asm-mips / mach-generic / ide.h

diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h
index 7cdd464..cb2edd0 100644 (file)
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -16,6 +16,8 @@
 #ifdef __KERNEL__
 
 #include <linux/config.h>
+#include <linux/pci.h>
+#include <linux/stddef.h>
 
 #ifndef MAX_HWIFS
 # ifdef CONFIG_BLK_DEV_IDEPCI
@@ -27,32 +29,68 @@
 
 #define IDE_ARCH_OBSOLETE_DEFAULTS
 
+static __inline__ int ide_probe_legacy(void)
+{
+#ifdef CONFIG_PCI
+       struct pci_dev *dev;
+       if ((dev = pci_get_class(PCI_CLASS_BRIDGE_EISA << 8, NULL)) != NULL ||
+           (dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL)) != NULL) {
+               pci_dev_put(dev);
+
+               return 1;
+       }
+       return 0;
+#elif defined(CONFIG_EISA) || defined(CONFIG_ISA)
+       return 1;
+#else
+       return 0;
+#endif
+}
+
 static __inline__ int ide_default_irq(unsigned long base)
 {
-       switch (base) {
-               case 0x1f0: return 14;
-               case 0x170: return 15;
-               case 0x1e8: return 11;
-               case 0x168: return 10;
-               case 0x1e0: return 8;
-               case 0x160: return 12;
+       if (ide_probe_legacy())
+               switch (base) {
+               case 0x1f0:
+                       return 14;
+               case 0x170:
+                       return 15;
+               case 0x1e8:
+                       return 11;
+               case 0x168:
+                       return 10;
+               case 0x1e0:
+                       return 8;
+               case 0x160:
+                       return 12;
                default:
                        return 0;
-       }
+               }
+       else
+               return 0;
 }
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
-       switch (index) {
-               case 0: return 0x1f0;
-               case 1: return 0x170;
-               case 2: return 0x1e8;
-               case 3: return 0x168;
-               case 4: return 0x1e0;
-               case 5: return 0x160;
+       if (ide_probe_legacy())
+               switch (index) {
+               case 0:
+                       return 0x1f0;
+               case 1:
+                       return 0x170;
+               case 2:
+                       return 0x1e8;
+               case 3:
+                       return 0x168;
+               case 4:
+                       return 0x1e0;
+               case 5:
+                       return 0x160;
                default:
                        return 0;
-       }
+               }
+       else
+               return 0;
 }
 
 #define IDE_ARCH_OBSOLETE_INIT
@@ -64,7 +102,17 @@ static __inline__ unsigned long ide_default_io_base(int index)
 #define ide_init_default_irq(base)     ide_default_irq(base)
 #endif
 
-#include <asm-generic/ide_iops.h>
+/* MIPS port and memory-mapped I/O string operations.  */
+
+#define __ide_insw     insw
+#define __ide_insl     insl
+#define __ide_outsw    outsw
+#define __ide_outsl    outsl
+
+#define __ide_mm_insw  readsw
+#define __ide_mm_insl  readsl
+#define __ide_mm_outsw writesw
+#define __ide_mm_outsl writesl
 
 #endif /* __KERNEL__ */