From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LOG7H-00051O-Dz
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 13:41:55 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LOG7G-000517-Ug
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 13:41:55 -0500
Received: from [199.232.76.173] (port=37593 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LOG7G-000514-SQ
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 13:41:54 -0500
Received: from savannah.gnu.org ([199.232.41.3]:53655 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 1LOG7G-0004yn-IG
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 13:41:54 -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 1LOG7G-0003BL-1U
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 18:41:54 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1LOG7F-0003BH-QW
	for qemu-devel@nongnu.org; Sat, 17 Jan 2009 18:41:53 +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: <E1LOG7F-0003BH-QW@cvs.savannah.gnu.org>
Date: Sat, 17 Jan 2009 18:41:53 +0000
Subject: [Qemu-devel] [6361] Switch to CMD646 IDE
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: 6361
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6361
Author:   blueswir1
Date:     2009-01-17 18:41:53 +0000 (Sat, 17 Jan 2009)

Log Message:
-----------
Switch to CMD646 IDE

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

Modified: trunk/hw/sun4u.c
===================================================================
--- trunk/hw/sun4u.c	2009-01-17 06:49:15 UTC (rev 6360)
+++ trunk/hw/sun4u.c	2009-01-17 18:41:53 UTC (rev 6361)
@@ -552,8 +552,8 @@
            hd[i] = NULL;
     }
 
-    // XXX pci_cmd646_ide_init(pci_bus, hd, 1);
-    pci_piix3_ide_init(pci_bus, hd, -1, irq);
+    pci_cmd646_ide_init(pci_bus, hd, 1);
+
     /* FIXME: wire up interrupts.  */
     i8042_init(NULL/*1*/, NULL/*12*/, 0x60);
     for(i = 0; i < MAX_FD; i++) {