[Qemu-devel] [6555] Use CMD646 IDE for now

[Blue Swirl]

Revision: 6555
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6555
Author:   blueswir1
Date:     2009-02-08 13:05:12 +0000 (Sun, 08 Feb 2009)

Log Message:
-----------
Use CMD646 IDE for now

Modified Paths:
--------------
    trunk/hw/ppc_newworld.c

Modified: trunk/hw/ppc_newworld.c
===================================================================
--- trunk/hw/ppc_newworld.c     2009-02-08 12:50:56 UTC (rev 6554)
+++ trunk/hw/ppc_newworld.c     2009-02-08 13:05:12 UTC (rev 6555)
@@ -100,7 +100,6 @@
     int vga_bios_size, bios_size;
     qemu_irq *dummy_irq;
     int pic_mem_index, dbdma_mem_index, cuda_mem_index, escc_mem_index;
-    int ide_mem_index[2];
     int ppc_boot_device;
     int index;
     BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
@@ -296,12 +295,8 @@
             hd[i] = NULL;
     }
     dbdma = DBDMA_init(&dbdma_mem_index);
-#if 1
-    ide_mem_index[0] = pmac_ide_init(&hd[0], pic[0x13], dbdma, 0x14, 
pic[0x01]);
-    ide_mem_index[1] = pmac_ide_init(&hd[2], pic[0x14], dbdma, 0x16, 
pic[0x02]);
-#else
-    pci_cmd646_ide_init(pci_bus, &hd[0], 0);
-#endif
+    pci_cmd646_ide_init(pci_bus, hd, 0);
+
     /* cuda also initialize ADB */
     cuda_init(&cuda_mem_index, pic[0x19]);
 
@@ -310,7 +305,7 @@
 
 
     macio_init(pci_bus, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, 0, pic_mem_index,
-               dbdma_mem_index, cuda_mem_index, NULL, 2, ide_mem_index,
+               dbdma_mem_index, cuda_mem_index, NULL, 0, NULL,
                escc_mem_index);
 
     if (usb_enabled) {