From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0U-0002sB-CN for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0O-0002Mt-Cr for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:22 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53303 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0O-0002Mi-1z for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:16 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:19 +0200 Message-Id: <1375125630-24869-43-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 042/173] musicpal: QOM cast cleanup for musicpal_gpio_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 | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 21ec541..ab54b2e 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1183,8 +1183,15 @@ static int mv88w8618_wlan_init(SysBusDevice *dev) /* LCD brightness bits in GPIO_OE_HI */ #define MP_OE_LCD_BRIGHTNESS 0x0007 =20 +#define TYPE_MUSICPAL_GPIO "musicpal_gpio" +#define MUSICPAL_GPIO(obj) \ + OBJECT_CHECK(musicpal_gpio_state, (obj), TYPE_MUSICPAL_GPIO) + typedef struct musicpal_gpio_state { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; uint32_t lcd_brightness; uint32_t out_state; @@ -1344,8 +1351,7 @@ static const MemoryRegionOps musicpal_gpio_ops =3D = { =20 static void musicpal_gpio_reset(DeviceState *d) { - musicpal_gpio_state *s =3D FROM_SYSBUS(musicpal_gpio_state, - SYS_BUS_DEVICE(d)); + musicpal_gpio_state *s =3D MUSICPAL_GPIO(d); =20 s->lcd_brightness =3D 0; s->out_state =3D 0; @@ -1355,19 +1361,20 @@ static void musicpal_gpio_reset(DeviceState *d) s->isr =3D 0; } =20 -static int musicpal_gpio_init(SysBusDevice *dev) +static int musicpal_gpio_init(SysBusDevice *sbd) { - musicpal_gpio_state *s =3D FROM_SYSBUS(musicpal_gpio_state, dev); + DeviceState *dev =3D DEVICE(sbd); + musicpal_gpio_state *s =3D MUSICPAL_GPIO(dev); =20 - sysbus_init_irq(dev, &s->irq); + sysbus_init_irq(sbd, &s->irq); =20 memory_region_init_io(&s->iomem, OBJECT(s), &musicpal_gpio_ops, s, "musicpal-gpio", MP_GPIO_SIZE); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); =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 - qdev_init_gpio_in(&dev->qdev, musicpal_gpio_pin_event, 32); + qdev_init_gpio_in(dev, musicpal_gpio_pin_event, 32); =20 return 0; } @@ -1399,7 +1406,7 @@ static void musicpal_gpio_class_init(ObjectClass *k= lass, void *data) } =20 static const TypeInfo musicpal_gpio_info =3D { - .name =3D "musicpal_gpio", + .name =3D TYPE_MUSICPAL_GPIO, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(musicpal_gpio_state), .class_init =3D musicpal_gpio_class_init, @@ -1671,7 +1678,8 @@ static void musicpal_init(QEMUMachineInitArgs *args= ) =20 sysbus_create_simple(TYPE_MUSICPAL_MISC, MP_MISC_BASE, NULL); =20 - dev =3D sysbus_create_simple("musicpal_gpio", MP_GPIO_BASE, pic[MP_G= PIO_IRQ]); + dev =3D sysbus_create_simple(TYPE_MUSICPAL_GPIO, MP_GPIO_BASE, + pic[MP_GPIO_IRQ]); i2c_dev =3D sysbus_create_simple("gpio_i2c", -1, NULL); i2c =3D (i2c_bus *)qdev_get_child_bus(i2c_dev, "i2c"); =20 --=20 1.8.1.4