[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RESEND PATCH 10/12] hw/misc: QOM'ify mst_fpga.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-arm] [RESEND PATCH 10/12] hw/misc: QOM'ify mst_fpga.c |
Date: |
Mon, 13 Jun 2016 18:54:13 +0800 |
Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/misc/mst_fpga.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c
index 48d7dfb..a10f049 100644
--- a/hw/misc/mst_fpga.c
+++ b/hw/misc/mst_fpga.c
@@ -200,10 +200,11 @@ static int mst_fpga_post_load(void *opaque, int
version_id)
return 0;
}
-static int mst_fpga_init(SysBusDevice *sbd)
+static void mst_fpga_init(Object *obj)
{
- DeviceState *dev = DEVICE(sbd);
- mst_irq_state *s = MAINSTONE_FPGA(dev);
+ DeviceState *dev = DEVICE(obj);
+ mst_irq_state *s = MAINSTONE_FPGA(obj);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
s->pcmcia0 = MST_PCMCIAx_READY | MST_PCMCIAx_nCD;
s->pcmcia1 = MST_PCMCIAx_READY | MST_PCMCIAx_nCD;
@@ -213,10 +214,9 @@ static int mst_fpga_init(SysBusDevice *sbd)
/* alloc the external 16 irqs */
qdev_init_gpio_in(dev, mst_fpga_set_irq, MST_NUM_IRQS);
- memory_region_init_io(&s->iomem, OBJECT(s), &mst_fpga_ops, s,
+ memory_region_init_io(&s->iomem, obj, &mst_fpga_ops, s,
"fpga", 0x00100000);
sysbus_init_mmio(sbd, &s->iomem);
- return 0;
}
static VMStateDescription vmstate_mst_fpga_regs = {
@@ -245,9 +245,7 @@ static VMStateDescription vmstate_mst_fpga_regs = {
static void mst_fpga_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = mst_fpga_init;
dc->desc = "Mainstone II FPGA";
dc->vmsd = &vmstate_mst_fpga_regs;
}
@@ -256,6 +254,7 @@ static const TypeInfo mst_fpga_info = {
.name = TYPE_MAINSTONE_FPGA,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(mst_irq_state),
+ .instance_init = mst_fpga_init,
.class_init = mst_fpga_class_init,
};
--
2.1.4
- [Qemu-arm] [RESEND PATCH 00/12] some ARM platform QOM'ify work (resend), xiaoqiang zhao, 2016/06/13
- [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 <=
- [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, 2016/06/13
- [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