summaryrefslogtreecommitdiff
path: root/hw/slavio_misc.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-11-27 11:38:10 +0200
committerAvi Kivity <avi@redhat.com>2011-11-28 15:38:45 +0200
commit750ecd444ff7e4e27928d65164228b3e1ae5a95b (patch)
tree6334f0edc1744e8e2fb78965d6c855bcae165b9c /hw/slavio_misc.c
parent3f7f1c8067157e06fd468f09d050803c11d4ae53 (diff)
downloadqemu-750ecd444ff7e4e27928d65164228b3e1ae5a95b.tar.gz
qemu-750ecd444ff7e4e27928d65164228b3e1ae5a95b.tar.bz2
qemu-750ecd444ff7e4e27928d65164228b3e1ae5a95b.zip
sysbus: rename sysbus_init_mmio_region() to sysbus_init_mmio()
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/slavio_misc.c')
-rw-r--r--hw/slavio_misc.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c
index ccc1c53412..484301c48a 100644
--- a/hw/slavio_misc.c
+++ b/hw/slavio_misc.c
@@ -414,7 +414,7 @@ static int apc_init1(SysBusDevice *dev)
/* Power management (APC) XXX: not a Slavio device */
memory_region_init_io(&s->iomem, &apc_mem_ops, s,
"apc", MISC_SIZE);
- sysbus_init_mmio_region(dev, &s->iomem);
+ sysbus_init_mmio(dev, &s->iomem);
return 0;
}
@@ -429,39 +429,39 @@ static int slavio_misc_init1(SysBusDevice *dev)
/* Slavio control */
memory_region_init_io(&s->cfg_iomem, &slavio_cfg_mem_ops, s,
"configuration", MISC_SIZE);
- sysbus_init_mmio_region(dev, &s->cfg_iomem);
+ sysbus_init_mmio(dev, &s->cfg_iomem);
/* Diagnostics */
memory_region_init_io(&s->diag_iomem, &slavio_diag_mem_ops, s,
"diagnostic", MISC_SIZE);
- sysbus_init_mmio_region(dev, &s->diag_iomem);
+ sysbus_init_mmio(dev, &s->diag_iomem);
/* Modem control */
memory_region_init_io(&s->mdm_iomem, &slavio_mdm_mem_ops, s,
"modem", MISC_SIZE);
- sysbus_init_mmio_region(dev, &s->mdm_iomem);
+ sysbus_init_mmio(dev, &s->mdm_iomem);
/* 16 bit registers */
/* ss600mp diag LEDs */
memory_region_init_io(&s->led_iomem, &slavio_led_mem_ops, s,
"leds", MISC_SIZE);
- sysbus_init_mmio_region(dev, &s->led_iomem);
+ sysbus_init_mmio(dev, &s->led_iomem);
/* 32 bit registers */
/* System control */
memory_region_init_io(&s->sysctrl_iomem, &slavio_sysctrl_mem_ops, s,
"system-control", MISC_SIZE);
- sysbus_init_mmio_region(dev, &s->sysctrl_iomem);
+ sysbus_init_mmio(dev, &s->sysctrl_iomem);
/* AUX 1 (Misc System Functions) */
memory_region_init_io(&s->aux1_iomem, &slavio_aux1_mem_ops, s,
"misc-system-functions", MISC_SIZE);
- sysbus_init_mmio_region(dev, &s->aux1_iomem);
+ sysbus_init_mmio(dev, &s->aux1_iomem);
/* AUX 2 (Software Powerdown Control) */
memory_region_init_io(&s->aux2_iomem, &slavio_aux2_mem_ops, s,
"software-powerdown-control", MISC_SIZE);
- sysbus_init_mmio_region(dev, &s->aux2_iomem);
+ sysbus_init_mmio(dev, &s->aux2_iomem);
qdev_init_gpio_in(&dev->qdev, slavio_set_power_fail, 1);