diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2009-10-30 21:21:03 +0900 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-11-09 08:43:07 -0600 |
| commit | d1e3eb7a908c371aa8fa1d74f19080c7ecf17411 (patch) | |
| tree | c35a15a25e94fd763bfa99c402fccd2cbc11bfb6 /hw/ide | |
| parent | e4ea1840f93a3d0fa466d036f6bb496257fc8f97 (diff) | |
| download | qemu-d1e3eb7a908c371aa8fa1d74f19080c7ecf17411.tar.gz qemu-d1e3eb7a908c371aa8fa1d74f19080c7ecf17411.tar.bz2 qemu-d1e3eb7a908c371aa8fa1d74f19080c7ecf17411.zip | |
pci: s/PCI_ADDRESS_SPACE_/PCI_BASE_ADDRESS_SPACE_/ to match pci_regs.h
make constants for pci base address match pci_regs.h by
renaming PCI_ADDRESS_SPACE_xxx to PCI_BASE_ADDRESS_SPACE_xxx.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/cmd646.c | 10 | ||||
| -rw-r--r-- | hw/ide/piix.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index b2a3e434b3..9caeb78d91 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -221,11 +221,11 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev) pci_conf[0x51] |= 0x08; /* enable IDE1 */ } - pci_register_bar(dev, 0, 0x8, PCI_ADDRESS_SPACE_IO, ide_map); - pci_register_bar(dev, 1, 0x4, PCI_ADDRESS_SPACE_IO, ide_map); - pci_register_bar(dev, 2, 0x8, PCI_ADDRESS_SPACE_IO, ide_map); - pci_register_bar(dev, 3, 0x4, PCI_ADDRESS_SPACE_IO, ide_map); - pci_register_bar(dev, 4, 0x10, PCI_ADDRESS_SPACE_IO, bmdma_map); + pci_register_bar(dev, 0, 0x8, PCI_BASE_ADDRESS_SPACE_IO, ide_map); + pci_register_bar(dev, 1, 0x4, PCI_BASE_ADDRESS_SPACE_IO, ide_map); + pci_register_bar(dev, 2, 0x8, PCI_BASE_ADDRESS_SPACE_IO, ide_map); + pci_register_bar(dev, 3, 0x4, PCI_BASE_ADDRESS_SPACE_IO, ide_map); + pci_register_bar(dev, 4, 0x10, PCI_BASE_ADDRESS_SPACE_IO, bmdma_map); pci_conf[0x3d] = 0x01; // interrupt on pin 1 diff --git a/hw/ide/piix.c b/hw/ide/piix.c index a4756e0f27..6e50fc2cb2 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -123,7 +123,7 @@ static int pci_piix_ide_initfn(PCIIDEState *d) qemu_register_reset(piix3_reset, d); - pci_register_bar(&d->dev, 4, 0x10, PCI_ADDRESS_SPACE_IO, bmdma_map); + pci_register_bar(&d->dev, 4, 0x10, PCI_BASE_ADDRESS_SPACE_IO, bmdma_map); vmstate_register(0, &vmstate_ide_pci, d); |