From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1tod-0002KT-2p for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:49:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1toU-0005hw-S4 for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:54 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44056 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1toU-0005ha-Cg for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:46 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 24 Jul 2013 09:48:21 +0200 Message-Id: <1374652104-26756-27-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 26/29] strongarm: QOM'ify StrongARMPPCInfo 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 | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index efb56b3..421ac54 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -706,9 +706,14 @@ static const TypeInfo strongarm_gpio_info =3D { #define PSDR 0x0c #define PPFR 0x10 =20 +#define TYPE_STRONGARM_PPC "strongarm-ppc" +#define STRONGARM_PPC(obj) \ + OBJECT_CHECK(StrongARMPPCInfo, (obj), TYPE_STRONGARM_PPC) + typedef struct StrongARMPPCInfo StrongARMPPCInfo; struct StrongARMPPCInfo { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; qemu_irq handler[28]; =20 @@ -817,19 +822,18 @@ static const MemoryRegionOps strongarm_ppc_ops =3D = { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int strongarm_ppc_init(SysBusDevice *dev) +static int strongarm_ppc_init(SysBusDevice *sbd) { - StrongARMPPCInfo *s; - - s =3D FROM_SYSBUS(StrongARMPPCInfo, dev); + DeviceState *dev =3D DEVICE(sbd); + StrongARMPPCInfo *s =3D STRONGARM_PPC(dev); =20 - qdev_init_gpio_in(&dev->qdev, strongarm_ppc_set, 22); - qdev_init_gpio_out(&dev->qdev, s->handler, 22); + qdev_init_gpio_in(dev, strongarm_ppc_set, 22); + qdev_init_gpio_out(dev, s->handler, 22); =20 memory_region_init_io(&s->iomem, OBJECT(s), &strongarm_ppc_ops, s, "ppc", 0x1000); =20 - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); =20 return 0; } @@ -860,7 +864,7 @@ static void strongarm_ppc_class_init(ObjectClass *kla= ss, void *data) } =20 static const TypeInfo strongarm_ppc_info =3D { - .name =3D "strongarm-ppc", + .name =3D TYPE_STRONGARM_PPC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(StrongARMPPCInfo), .class_init =3D strongarm_ppc_class_init, @@ -1612,7 +1616,7 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, =20 s->gpio =3D strongarm_gpio_init(0x90040000, s->pic); =20 - s->ppc =3D sysbus_create_varargs("strongarm-ppc", 0x90060000, NULL); + s->ppc =3D sysbus_create_varargs(TYPE_STRONGARM_PPC, 0x90060000, NUL= L); =20 for (i =3D 0; sa_serial[i].io_base; i++) { DeviceState *dev =3D qdev_create(NULL, "strongarm-uart"); --=20 1.8.1.4