diff options
| author | bellard | 2004-06-21 21:43:00 +0200 |
|---|---|---|
| committer | bellard | 2004-06-21 21:43:00 +0200 |
| commit | 46e50e9d58aa0fd6ab8f5cadceb8b55ee7e1d806 (patch) | |
| tree | 98b646b43c0032b4d2fafb8ad16d7bde2fbd69bc /hw/ide.c | |
| parent | dma init fix (diff) | |
| download | qemu-46e50e9d58aa0fd6ab8f5cadceb8b55ee7e1d806.tar.gz qemu-46e50e9d58aa0fd6ab8f5cadceb8b55ee7e1d806.tar.xz qemu-46e50e9d58aa0fd6ab8f5cadceb8b55ee7e1d806.zip | |
added PCI bus
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@961 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ide.c')
| -rw-r--r-- | hw/ide.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1579,14 +1579,14 @@ static void ide_map(PCIDevice *pci_dev, int region_num, } /* hd_table must contain 4 block drivers */ -void pci_ide_init(BlockDriverState **hd_table) +void pci_ide_init(PCIBus *bus, BlockDriverState **hd_table) { PCIIDEState *d; uint8_t *pci_conf; int i; - d = (PCIIDEState *)pci_register_device("IDE", sizeof(PCIIDEState), - 0, -1, + d = (PCIIDEState *)pci_register_device(bus, "IDE", sizeof(PCIIDEState), + -1, NULL, NULL); pci_conf = d->dev.config; pci_conf[0x00] = 0x86; // Intel @@ -1621,14 +1621,15 @@ void pci_ide_init(BlockDriverState **hd_table) /* hd_table must contain 4 block drivers */ /* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ -void pci_piix3_ide_init(BlockDriverState **hd_table) +void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table) { PCIIDEState *d; uint8_t *pci_conf; /* register a function 1 of PIIX3 */ - d = (PCIIDEState *)pci_register_device("PIIX3 IDE", sizeof(PCIIDEState), - 0, ((PCIDevice *)piix3_state)->devfn + 1, + d = (PCIIDEState *)pci_register_device(bus, "PIIX3 IDE", + sizeof(PCIIDEState), + ((PCIDevice *)piix3_state)->devfn + 1, NULL, NULL); pci_conf = d->dev.config; pci_conf[0x00] = 0x86; // Intel |