[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] QOM hw/display/pl110.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH 6/6] QOM hw/display/pl110.c |
Date: |
Thu, 24 Mar 2016 18:29:34 +0800 |
---
hw/display/pl110.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/hw/display/pl110.c b/hw/display/pl110.c
index d589959..342e7ed 100644
--- a/hw/display/pl110.c
+++ b/hw/display/pl110.c
@@ -465,23 +465,17 @@ static const GraphicHwOps pl110_gfx_ops = {
.gfx_update = pl110_update_display,
};
-static int pl110_initfn(SysBusDevice *sbd)
+static void pl110_init(Object *obj)
{
- DeviceState *dev = DEVICE(sbd);
- PL110State *s = PL110(dev);
+ DeviceState *dev = DEVICE(obj);
+ PL110State *s = PL110(obj);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
- memory_region_init_io(&s->iomem, OBJECT(s), &pl110_ops, s, "pl110",
0x1000);
+ memory_region_init_io(&s->iomem, obj, &pl110_ops, s, "pl110", 0x1000);
sysbus_init_mmio(sbd, &s->iomem);
sysbus_init_irq(sbd, &s->irq);
qdev_init_gpio_in(dev, pl110_mux_ctrl_set, 1);
s->con = graphic_console_init(dev, 0, &pl110_gfx_ops, s);
- return 0;
-}
-
-static void pl110_init(Object *obj)
-{
- PL110State *s = PL110(obj);
-
s->version = PL110;
}
@@ -502,9 +496,7 @@ static void pl111_init(Object *obj)
static void pl110_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = pl110_initfn;
set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
dc->vmsd = &vmstate_pl110;
}
--
2.1.4
- [Qemu-devel] [PATCH 0/5] QOM'ify hw/display devices, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 3/6] hw/display/jazz_led.c, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 4/5] hw/display: QOM'ify milkymist-vgafb.c, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 2/5] hw/display: QOM'ify jazz_led.c, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 6/6] QOM hw/display/pl110.c,
xiaoqiang zhao <=
- [Qemu-devel] [PATCH 1/5] hw/display: QOM'ify exynos4210_fimd.c, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 5/5] hw/display: QOM'ify pl110.c, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 5/6] hw/display/milkymist-vgafb.c, xiaoqiang zhao, 2016/03/24