From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1K-0004TX-1F for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1A-0002fG-UY for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:13 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53446 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1A-0002f5-Ke for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:04 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 32AD1A53AC for ; Mon, 29 Jul 2013 21:22:04 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:17 +0200 Message-Id: <1375125630-24869-101-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 100/173] pl190: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/intc/pl190.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c index dfd6ebf..329680d 100644 --- a/hw/intc/pl190.c +++ b/hw/intc/pl190.c @@ -15,8 +15,12 @@ =20 #define PL190_NUM_PRIO 17 =20 +#define TYPE_PL190 "pl190" +#define PL190(obj) OBJECT_CHECK(PL190State, (obj), TYPE_PL190) + typedef struct PL190State { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; uint32_t level; uint32_t soft_level; @@ -218,29 +222,29 @@ static const MemoryRegionOps pl190_ops =3D { =20 static void pl190_reset(DeviceState *d) { - PL190State *s =3D DO_UPCAST(PL190State, busdev.qdev, d); - int i; + PL190State *s =3D PL190(d); + int i; =20 - for (i =3D 0; i < 16; i++) - { - s->vect_addr[i] =3D 0; - s->vect_control[i] =3D 0; + for (i =3D 0; i < 16; i++) { + s->vect_addr[i] =3D 0; + s->vect_control[i] =3D 0; } - s->vect_addr[16] =3D 0; - s->prio_mask[17] =3D 0xffffffff; - s->priority =3D PL190_NUM_PRIO; - pl190_update_vectors(s); + s->vect_addr[16] =3D 0; + s->prio_mask[17] =3D 0xffffffff; + s->priority =3D PL190_NUM_PRIO; + pl190_update_vectors(s); } =20 -static int pl190_init(SysBusDevice *dev) +static int pl190_init(SysBusDevice *sbd) { - PL190State *s =3D FROM_SYSBUS(PL190State, dev); + DeviceState *dev =3D DEVICE(sbd); + PL190State *s =3D PL190(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl190_ops, s, "pl190", = 0x1000); - sysbus_init_mmio(dev, &s->iomem); - qdev_init_gpio_in(&dev->qdev, pl190_set_irq, 32); - sysbus_init_irq(dev, &s->irq); - sysbus_init_irq(dev, &s->fiq); + sysbus_init_mmio(sbd, &s->iomem); + qdev_init_gpio_in(dev, pl190_set_irq, 32); + sysbus_init_irq(sbd, &s->irq); + sysbus_init_irq(sbd, &s->fiq); return 0; } =20 @@ -275,7 +279,7 @@ static void pl190_class_init(ObjectClass *klass, void= *data) } =20 static const TypeInfo pl190_info =3D { - .name =3D "pl190", + .name =3D TYPE_PL190, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PL190State), .class_init =3D pl190_class_init, --=20 1.8.1.4