From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0d-0003C4-RD for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0X-0002PB-Pm for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:31 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53333 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0X-0002P4-H5 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:25 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:27 +0200 Message-Id: <1375125630-24869-51-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-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] [PULL 050/173] spitz: QOM cast cleanup for SpitzKeyboardState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Introduce a type constant, use QOM casts, rename the parent field and prepare for QOM realize. Signed-off-by: Andreas F=C3=A4rber --- hw/arm/spitz.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 0bf5c5c..34f9582 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -215,8 +215,13 @@ static const int spitz_gpiomap[5] =3D { SPITZ_GPIO_SWA, SPITZ_GPIO_SWB, }; =20 +#define TYPE_SPITZ_KEYBOARD "spitz-keyboard" +#define SPITZ_KEYBOARD(obj) \ + OBJECT_CHECK(SpitzKeyboardState, (obj), TYPE_SPITZ_KEYBOARD) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + qemu_irq sense[SPITZ_KEY_SENSE_NUM]; qemu_irq gpiomap[5]; int keymap[0x80]; @@ -461,8 +466,8 @@ static void spitz_keyboard_register(PXA2xxState *cpu) DeviceState *dev; SpitzKeyboardState *s; =20 - dev =3D sysbus_create_simple("spitz-keyboard", -1, NULL); - s =3D FROM_SYSBUS(SpitzKeyboardState, SYS_BUS_DEVICE(dev)); + dev =3D sysbus_create_simple(TYPE_SPITZ_KEYBOARD, -1, NULL); + s =3D SPITZ_KEYBOARD(dev); =20 for (i =3D 0; i < SPITZ_KEY_SENSE_NUM; i ++) qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(cpu->gpio, spitz_= gpio_key_sense[i])); @@ -485,13 +490,12 @@ static void spitz_keyboard_register(PXA2xxState *cp= u) qemu_add_kbd_event_handler(spitz_keyboard_handler, s); } =20 -static int spitz_keyboard_init(SysBusDevice *dev) +static int spitz_keyboard_init(SysBusDevice *sbd) { - SpitzKeyboardState *s; + DeviceState *dev =3D DEVICE(sbd); + SpitzKeyboardState *s =3D SPITZ_KEYBOARD(dev); int i, j; =20 - s =3D FROM_SYSBUS(SpitzKeyboardState, dev); - for (i =3D 0; i < 0x80; i ++) s->keymap[i] =3D -1; for (i =3D 0; i < SPITZ_KEY_SENSE_NUM + 1; i ++) @@ -502,8 +506,8 @@ static int spitz_keyboard_init(SysBusDevice *dev) spitz_keyboard_pre_map(s); =20 s->kbdtimer =3D qemu_new_timer_ns(vm_clock, spitz_keyboard_tick, s); - qdev_init_gpio_in(&dev->qdev, spitz_keyboard_strobe, SPITZ_KEY_STROB= E_NUM); - qdev_init_gpio_out(&dev->qdev, s->sense, SPITZ_KEY_SENSE_NUM); + qdev_init_gpio_in(dev, spitz_keyboard_strobe, SPITZ_KEY_STROBE_NUM); + qdev_init_gpio_out(dev, s->sense, SPITZ_KEY_SENSE_NUM); =20 return 0; } @@ -1065,7 +1069,7 @@ static void spitz_keyboard_class_init(ObjectClass *= klass, void *data) } =20 static const TypeInfo spitz_keyboard_info =3D { - .name =3D "spitz-keyboard", + .name =3D TYPE_SPITZ_KEYBOARD, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SpitzKeyboardState), .class_init =3D spitz_keyboard_class_init, --=20 1.8.1.4