From: Aurelien Jarno <aurelien@aurel32.net>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [6763] ppc_oldworld: swap the MACIO and CMD646 IDE controllers
Date: Sat, 07 Mar 2009 21:35:21 +0000 [thread overview]
Message-ID: <E1Lg4Az-0006Az-D2@cvs.savannah.gnu.org> (raw)
Revision: 6763
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6763
Author: aurel32
Date: 2009-03-07 21:35:21 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
ppc_oldworld: swap the MACIO and CMD646 IDE controllers
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Modified Paths:
--------------
trunk/hw/ppc_oldworld.c
Modified: trunk/hw/ppc_oldworld.c
===================================================================
--- trunk/hw/ppc_oldworld.c 2009-03-07 21:28:24 UTC (rev 6762)
+++ trunk/hw/ppc_oldworld.c 2009-03-07 21:35:21 UTC (rev 6763)
@@ -308,12 +308,13 @@
for(i = 0; i < nb_nics; i++)
pci_nic_init(pci_bus, &nd_table[i], -1, "ne2k_pci");
- /* First IDE channel is a CMD646 on the PCI bus */
if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) {
fprintf(stderr, "qemu: too many IDE bus\n");
exit(1);
}
+
+ /* First IDE channel is a MAC IDE on the MacIO bus */
index = drive_get_index(IF_IDE, 0, 0);
if (index == -1)
hd[0] = NULL;
@@ -324,10 +325,11 @@
hd[1] = NULL;
else
hd[1] = drives_table[index].bdrv;
- hd[3] = hd[2] = NULL;
- pci_cmd646_ide_init(pci_bus, hd, 0);
+ dbdma = DBDMA_init(&dbdma_mem_index);
+ ide_mem_index[0] = -1;
+ ide_mem_index[1] = pmac_ide_init(hd, pic[0x0D], dbdma, 0x16, pic[0x02]);
- /* Second IDE channel is a MAC IDE on the MacIO bus */
+ /* Second IDE channel is a CMD646 on the PCI bus */
index = drive_get_index(IF_IDE, 1, 0);
if (index == -1)
hd[0] = NULL;
@@ -338,12 +340,9 @@
hd[1] = NULL;
else
hd[1] = drives_table[index].bdrv;
+ hd[3] = hd[2] = NULL;
+ pci_cmd646_ide_init(pci_bus, hd, 0);
- dbdma = DBDMA_init(&dbdma_mem_index);
-
- ide_mem_index[0] = -1;
- ide_mem_index[1] = pmac_ide_init(hd, pic[0x0D], dbdma, 0x16, pic[0x02]);
-
/* cuda also initialize ADB */
cuda_init(&cuda_mem_index, pic[0x12]);
reply other threads:[~2009-03-07 21:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1Lg4Az-0006Az-D2@cvs.savannah.gnu.org \
--to=aurelien@aurel32.net \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.