From cf79c64d582c0d75da0b0a540840e2931f647f01 Mon Sep 17 00:00:00 2001 From: xiaoqiang zhao Date: Fri, 6 May 2016 18:59:33 +0800 Subject: hw/display: QOM'ify milkymist-tmu2.c * Drop the old SysBus init function and use instance_init * Move tmu2_glx_init into realize stage Signed-off-by: xiaoqiang zhao Reviewed-by: Peter Maydell Acked-by: Michael Walle Tested-by: Michael Walle Signed-off-by: Michael Walle --- hw/display/milkymist-tmu2.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'hw/display') diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index 9bc88f93b6..cee8fb089b 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -443,21 +443,25 @@ static void milkymist_tmu2_reset(DeviceState *d) } } -static int milkymist_tmu2_init(SysBusDevice *dev) +static void milkymist_tmu2_init(Object *obj) { - MilkymistTMU2State *s = MILKYMIST_TMU2(dev); - - if (tmu2_glx_init(s)) { - return 1; - } + MilkymistTMU2State *s = MILKYMIST_TMU2(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); sysbus_init_irq(dev, &s->irq); - memory_region_init_io(&s->regs_region, OBJECT(s), &tmu2_mmio_ops, s, + memory_region_init_io(&s->regs_region, obj, &tmu2_mmio_ops, s, "milkymist-tmu2", R_MAX * 4); sysbus_init_mmio(dev, &s->regs_region); +} - return 0; +static void milkymist_tmu2_realize(DeviceState *dev, Error **errp) +{ + MilkymistTMU2State *s = MILKYMIST_TMU2(dev); + + if (tmu2_glx_init(s)) { + error_setg(errp, "tmu2_glx_init failed"); + } } static const VMStateDescription vmstate_milkymist_tmu2 = { @@ -473,9 +477,8 @@ static const VMStateDescription vmstate_milkymist_tmu2 = { static void milkymist_tmu2_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = milkymist_tmu2_init; + dc->realize = milkymist_tmu2_realize; dc->reset = milkymist_tmu2_reset; dc->vmsd = &vmstate_milkymist_tmu2; } @@ -484,6 +487,7 @@ static const TypeInfo milkymist_tmu2_info = { .name = TYPE_MILKYMIST_TMU2, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(MilkymistTMU2State), + .instance_init = milkymist_tmu2_init, .class_init = milkymist_tmu2_class_init, }; -- cgit v1.2.3-55-g7522 From 165b244b98923ad94898a693f08d77423176080c Mon Sep 17 00:00:00 2001 From: xiaoqiang zhao Date: Fri, 6 May 2016 18:59:34 +0800 Subject: hw/display: QOM'ify milkymist-vgafb.c * Drop the old SysBus init function and use instance_init * Move graphic_console_init into realize stage Signed-off-by: xiaoqiang zhao Reviewed-by: Peter Maydell Acked-by: Michael Walle Tested-by: Michael Walle Signed-off-by: Michael Walle --- hw/display/milkymist-vgafb.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'hw/display') diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c index 19ca256479..39e16d6c8f 100644 --- a/hw/display/milkymist-vgafb.c +++ b/hw/display/milkymist-vgafb.c @@ -292,17 +292,21 @@ static const GraphicHwOps vgafb_ops = { .gfx_update = vgafb_update_display, }; -static int milkymist_vgafb_init(SysBusDevice *dev) +static void milkymist_vgafb_init(Object *obj) { - MilkymistVgafbState *s = MILKYMIST_VGAFB(dev); + MilkymistVgafbState *s = MILKYMIST_VGAFB(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); memory_region_init_io(&s->regs_region, OBJECT(s), &vgafb_mmio_ops, s, "milkymist-vgafb", R_MAX * 4); sysbus_init_mmio(dev, &s->regs_region); +} - s->con = graphic_console_init(DEVICE(dev), 0, &vgafb_ops, s); +static void milkymist_vgafb_realize(DeviceState *dev, Error **errp) +{ + MilkymistVgafbState *s = MILKYMIST_VGAFB(dev); - return 0; + s->con = graphic_console_init(dev, 0, &vgafb_ops, s); } static int vgafb_post_load(void *opaque, int version_id) @@ -331,18 +335,18 @@ static Property milkymist_vgafb_properties[] = { static void milkymist_vgafb_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = milkymist_vgafb_init; dc->reset = milkymist_vgafb_reset; dc->vmsd = &vmstate_milkymist_vgafb; dc->props = milkymist_vgafb_properties; + dc->realize = milkymist_vgafb_realize; } static const TypeInfo milkymist_vgafb_info = { .name = TYPE_MILKYMIST_VGAFB, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(MilkymistVgafbState), + .instance_init = milkymist_vgafb_init, .class_init = milkymist_vgafb_class_init, }; -- cgit v1.2.3-55-g7522 From 6dbbe24337b7a8d4cac23d1cd4eedf6645ccf09b Mon Sep 17 00:00:00 2001 From: Michael Walle Date: Mon, 20 Jun 2016 17:08:41 +0100 Subject: milkymist: update specification URLs The old milkymist.org domain just forwards to mm-labs.hk nowadays. I've created a mirror of the documents. Signed-off-by: Michael Walle --- hw/audio/milkymist-ac97.c | 2 +- hw/char/milkymist-uart.c | 2 +- hw/display/milkymist-tmu2.c | 2 +- hw/display/milkymist-vgafb.c | 2 +- hw/misc/milkymist-hpdmc.c | 2 +- hw/misc/milkymist-pfpu.c | 2 +- hw/sd/milkymist-memcard.c | 2 +- hw/timer/milkymist-sysctl.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'hw/display') diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c index 5075c2b148..bc8db71ae0 100644 --- a/hw/audio/milkymist-ac97.c +++ b/hw/audio/milkymist-ac97.c @@ -18,7 +18,7 @@ * * * Specification available at: - * http://www.milkymist.org/socdoc/ac97.pdf + * http://milkymist.walle.cc/socdoc/ac97.pdf */ #include "qemu/osdep.h" diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index 72f8484668..baddb37648 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -18,7 +18,7 @@ * * * Specification available at: - * http://www.milkymist.org/socdoc/uart.pdf + * http://milkymist.walle.cc/socdoc/uart.pdf */ #include "qemu/osdep.h" diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index cee8fb089b..356483fb21 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -20,7 +20,7 @@ * * * Specification available at: - * http://www.milkymist.org/socdoc/tmu2.pdf + * http://milkymist.walle.cc/socdoc/tmu2.pdf * */ diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c index 39e16d6c8f..177fdac7d8 100644 --- a/hw/display/milkymist-vgafb.c +++ b/hw/display/milkymist-vgafb.c @@ -19,7 +19,7 @@ * * * Specification available at: - * http://www.milkymist.org/socdoc/vgafb.pdf + * http://milkymist.walle.cc/socdoc/vgafb.pdf */ #include "qemu/osdep.h" diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c index b97000fc49..e6140eec6b 100644 --- a/hw/misc/milkymist-hpdmc.c +++ b/hw/misc/milkymist-hpdmc.c @@ -18,7 +18,7 @@ * * * Specification available at: - * http://www.milkymist.org/socdoc/hpdmc.pdf + * http://milkymist.walle.cc/socdoc/hpdmc.pdf */ #include "qemu/osdep.h" diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c index 57acd7b365..1da21a643e 100644 --- a/hw/misc/milkymist-pfpu.c +++ b/hw/misc/milkymist-pfpu.c @@ -18,7 +18,7 @@ * * * Specification available at: - * http://www.milkymist.org/socdoc/pfpu.pdf + * http://milkymist.walle.cc/socdoc/pfpu.pdf * */ diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index c04ff02fad..1f2f0ed44a 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -18,7 +18,7 @@ * * * Specification available at: - * http://www.milkymist.org/socdoc/memcard.pdf + * http://milkymist.walle.cc/socdoc/memcard.pdf */ #include "qemu/osdep.h" diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index 30a4bc43b3..21948328ce 100644 --- a/hw/timer/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c @@ -18,7 +18,7 @@ * * * Specification available at: - * http://www.milkymist.org/socdoc/sysctl.pdf + * http://milkymist.walle.cc/socdoc/sysctl.pdf */ #include "qemu/osdep.h" -- cgit v1.2.3-55-g7522