Merge branch 'master' of git://git.denx.de/u-boot-x86

[oweals/u-boot.git] / board / esd / cpci750 / ide.c

diff --git a/board/esd/cpci750/ide.c b/board/esd/cpci750/ide.c
index 7400e8dc52c6fc7085a894d6be0a5942fe2a8557..a3bd1b73d5801e75755a36dfd50c0a90e84bf9ee 100644 (file)
--- a/board/esd/cpci750/ide.c
+++ b/board/esd/cpci750/ide.c
@@ -25,48 +25,49 @@
 
 
 #include <common.h>
-#ifdef CFG_CMD_IDE
+#if defined(CONFIG_CMD_IDE)
 #include <ata.h>
 #include <ide.h>
 #include <pci.h>
 
-extern ulong ide_bus_offset[CFG_IDE_MAXBUS];
+extern ulong ide_bus_offset[CONFIG_SYS_IDE_MAXBUS];
 
-int ide_preinit
-    (
-    void
-    )
-    {
-    int            status;
-    pci_dev_t      devbusfn;
-    int            l;
+int ide_preinit (void)
+{
+       int status;
+       pci_dev_t devbusfn;
+       int l;
 
-    status = 1;
-    for(l=0;l<CFG_IDE_MAXBUS;l++)
-        {
-        ide_bus_offset[l] = -ATA_STATUS;
-        }
-    devbusfn = pci_find_device(0x1103, 0x0004, 0);
-    if (devbusfn != -1)
-        {
-        status = 0;
+       status = 1;
+       if (CPCI750_SLAVE_TEST != 0)
+               return status;
+       for (l = 0; l < CONFIG_SYS_IDE_MAXBUS; l++) {
+               ide_bus_offset[l] = -ATA_STATUS;
+       }
+       devbusfn = pci_find_device (0x1103, 0x0004, 0);
+       if (devbusfn == -1)
+               devbusfn = pci_find_device (0x1095, 0x3114, 0);
+       if (devbusfn != -1) {
+               ulong *ide_bus_offset_ptr;
 
-        pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0, (u32 *)&ide_bus_offset[0]);
-       ide_bus_offset[0] &= 0xfffffffe;
-        ide_bus_offset[0] += CFG_PCI0_IO_SPACE;
-        pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_2, (u32 *)&ide_bus_offset[1]);
-       ide_bus_offset[1] &= 0xfffffffe;
-        ide_bus_offset[1] += CFG_PCI0_IO_SPACE;
-        }
-    return(status);
-    }
+               status = 0;
 
-void ide_set_reset
-    (
-    int flag
-    )
-    {
-    return;
-    }
+               ide_bus_offset_ptr = &ide_bus_offset[0];
+               pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0,
+                                      (u32 *)ide_bus_offset_ptr);
+               ide_bus_offset[0] &= 0xfffffffe;
+               ide_bus_offset[0] += CONFIG_SYS_PCI0_IO_SPACE;
+               ide_bus_offset_ptr = &ide_bus_offset[1];
+               pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_2,
+                                      (u32 *)ide_bus_offset_ptr);
+               ide_bus_offset[1] &= 0xfffffffe;
+               ide_bus_offset[1] += CONFIG_SYS_PCI0_IO_SPACE;
+       }
+       return status;
+}
+
+void ide_set_reset (int flag) {
+       return;
+}
 
 #endif /* of CONFIG_CMDS_IDE */