From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0l-0003RB-CV for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0f-0002Rk-2t for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:39 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53362 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0e-0002Ra-Qb for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:33 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:36 +0200 Message-Id: <1375125630-24869-60-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 059/173] strongarm: QOM cast cleanup for StrongARMSSPState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?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/strongarm.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 61c2b22..82a9492 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -1336,8 +1336,14 @@ static const TypeInfo strongarm_uart_info =3D { }; =20 /* Synchronous Serial Ports */ -typedef struct { - SysBusDevice busdev; + +#define TYPE_STRONGARM_SSP "strongarm-ssp" +#define STRONGARM_SSP(obj) \ + OBJECT_CHECK(StrongARMSSPState, (obj), TYPE_STRONGARM_SSP) + +typedef struct StrongARMSSPState { + SysBusDevice parent_obj; + MemoryRegion iomem; qemu_irq irq; SSIBus *bus; @@ -1519,23 +1525,25 @@ static int strongarm_ssp_post_load(void *opaque, = int version_id) return 0; } =20 -static int strongarm_ssp_init(SysBusDevice *dev) +static int strongarm_ssp_init(SysBusDevice *sbd) { - StrongARMSSPState *s =3D FROM_SYSBUS(StrongARMSSPState, dev); + DeviceState *dev =3D DEVICE(sbd); + StrongARMSSPState *s =3D STRONGARM_SSP(dev); =20 - sysbus_init_irq(dev, &s->irq); + sysbus_init_irq(sbd, &s->irq); =20 memory_region_init_io(&s->iomem, OBJECT(s), &strongarm_ssp_ops, s, "ssp", 0x1000); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); =20 - s->bus =3D ssi_create_bus(&dev->qdev, "ssi"); + s->bus =3D ssi_create_bus(dev, "ssi"); return 0; } =20 static void strongarm_ssp_reset(DeviceState *dev) { - StrongARMSSPState *s =3D DO_UPCAST(StrongARMSSPState, busdev.qdev, d= ev); + StrongARMSSPState *s =3D STRONGARM_SSP(dev); + s->sssr =3D 0x03; /* 3 bit data, SPI, disabled */ s->rx_start =3D 0; s->rx_level =3D 0; @@ -1569,7 +1577,7 @@ static void strongarm_ssp_class_init(ObjectClass *k= lass, void *data) } =20 static const TypeInfo strongarm_ssp_info =3D { - .name =3D "strongarm-ssp", + .name =3D TYPE_STRONGARM_SSP, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(StrongARMSSPState), .class_init =3D strongarm_ssp_class_init, @@ -1633,7 +1641,7 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, qdev_get_gpio_in(s->pic, sa_serial[i].irq)); } =20 - s->ssp =3D sysbus_create_varargs("strongarm-ssp", 0x80070000, + s->ssp =3D sysbus_create_varargs(TYPE_STRONGARM_SSP, 0x80070000, qdev_get_gpio_in(s->pic, SA_PIC_SSP), NULL); s->ssp_bus =3D (SSIBus *)qdev_get_child_bus(s->ssp, "ssi"); =20 --=20 1.8.1.4