From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1toL-0001nw-72 for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1toI-0005ae-OD for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:37 -0400 Received: from cantor2.suse.de ([195.135.220.15]:43985 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1toI-0005aM-HE for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:34 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 24 Jul 2013 09:48:01 +0200 Message-Id: <1374652104-26756-7-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 06/29] musicpal: QOM'ify musicpal_lcd_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 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 293ab26..e7efed9 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -461,8 +461,15 @@ static const TypeInfo mv88w8618_eth_info =3D { =20 #define MP_LCD_TEXTCOLOR 0xe0e0ff /* RRGGBB */ =20 +#define TYPE_MUSICPAL_LCD "musicpal_lcd" +#define MUSICPAL_LCD(obj) \ + OBJECT_CHECK(musicpal_lcd_state, (obj), TYPE_MUSICPAL_LCD) + typedef struct musicpal_lcd_state { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; uint32_t brightness; uint32_t mode; @@ -615,7 +622,7 @@ static const GraphicHwOps musicpal_gfx_ops =3D { =20 static int musicpal_lcd_init(SysBusDevice *dev) { - musicpal_lcd_state *s =3D FROM_SYSBUS(musicpal_lcd_state, dev); + musicpal_lcd_state *s =3D MUSICPAL_LCD(dev); =20 s->brightness =3D 7; =20 @@ -657,7 +664,7 @@ static void musicpal_lcd_class_init(ObjectClass *klas= s, void *data) } =20 static const TypeInfo musicpal_lcd_info =3D { - .name =3D "musicpal_lcd", + .name =3D TYPE_MUSICPAL_LCD, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(musicpal_lcd_state), .class_init =3D musicpal_lcd_class_init, @@ -1648,7 +1655,7 @@ static void musicpal_init(QEMUMachineInitArgs *args= ) i2c_dev =3D sysbus_create_simple("gpio_i2c", -1, NULL); i2c =3D (i2c_bus *)qdev_get_child_bus(i2c_dev, "i2c"); =20 - lcd_dev =3D sysbus_create_simple("musicpal_lcd", MP_LCD_BASE, NULL); + lcd_dev =3D sysbus_create_simple(TYPE_MUSICPAL_LCD, MP_LCD_BASE, NUL= L); key_dev =3D sysbus_create_simple("musicpal_key", -1, NULL); =20 /* I2C read data */ --=20 1.8.1.4