[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/30] hw/gpio: QOM'ify zaurus.c
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 15/30] hw/gpio: QOM'ify zaurus.c |
Date: |
Tue, 14 Jun 2016 15:13:50 +0100 |
From: xiaoqiang zhao <address@hidden>
Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/gpio/zaurus.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c
index 555da28..15865e1 100644
--- a/hw/gpio/zaurus.c
+++ b/hw/gpio/zaurus.c
@@ -167,19 +167,18 @@ static void scoop_gpio_set(void *opaque, int line, int
level)
s->gpio_level &= ~(1 << line);
}
-static int scoop_init(SysBusDevice *sbd)
+static void scoop_init(Object *obj)
{
- DeviceState *dev = DEVICE(sbd);
- ScoopInfo *s = SCOOP(dev);
+ DeviceState *dev = DEVICE(obj);
+ ScoopInfo *s = SCOOP(obj);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
s->status = 0x02;
qdev_init_gpio_out(dev, s->handler, 16);
qdev_init_gpio_in(dev, scoop_gpio_set, 16);
- memory_region_init_io(&s->iomem, OBJECT(s), &scoop_ops, s, "scoop",
0x1000);
+ memory_region_init_io(&s->iomem, obj, &scoop_ops, s, "scoop", 0x1000);
sysbus_init_mmio(sbd, &s->iomem);
-
- return 0;
}
static int scoop_post_load(void *opaque, int version_id)
@@ -239,9 +238,7 @@ static const VMStateDescription vmstate_scoop_regs = {
static void scoop_sysbus_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = scoop_init;
dc->desc = "Scoop2 Sharp custom ASIC";
dc->vmsd = &vmstate_scoop_regs;
}
@@ -250,6 +247,7 @@ static const TypeInfo scoop_sysbus_info = {
.name = TYPE_SCOOP,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(ScoopInfo),
+ .instance_init = scoop_init,
.class_init = scoop_sysbus_class_init,
};
--
1.9.1
- [Qemu-devel] [PULL 00/30] target-arm queue, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 04/30] target-arm: Fix reset and migration of TTBCR(S), Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 05/30] hw/arm/virt: separate versioned type-init code, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 01/30] target-arm: kvm64: set guest PMUv3 feature bit if supported, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 12/30] hw/i2c: QOM'ify versatile_i2c.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 13/30] hw/gpio: QOM'ify omap_gpio.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 06/30] hw/arm/virt: introduce DEFINE_VIRT_MACHINE, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 14/30] hw/gpio: QOM'ify pl061.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 16/30] hw/misc: QOM'ify arm_l2x0.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 02/30] hw/arm/virt: Add PMU node for virt machine, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 15/30] hw/gpio: QOM'ify zaurus.c,
Peter Maydell <=
- [Qemu-devel] [PULL 08/30] hw/arm/virt: create the 2.7 machine type, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 10/30] hw/i2c: QOM'ify exynos4210_i2c.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 11/30] hw/i2c: QOM'ify omap_i2c.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 09/30] hw/i2c: QOM'ify bitbang_i2c.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 18/30] hw/misc: QOM'ify mst_fpga.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 17/30] hw/misc: QOM'ify exynos4210_pmu.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 23/30] i2c: Factor our send() and recv() common logic, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 22/30] i2c: implement broadcast write, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 29/30] arm: xlnx-zynqmp: Add xlnx-dp and xlnx-dpdma, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 30/30] target-arm: Don't permit ARMv8-only Neon insns on ARMv7, Peter Maydell, 2016/06/14