From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0P-0002hX-G5 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0J-0002L7-GC for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:17 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53286 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0J-0002L1-6z for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:11 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:15 +0200 Message-Id: <1375125630-24869-39-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 038/173] musicpal: QOM cast cleanup for 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 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/musicpal.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 760630b..0bc69e9 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -462,8 +462,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; @@ -614,20 +621,21 @@ static const GraphicHwOps musicpal_gfx_ops =3D { .gfx_update =3D lcd_refresh, }; =20 -static int musicpal_lcd_init(SysBusDevice *dev) +static int musicpal_lcd_init(SysBusDevice *sbd) { - musicpal_lcd_state *s =3D FROM_SYSBUS(musicpal_lcd_state, dev); + DeviceState *dev =3D DEVICE(sbd); + musicpal_lcd_state *s =3D MUSICPAL_LCD(dev); =20 s->brightness =3D 7; =20 memory_region_init_io(&s->iomem, OBJECT(s), &musicpal_lcd_ops, s, "musicpal-lcd", MP_LCD_SIZE); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); =20 - s->con =3D graphic_console_init(DEVICE(dev), &musicpal_gfx_ops, s); + s->con =3D graphic_console_init(dev, &musicpal_gfx_ops, s); qemu_console_resize(s->con, 128*3, 64*3); =20 - qdev_init_gpio_in(&dev->qdev, musicpal_lcd_gpio_brightness_in, 3); + qdev_init_gpio_in(dev, musicpal_lcd_gpio_brightness_in, 3); =20 return 0; } @@ -658,7 +666,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, @@ -1649,7 +1657,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