[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] hw/display/jazz_led.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH 3/6] hw/display/jazz_led.c |
Date: |
Thu, 24 Mar 2016 18:29:28 +0800 |
---
hw/display/jazz_led.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c
index 09dcdb4..e0a079a 100644
--- a/hw/display/jazz_led.c
+++ b/hw/display/jazz_led.c
@@ -267,16 +267,15 @@ static const GraphicHwOps jazz_led_ops = {
.text_update = jazz_led_text_update,
};
-static int jazz_led_init(SysBusDevice *dev)
+static void jazz_led_init(Object *obj)
{
- LedState *s = JAZZ_LED(dev);
+ LedState *s = JAZZ_LED(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
- memory_region_init_io(&s->iomem, OBJECT(s), &led_ops, s, "led", 1);
+ memory_region_init_io(&s->iomem, obj, &led_ops, s, "led", 1);
sysbus_init_mmio(dev, &s->iomem);
s->con = graphic_console_init(DEVICE(dev), 0, &jazz_led_ops, s);
-
- return 0;
}
static void jazz_led_reset(DeviceState *d)
@@ -291,9 +290,7 @@ static void jazz_led_reset(DeviceState *d)
static void jazz_led_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = jazz_led_init;
dc->desc = "Jazz LED display",
dc->vmsd = &vmstate_jazz_led;
dc->reset = jazz_led_reset;
@@ -303,6 +300,7 @@ static const TypeInfo jazz_led_info = {
.name = TYPE_JAZZ_LED,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LedState),
+ .instance_init = jazz_led_init,
.class_init = jazz_led_class_init,
};
--
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 <=
- [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, 2016/03/24
- [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