summaryrefslogtreecommitdiff
path: root/hw/unin_pci.c
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2009-11-12 14:58:34 +0900
committerMichael S. Tsirkin <mst@redhat.com>2009-12-01 17:51:37 +0200
commitf08b32fe959c157d3c3acdad9c7bfe56b5597af1 (patch)
tree24a4eadb38a76c490d018dea62b1aba3ef0aeaf3 /hw/unin_pci.c
parent8d6514f8dd2a8102ec3d577b13cb565fb9cfe73c (diff)
downloadqemu-f08b32fe959c157d3c3acdad9c7bfe56b5597af1.tar.gz
pci: shorten pci_host_{conf, data}_register_xxx function a bit.
pci_host_data_register_io_memory and its variants are too long a bit. So shorten them. Now they are pci_host_{conf, data}_register_{mmio, mmio_noswap, ioport}() Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/unin_pci.c')
-rw-r--r--hw/unin_pci.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/hw/unin_pci.c b/hw/unin_pci.c
index fe13e7b3eb..5b3f118fc5 100644
--- a/hw/unin_pci.c
+++ b/hw/unin_pci.c
@@ -84,8 +84,8 @@ static int pci_unin_main_init_device(SysBusDevice *dev)
/* Uninorth main bus */
s = FROM_SYSBUS(UNINState, dev);
- pci_mem_config = pci_host_config_register_io_memory(&s->host_state);
- pci_mem_data = pci_host_data_register_io_memory(&s->host_state);
+ pci_mem_config = pci_host_conf_register_mmio(&s->host_state);
+ pci_mem_data = pci_host_data_register_mmio(&s->host_state);
sysbus_init_mmio(dev, 0x1000, pci_mem_config);
sysbus_init_mmio(dev, 0x1000, pci_mem_data);
@@ -103,8 +103,8 @@ static int pci_dec_21154_init_device(SysBusDevice *dev)
s = FROM_SYSBUS(UNINState, dev);
// XXX: s = &pci_bridge[2];
- pci_mem_config = pci_host_config_register_io_memory_noswap(&s->host_state);
- pci_mem_data = pci_host_data_register_io_memory(&s->host_state);
+ pci_mem_config = pci_host_conf_register_mmio_noswap(&s->host_state);
+ pci_mem_data = pci_host_data_register_mmio(&s->host_state);
sysbus_init_mmio(dev, 0x1000, pci_mem_config);
sysbus_init_mmio(dev, 0x1000, pci_mem_data);
return 0;
@@ -118,8 +118,8 @@ static int pci_unin_agp_init_device(SysBusDevice *dev)
/* Uninorth AGP bus */
s = FROM_SYSBUS(UNINState, dev);
- pci_mem_config = pci_host_config_register_io_memory_noswap(&s->host_state);
- pci_mem_data = pci_host_data_register_io_memory(&s->host_state);
+ pci_mem_config = pci_host_conf_register_mmio_noswap(&s->host_state);
+ pci_mem_data = pci_host_data_register_mmio(&s->host_state);
sysbus_init_mmio(dev, 0x1000, pci_mem_config);
sysbus_init_mmio(dev, 0x1000, pci_mem_data);
return 0;
@@ -133,8 +133,8 @@ static int pci_unin_internal_init_device(SysBusDevice *dev)
/* Uninorth internal bus */
s = FROM_SYSBUS(UNINState, dev);
- pci_mem_config = pci_host_config_register_io_memory_noswap(&s->host_state);
- pci_mem_data = pci_host_data_register_io_memory(&s->host_state);
+ pci_mem_config = pci_host_conf_register_mmio_noswap(&s->host_state);
+ pci_mem_data = pci_host_data_register_mmio(&s->host_state);
sysbus_init_mmio(dev, 0x1000, pci_mem_config);
sysbus_init_mmio(dev, 0x1000, pci_mem_data);
return 0;