aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-08 16:01:33 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-08 16:01:33 +0000
commit0516ede089e23f8434b6bf3294e5ccf30f5d5549 (patch)
tree7cdf0ba92821355b10f656132394c3a3b0d667d2
parent5ce4aafd942d24d3fcde649f12636c9092c718c6 (diff)
cmd646: correctly enable IDE channels
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6232 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--hw/ide.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/ide.c b/hw/ide.c
index 915390ae0a..64e7d75a26 100644
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -3185,9 +3185,10 @@ void pci_cmd646_ide_init(PCIBus *bus, BlockDriverState **hd_table,
pci_conf[0x0b] = 0x01; // class_base = PCI_mass_storage
pci_conf[0x0e] = 0x00; // header_type
+ pci_conf[0x51] = 0x04; // enable IDE0
if (secondary_ide_enabled) {
/* XXX: if not enabled, really disable the seconday IDE controller */
- pci_conf[0x51] = 0x80; /* enable IDE1 */
+ pci_conf[0x51] |= 0x08; /* enable IDE1 */
}
pci_register_io_region((PCIDevice *)d, 0, 0x8,