From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V28Is-0000bq-ND for qemu-devel@nongnu.org; Wed, 24 Jul 2013 19:17:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V28Ir-0001pf-5l for qemu-devel@nongnu.org; Wed, 24 Jul 2013 19:17:06 -0400 Received: from cantor2.suse.de ([195.135.220.15]:50940 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V28Iq-0001pL-RY for qemu-devel@nongnu.org; Wed, 24 Jul 2013 19:17:05 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 729BEA51FF for ; Thu, 25 Jul 2013 01:17:04 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 25 Jul 2013 01:16:51 +0200 Message-Id: <1374707812-21404-8-git-send-email-afaerber@suse.de> In-Reply-To: <1374707812-21404-1-git-send-email-afaerber@suse.de> References: <1374707812-21404-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next for-1.6 7/8] pl110: QOM'ify pl110, pl110_versatile and pl111 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Let pl110_versatile and pl111 inherit from pl110 and use PL110() cast; set their version index in an instance_init. Signed-off-by: Andreas F=C3=A4rber --- hw/display/pl110.c | 71 ++++++++++++++++++++++--------------------------= ------ 1 file changed, 29 insertions(+), 42 deletions(-) diff --git a/hw/display/pl110.c b/hw/display/pl110.c index 7c2cd36..c774e46 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -39,8 +39,12 @@ enum pl110_version PL111 }; =20 +#define TYPE_PL110 "pl110" +#define PL110(obj) OBJECT_CHECK(PL110State, (obj), TYPE_PL110) + typedef struct PL110State { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; QemuConsole *con; =20 @@ -129,6 +133,7 @@ static int pl110_enabled(PL110State *s) static void pl110_update_display(void *opaque) { PL110State *s =3D (PL110State *)opaque; + SysBusDevice *sbd; DisplaySurface *surface =3D qemu_console_surface(s->con); drawfn* fntable; drawfn fn; @@ -138,8 +143,11 @@ static void pl110_update_display(void *opaque) int first; int last; =20 - if (!pl110_enabled(s)) + if (!pl110_enabled(s)) { return; + } + + sbd =3D SYS_BUS_DEVICE(s); =20 switch (surface_bits_per_pixel(surface)) { case 0: @@ -232,7 +240,7 @@ static void pl110_update_display(void *opaque) } dest_width *=3D s->cols; first =3D 0; - framebuffer_update_display(surface, sysbus_address_space(&s->busdev)= , + framebuffer_update_display(surface, sysbus_address_space(sbd), s->upbase, s->cols, s->rows, src_width, dest_width, 0, s->invalidate, @@ -449,30 +457,31 @@ static const GraphicHwOps pl110_gfx_ops =3D { .gfx_update =3D pl110_update_display, }; =20 -static int pl110_init(SysBusDevice *dev) +static int pl110_init(SysBusDevice *sbd) { - PL110State *s =3D FROM_SYSBUS(PL110State, dev); + DeviceState *dev =3D DEVICE(sbd); + PL110State *s =3D PL110(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl110_ops, s, "pl110", = 0x1000); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_irq(dev, &s->irq); - qdev_init_gpio_in(&s->busdev.qdev, pl110_mux_ctrl_set, 1); - s->con =3D graphic_console_init(DEVICE(dev), &pl110_gfx_ops, s); + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_irq(sbd, &s->irq); + qdev_init_gpio_in(dev, pl110_mux_ctrl_set, 1); + s->con =3D graphic_console_init(dev, &pl110_gfx_ops, s); return 0; } =20 -static int pl110_versatile_init(SysBusDevice *dev) +static void pl110_versatile_init(Object *obj) { - PL110State *s =3D FROM_SYSBUS(PL110State, dev); + PL110State *s =3D PL110(obj); + s->version =3D PL110_VERSATILE; - return pl110_init(dev); } =20 -static int pl111_init(SysBusDevice *dev) +static void pl111_init(Object *obj) { - PL110State *s =3D FROM_SYSBUS(PL110State, dev); + PL110State *s =3D PL110(obj); + s->version =3D PL111; - return pl110_init(dev); } =20 static void pl110_class_init(ObjectClass *klass, void *data) @@ -486,44 +495,22 @@ static void pl110_class_init(ObjectClass *klass, vo= id *data) } =20 static const TypeInfo pl110_info =3D { - .name =3D "pl110", + .name =3D TYPE_PL110, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PL110State), .class_init =3D pl110_class_init, }; =20 -static void pl110_versatile_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); - - k->init =3D pl110_versatile_init; - dc->no_user =3D 1; - dc->vmsd =3D &vmstate_pl110; -} - static const TypeInfo pl110_versatile_info =3D { .name =3D "pl110_versatile", - .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(PL110State), - .class_init =3D pl110_versatile_class_init, + .parent =3D TYPE_PL110, + .instance_init =3D pl110_versatile_init, }; =20 -static void pl111_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); - - k->init =3D pl111_init; - dc->no_user =3D 1; - dc->vmsd =3D &vmstate_pl110; -} - static const TypeInfo pl111_info =3D { .name =3D "pl111", - .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(PL110State), - .class_init =3D pl111_class_init, + .parent =3D TYPE_PL110, + .instance_init =3D pl111_init, }; =20 static void pl110_register_types(void) --=20 1.8.1.4