From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0Q-0002jw-NN for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0K-0002LW-Hh for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53290 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0K-0002LK-7D for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:12 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:16 +0200 Message-Id: <1375125630-24869-40-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 039/173] musicpal: QOM cast cleanup mv88w8618_pic_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 and rename the parent field. Signed-off-by: Andreas F=C3=A4rber --- hw/arm/musicpal.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 0bc69e9..d6f593b 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -677,9 +677,15 @@ static const TypeInfo musicpal_lcd_info =3D { #define MP_PIC_ENABLE_SET 0x08 #define MP_PIC_ENABLE_CLR 0x0C =20 -typedef struct mv88w8618_pic_state -{ - SysBusDevice busdev; +#define TYPE_MV88W8618_PIC "mv88w8618_pic" +#define MV88W8618_PIC(obj) \ + OBJECT_CHECK(mv88w8618_pic_state, (obj), TYPE_MV88W8618_PIC) + +typedef struct mv88w8618_pic_state { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; uint32_t level; uint32_t enabled; @@ -737,8 +743,7 @@ static void mv88w8618_pic_write(void *opaque, hwaddr = offset, =20 static void mv88w8618_pic_reset(DeviceState *d) { - mv88w8618_pic_state *s =3D FROM_SYSBUS(mv88w8618_pic_state, - SYS_BUS_DEVICE(d)); + mv88w8618_pic_state *s =3D MV88W8618_PIC(d); =20 s->level =3D 0; s->enabled =3D 0; @@ -752,9 +757,9 @@ static const MemoryRegionOps mv88w8618_pic_ops =3D { =20 static int mv88w8618_pic_init(SysBusDevice *dev) { - mv88w8618_pic_state *s =3D FROM_SYSBUS(mv88w8618_pic_state, dev); + mv88w8618_pic_state *s =3D MV88W8618_PIC(dev); =20 - qdev_init_gpio_in(&dev->qdev, mv88w8618_pic_set_irq, 32); + qdev_init_gpio_in(DEVICE(dev), mv88w8618_pic_set_irq, 32); sysbus_init_irq(dev, &s->parent_irq); memory_region_init_io(&s->iomem, OBJECT(s), &mv88w8618_pic_ops, s, "musicpal-pic", MP_PIC_SIZE); @@ -785,7 +790,7 @@ static void mv88w8618_pic_class_init(ObjectClass *kla= ss, void *data) } =20 static const TypeInfo mv88w8618_pic_info =3D { - .name =3D "mv88w8618_pic", + .name =3D TYPE_MV88W8618_PIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(mv88w8618_pic_state), .class_init =3D mv88w8618_pic_class_init, @@ -1588,7 +1593,7 @@ static void musicpal_init(QEMUMachineInitArgs *args= ) vmstate_register_ram_global(sram); memory_region_add_subregion(address_space_mem, MP_SRAM_BASE, sram); =20 - dev =3D sysbus_create_simple("mv88w8618_pic", MP_PIC_BASE, + dev =3D sysbus_create_simple(TYPE_MV88W8618_PIC, MP_PIC_BASE, cpu_pic[ARM_PIC_CPU_IRQ]); for (i =3D 0; i < 32; i++) { pic[i] =3D qdev_get_gpio_in(dev, i); --=20 1.8.1.4