diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-01 11:54:39 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-01 11:54:39 -0600 |
| commit | 365369847f2827b14b96c52d0fbaf9cce404e68a (patch) | |
| tree | 1ee8e1be27e3223b310bbb3d91bf2e54435280b0 /hw/apb_pci.c | |
| parent | 0cbfcd2b03bd602b7c65f73267bf84d4f7e9fe8d (diff) | |
| parent | 98304c846d8866dae6322ef400ce6595b23cfc41 (diff) | |
| download | qemu-365369847f2827b14b96c52d0fbaf9cce404e68a.zip qemu-365369847f2827b14b96c52d0fbaf9cce404e68a.tar.gz qemu-365369847f2827b14b96c52d0fbaf9cce404e68a.tar.bz2 | |
Merge commit 'mst/for_anthony' into mst
Diffstat (limited to 'hw/apb_pci.c')
| -rw-r--r-- | hw/apb_pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 3999879..f2ed136 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -29,6 +29,7 @@ #include "sysbus.h" #include "pci.h" #include "pci_host.h" +#include "apb_pci.h" /* debug APB */ //#define DEBUG_APB @@ -235,10 +236,10 @@ static int pci_pbm_init_device(SysBusDevice *dev) pci_apb_iowrite, s); sysbus_init_mmio(dev, 0x10000ULL, pci_ioport); /* mem_config */ - pci_mem_config = pci_host_config_register_io_memory(&s->host_state); + pci_mem_config = pci_host_conf_register_mmio(&s->host_state); sysbus_init_mmio(dev, 0x10ULL, pci_mem_config); /* mem_data */ - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); + pci_mem_data = pci_host_data_register_mmio(&s->host_state); sysbus_init_mmio(dev, 0x10000000ULL, pci_mem_data); return 0; } |