From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56056) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0S-0002n3-1F 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 1V3t0M-0002Ls-2O for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:19 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53295 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0L-0002Ll-Of for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:13 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:17 +0200 Message-Id: <1375125630-24869-41-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 040/173] musicpal: QOM cast cleanup for mv88w8618_pit_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 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index d6f593b..b2a28d9 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -816,8 +816,15 @@ typedef struct mv88w8618_timer_state { qemu_irq irq; } mv88w8618_timer_state; =20 +#define TYPE_MV88W8618_PIT "mv88w8618_pit" +#define MV88W8618_PIT(obj) \ + OBJECT_CHECK(mv88w8618_pit_state, (obj), TYPE_MV88W8618_PIT) + typedef struct mv88w8618_pit_state { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; mv88w8618_timer_state timer[4]; } mv88w8618_pit_state; @@ -899,8 +906,7 @@ static void mv88w8618_pit_write(void *opaque, hwaddr = offset, =20 static void mv88w8618_pit_reset(DeviceState *d) { - mv88w8618_pit_state *s =3D FROM_SYSBUS(mv88w8618_pit_state, - SYS_BUS_DEVICE(d)); + mv88w8618_pit_state *s =3D MV88W8618_PIT(d); int i; =20 for (i =3D 0; i < 4; i++) { @@ -917,7 +923,7 @@ static const MemoryRegionOps mv88w8618_pit_ops =3D { =20 static int mv88w8618_pit_init(SysBusDevice *dev) { - mv88w8618_pit_state *s =3D FROM_SYSBUS(mv88w8618_pit_state, dev); + mv88w8618_pit_state *s =3D MV88W8618_PIT(dev); int i; =20 /* Letting them all run at 1 MHz is likely just a pragmatic @@ -967,7 +973,7 @@ static void mv88w8618_pit_class_init(ObjectClass *kla= ss, void *data) } =20 static const TypeInfo mv88w8618_pit_info =3D { - .name =3D "mv88w8618_pit", + .name =3D TYPE_MV88W8618_PIT, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(mv88w8618_pit_state), .class_init =3D mv88w8618_pit_class_init, @@ -1598,7 +1604,7 @@ static void musicpal_init(QEMUMachineInitArgs *args= ) for (i =3D 0; i < 32; i++) { pic[i] =3D qdev_get_gpio_in(dev, i); } - sysbus_create_varargs("mv88w8618_pit", MP_PIT_BASE, pic[MP_TIMER1_IR= Q], + sysbus_create_varargs(TYPE_MV88W8618_PIT, MP_PIT_BASE, pic[MP_TIMER1= _IRQ], pic[MP_TIMER2_IRQ], pic[MP_TIMER3_IRQ], pic[MP_TIMER4_IRQ], NULL); =20 --=20 1.8.1.4