From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2lI6-0001AQ-PB for qemu-devel@nongnu.org; Fri, 26 Jul 2013 12:54:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2lI3-0000FJ-Km for qemu-devel@nongnu.org; Fri, 26 Jul 2013 12:54:54 -0400 Received: from cantor2.suse.de ([195.135.220.15]:38298 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2lI3-0000DI-BZ for qemu-devel@nongnu.org; Fri, 26 Jul 2013 12:54:51 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 866EBA51FF for ; Fri, 26 Jul 2013 18:54:50 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 18:54:47 +0200 Message-Id: <1374857687-20332-4-git-send-email-afaerber@suse.de> In-Reply-To: <1374857687-20332-1-git-send-email-afaerber@suse.de> References: <1374857687-20332-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 3/3] pl050: QOM'ify pl050_keyboard and pl050_mouse 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?= Introduce an abstract type pl050 and let pl050_keyboar and pl050_mouse inherit from it, using different instance_init functions. Introduce a type constant and use QOM casts. Signed-off-by: Andreas F=C3=A4rber --- hw/input/pl050.c | 62 +++++++++++++++++++++++++++++++-------------------= ------ 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/hw/input/pl050.c b/hw/input/pl050.c index 8493abd..c1b08d5 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -10,8 +10,12 @@ #include "hw/sysbus.h" #include "hw/input/ps2.h" =20 +#define TYPE_PL050 "pl050" +#define PL050(obj) OBJECT_CHECK(PL050State, (obj), TYPE_PL050) + typedef struct PL050State { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; void *dev; uint32_t cr; @@ -19,7 +23,7 @@ typedef struct PL050State { uint32_t last; int pending; qemu_irq irq; - int is_mouse; + bool is_mouse; } PL050State; =20 static const VMStateDescription vmstate_pl050 =3D { @@ -133,65 +137,67 @@ static const MemoryRegionOps pl050_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int pl050_init(SysBusDevice *dev, int is_mouse) +static int pl050_initfn(SysBusDevice *dev) { - PL050State *s =3D FROM_SYSBUS(PL050State, dev); + PL050State *s =3D PL050(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl050_ops, s, "pl050", = 0x1000); sysbus_init_mmio(dev, &s->iomem); sysbus_init_irq(dev, &s->irq); - s->is_mouse =3D is_mouse; - if (s->is_mouse) + if (s->is_mouse) { s->dev =3D ps2_mouse_init(pl050_update, s); - else + } else { s->dev =3D ps2_kbd_init(pl050_update, s); + } return 0; } =20 -static int pl050_init_keyboard(SysBusDevice *dev) +static void pl050_keyboard_init(Object *obj) { - return pl050_init(dev, 0); -} + PL050State *s =3D PL050(obj); =20 -static int pl050_init_mouse(SysBusDevice *dev) -{ - return pl050_init(dev, 1); + s->is_mouse =3D false; } =20 -static void pl050_kbd_class_init(ObjectClass *klass, void *data) +static void pl050_mouse_init(Object *obj) { - DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); + PL050State *s =3D PL050(obj); =20 - k->init =3D pl050_init_keyboard; - dc->vmsd =3D &vmstate_pl050; + s->is_mouse =3D true; } =20 static const TypeInfo pl050_kbd_info =3D { .name =3D "pl050_keyboard", - .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(PL050State), - .class_init =3D pl050_kbd_class_init, + .parent =3D TYPE_PL050, + .instance_init =3D pl050_keyboard_init, }; =20 -static void pl050_mouse_class_init(ObjectClass *klass, void *data) +static const TypeInfo pl050_mouse_info =3D { + .name =3D "pl050_mouse", + .parent =3D TYPE_PL050, + .instance_init =3D pl050_mouse_init, +}; + +static void pl050_class_init(ObjectClass *oc, void *data) { - DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(oc); + SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(oc); =20 - k->init =3D pl050_init_mouse; + sdc->init =3D pl050_initfn; dc->vmsd =3D &vmstate_pl050; } =20 -static const TypeInfo pl050_mouse_info =3D { - .name =3D "pl050_mouse", +static const TypeInfo pl050_type_info =3D { + .name =3D TYPE_PL050, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PL050State), - .class_init =3D pl050_mouse_class_init, + .abstract =3D true, + .class_init =3D pl050_class_init, }; =20 static void pl050_register_types(void) { + type_register_static(&pl050_type_info); type_register_static(&pl050_kbd_info); type_register_static(&pl050_mouse_info); } --=20 1.8.1.4