motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

added PCI bus

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@961 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2004-06-21 19:43:00 +00:00
parent 7c29d0c0cf
commit 46e50e9d58
9 changed files with 70 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hw/ide.c
View file

@ -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