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

pci: rename pci_register_bar_region() to pci_register_bar()

Browse source 
Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Avi Kivity 2011-08-08 16:09:31 +03:00 • committed by Anthony Liguori
parent 50181f10da
commit e824b2cc3b
29 changed files with 68 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hw/ide/cmd646.c
View file

@ -270,16 +270,12 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev)
setup_cmd646_bar(d, 0);
setup_cmd646_bar(d, 1);
pci_register_bar_region(dev, 0, PCI_BASE_ADDRESS_SPACE_IO,
&d->cmd646_bar[0].data);
pci_register_bar_region(dev, 1, PCI_BASE_ADDRESS_SPACE_IO,
&d->cmd646_bar[0].cmd);
pci_register_bar_region(dev, 2, PCI_BASE_ADDRESS_SPACE_IO,
&d->cmd646_bar[1].data);
pci_register_bar_region(dev, 3, PCI_BASE_ADDRESS_SPACE_IO,
&d->cmd646_bar[1].cmd);
pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd646_bar[0].data);
pci_register_bar(dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd646_bar[0].cmd);
pci_register_bar(dev, 2, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd646_bar[1].data);
pci_register_bar(dev, 3, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd646_bar[1].cmd);
bmdma_setup_bar(d);
pci_register_bar_region(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
/* TODO: RST# value should be 0 */
pci_conf[PCI_INTERRUPT_PIN] = 0x01; // interrupt on pin 1

2
hw/ide/ich.c
View file

@ -98,7 +98,7 @@ static int pci_ich9_ahci_init(PCIDevice *dev)
msi_init(dev, 0x50, 1, true, false);
d->ahci.irq = d->card.irq[0];
pci_register_bar_region(&d->card, 5, 0, &d->ahci.mem);
pci_register_bar(&d->card, 5, 0, &d->ahci.mem);
return 0;
}

3
hw/ide/piix.c
View file

@ -155,8 +155,7 @@ static int pci_piix_ide_initfn(PCIDevice *dev)
qemu_register_reset(piix3_reset, d);
bmdma_setup_bar(d);
pci_register_bar_region(&d->dev, 4, PCI_BASE_ADDRESS_SPACE_IO,
&d->bmdma_bar);
pci_register_bar(&d->dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
vmstate_register(&d->dev.qdev, 0, &vmstate_ide_pci, d);

3
hw/ide/via.c
View file

@ -180,8 +180,7 @@ static int vt82c686b_ide_initfn(PCIDevice *dev)
qemu_register_reset(via_reset, d);
bmdma_setup_bar(d);
pci_register_bar_region(&d->dev, 4, PCI_BASE_ADDRESS_SPACE_IO,
&d->bmdma_bar);
pci_register_bar(&d->dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
vmstate_register(&dev->qdev, 0, &vmstate_ide_pci, d);