OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/display: QOM'ify jazz_led.c

Browse Source 
* Drop the old SysBus init function and use instance_init
* Move graphic_console_init into realize stage

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
This commit is contained in:
xiaoqiang.zhao 2016-05-05 11:04:46 +08:00 committed by Leon Alrae
parent 9d989c732b
commit 7fe91a5b33
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/display/jazz_led.c
View File

@ -267,16 +267,20 @@ static const GraphicHwOps jazz_led_ops = {
.text_update = jazz_led_text_update, .text_update = jazz_led_text_update,
}; };
static int jazz_led_init(SysBusDevice *dev) static void jazz_led_init(Object *obj)
{
LedState *s = JAZZ_LED(obj);
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
memory_region_init_io(&s->iomem, obj, &led_ops, s, "led", 1);
sysbus_init_mmio(dev, &s->iomem);
}
static void jazz_led_realize(DeviceState *dev, Error **errp)
{ {
LedState *s = JAZZ_LED(dev); LedState *s = JAZZ_LED(dev);
memory_region_init_io(&s->iomem, OBJECT(s), &led_ops, s, "led", 1); s->con = graphic_console_init(dev, 0, &jazz_led_ops, s);
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) static void jazz_led_reset(DeviceState *d)
@ -291,18 +295,18 @@ static void jazz_led_reset(DeviceState *d)
static void jazz_led_class_init(ObjectClass *klass, void *data) static void jazz_led_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = jazz_led_init;
dc->desc = "Jazz LED display", dc->desc = "Jazz LED display",
dc->vmsd = &vmstate_jazz_led; dc->vmsd = &vmstate_jazz_led;
dc->reset = jazz_led_reset; dc->reset = jazz_led_reset;
dc->realize = jazz_led_realize;
} }
static const TypeInfo jazz_led_info = { static const TypeInfo jazz_led_info = {
.name = TYPE_JAZZ_LED, .name = TYPE_JAZZ_LED,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LedState), .instance_size = sizeof(LedState),
.instance_init = jazz_led_init,
.class_init = jazz_led_class_init, .class_init = jazz_led_class_init,
}; };