From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1toT-00020J-2u for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1toM-0005dP-M5 for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:44 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44009 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1toM-0005dD-9S for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:38 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 24 Jul 2013 09:48:07 +0200 Message-Id: <1374652104-26756-13-git-send-email-afaerber@suse.de> In-Reply-To: <1374652104-26756-1-git-send-email-afaerber@suse.de> References: <1374652104-26756-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 12/29] musicpal: QOM'ify musicpal_key_state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Jan Kiszka , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Signed-off-by: Andreas F=C3=A4rber --- hw/arm/musicpal.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index a8beae6..6e8eb5d 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1434,8 +1434,15 @@ static const TypeInfo musicpal_gpio_info =3D { #define MP_KEY_BTN_VOLUME (1 << 6) #define MP_KEY_BTN_NAVIGATION (1 << 7) =20 +#define TYPE_MUSICPAL_KEY "musicpal_key" +#define MUSICPAL_KEY(obj) \ + OBJECT_CHECK(musicpal_key_state, (obj), TYPE_MUSICPAL_KEY) + typedef struct musicpal_key_state { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; uint32_t kbd_extended; uint32_t pressed_keys; @@ -1519,17 +1526,18 @@ static void musicpal_key_event(void *opaque, int = keycode) s->kbd_extended =3D 0; } =20 -static int musicpal_key_init(SysBusDevice *dev) +static int musicpal_key_init(SysBusDevice *sbd) { - musicpal_key_state *s =3D FROM_SYSBUS(musicpal_key_state, dev); + DeviceState *dev =3D DEVICE(sbd); + musicpal_key_state *s =3D MUSICPAL_KEY(dev); =20 memory_region_init(&s->iomem, OBJECT(s), "dummy", 0); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); =20 s->kbd_extended =3D 0; s->pressed_keys =3D 0; =20 - qdev_init_gpio_out(&dev->qdev, s->out, ARRAY_SIZE(s->out)); + qdev_init_gpio_out(dev, s->out, ARRAY_SIZE(s->out)); =20 qemu_add_kbd_event_handler(musicpal_key_event, s); =20 @@ -1558,7 +1566,7 @@ static void musicpal_key_class_init(ObjectClass *kl= ass, void *data) } =20 static const TypeInfo musicpal_key_info =3D { - .name =3D "musicpal_key", + .name =3D TYPE_MUSICPAL_KEY, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(musicpal_key_state), .class_init =3D musicpal_key_class_init, @@ -1682,7 +1690,7 @@ static void musicpal_init(QEMUMachineInitArgs *args= ) i2c =3D (i2c_bus *)qdev_get_child_bus(i2c_dev, "i2c"); =20 lcd_dev =3D sysbus_create_simple(TYPE_MUSICPAL_LCD, MP_LCD_BASE, NUL= L); - key_dev =3D sysbus_create_simple("musicpal_key", -1, NULL); + key_dev =3D sysbus_create_simple(TYPE_MUSICPAL_KEY, -1, NULL); =20 /* I2C read data */ qdev_connect_gpio_out(i2c_dev, 0, --=20 1.8.1.4