From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1tob-0002Hq-W0 for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:49:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1toS-0005h8-V1 for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44046 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1toS-0005h2-LX for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:44 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 24 Jul 2013 09:48:18 +0200 Message-Id: <1374652104-26756-24-git-send-email-afaerber@suse.de> In-Reply-To: <1374652104-26756-1-git-send-email-afaerber@suse.de> References: <1374652104-26756-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] [PATCH qom-next for-1.6 23/29] strongarm: QOM'ify StrongARMPICState 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 Signed-off-by: Andreas F=C3=A4rber --- hw/arm/strongarm.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index feaaf45..457f9c7 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -70,8 +70,14 @@ static struct { }; =20 /* Interrupt Controller */ -typedef struct { - SysBusDevice busdev; + +#define TYPE_STRONGARM_PIC "strongarm_pic" +#define STRONGARM_PIC(obj) \ + OBJECT_CHECK(StrongARMPICState, (obj), TYPE_STRONGARM_PIC) + +typedef struct StrongARMPICState { + SysBusDevice parent_obj; + MemoryRegion iomem; qemu_irq irq; qemu_irq fiq; @@ -168,16 +174,17 @@ static const MemoryRegionOps strongarm_pic_ops =3D = { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int strongarm_pic_initfn(SysBusDevice *dev) +static int strongarm_pic_initfn(SysBusDevice *sbd) { - StrongARMPICState *s =3D FROM_SYSBUS(StrongARMPICState, dev); + DeviceState *dev =3D DEVICE(sbd); + StrongARMPICState *s =3D STRONGARM_PIC(dev); =20 - qdev_init_gpio_in(&dev->qdev, strongarm_pic_set_irq, SA_PIC_SRCS); + qdev_init_gpio_in(dev, strongarm_pic_set_irq, SA_PIC_SRCS); memory_region_init_io(&s->iomem, OBJECT(s), &strongarm_pic_ops, s, "pic", 0x1000); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_irq(dev, &s->irq); - sysbus_init_irq(dev, &s->fiq); + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_irq(sbd, &s->irq); + sysbus_init_irq(sbd, &s->fiq); =20 return 0; } @@ -214,7 +221,7 @@ static void strongarm_pic_class_init(ObjectClass *kla= ss, void *data) } =20 static const TypeInfo strongarm_pic_info =3D { - .name =3D "strongarm_pic", + .name =3D TYPE_STRONGARM_PIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(StrongARMPICState), .class_init =3D strongarm_pic_class_init, --=20 1.8.1.4