From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LW9LW-0004rW-TI
	for qemu-devel@nongnu.org; Sun, 08 Feb 2009 08:05:14 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LW9LW-0004rK-Fh
	for qemu-devel@nongnu.org; Sun, 08 Feb 2009 08:05:14 -0500
Received: from [199.232.76.173] (port=43236 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LW9LW-0004rH-Dj
	for qemu-devel@nongnu.org; Sun, 08 Feb 2009 08:05:14 -0500
Received: from savannah.gnu.org ([199.232.41.3]:52121 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LW9LW-0004cn-3t
	for qemu-devel@nongnu.org; Sun, 08 Feb 2009 08:05:14 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LW9LV-0008A6-K4
	for qemu-devel@nongnu.org; Sun, 08 Feb 2009 13:05:13 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1LW9LV-00089y-BI
	for qemu-devel@nongnu.org; Sun, 08 Feb 2009 13:05:13 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1LW9LV-00089y-BI@cvs.savannah.gnu.org>
Date: Sun, 08 Feb 2009 13:05:13 +0000
Subject: [Qemu-devel] [6555] Use CMD646 IDE for now
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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) {