[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RESEND PATCH 07/12] hw/gpio: QOM'ify zaurus.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-arm] [RESEND PATCH 07/12] hw/gpio: QOM'ify zaurus.c |
Date: |
Mon, 13 Jun 2016 18:54:10 +0800 |
Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <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,
};
--
2.1.4
- [Qemu-arm] [RESEND PATCH 02/12] hw/i2c: QOM'ify exynos4210_i2c.c, (continued)
- [Qemu-arm] [RESEND PATCH 02/12] hw/i2c: QOM'ify exynos4210_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 05/12] hw/gpio: QOM'ify omap_gpio.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 01/12] hw/i2c: QOM'ify bitbang_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 04/12] hw/i2c: QOM'ify versatile_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 08/12] hw/misc: QOM'ify arm_l2x0.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 06/12] hw/gpio: QOM'ify pl061.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 09/12] hw/misc: QOM'ify exynos4210_pmu.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 12/12] hw/sd: QOM'ify pl181.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 10/12] hw/misc: QOM'ify mst_fpga.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 11/12] hw/dma: QOM'ify pxa2xx_dma.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 07/12] hw/gpio: QOM'ify zaurus.c,
xiaoqiang zhao <=
- [Qemu-arm] [RESEND PATCH 03/12] hw/i2c: QOM'ify omap_i2c.c, xiaoqiang zhao, 2016/06/13
- Re: [Qemu-arm] [RESEND PATCH 00/12] some ARM platform QOM'ify work (resend), Peter Maydell, 2016/06/14