From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0N-0002cY-1H for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0G-0002Ji-Lm for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:14 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53272 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0G-0002JF-4x for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:08 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:12 +0200 Message-Id: <1375125630-24869-36-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 035/173] integratorcp: QOM cast cleanup for icp_pic_state 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 type constant and use QOM cast. Fix indentation. Signed-off-by: Andreas F=C3=A4rber --- hw/arm/integratorcp.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 58f4ed7..d518188 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -271,15 +271,21 @@ static int integratorcm_init(SysBusDevice *dev) /* Integrator/CP hardware emulation. */ /* Primary interrupt controller. */ =20 -typedef struct icp_pic_state -{ - SysBusDevice busdev; - MemoryRegion iomem; - uint32_t level; - uint32_t irq_enabled; - uint32_t fiq_enabled; - qemu_irq parent_irq; - qemu_irq parent_fiq; +#define TYPE_INTEGRATOR_PIC "integrator_pic" +#define INTEGRATOR_PIC(obj) \ + OBJECT_CHECK(icp_pic_state, (obj), TYPE_INTEGRATOR_PIC) + +typedef struct icp_pic_state { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + MemoryRegion iomem; + uint32_t level; + uint32_t irq_enabled; + uint32_t fiq_enabled; + qemu_irq parent_irq; + qemu_irq parent_fiq; } icp_pic_state; =20 static void icp_pic_update(icp_pic_state *s) @@ -374,16 +380,17 @@ static const MemoryRegionOps icp_pic_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int icp_pic_init(SysBusDevice *dev) +static int icp_pic_init(SysBusDevice *sbd) { - icp_pic_state *s =3D FROM_SYSBUS(icp_pic_state, dev); + DeviceState *dev =3D DEVICE(sbd); + icp_pic_state *s =3D INTEGRATOR_PIC(dev); =20 - qdev_init_gpio_in(&dev->qdev, icp_pic_set_irq, 32); - sysbus_init_irq(dev, &s->parent_irq); - sysbus_init_irq(dev, &s->parent_fiq); + qdev_init_gpio_in(dev, icp_pic_set_irq, 32); + sysbus_init_irq(sbd, &s->parent_irq); + sysbus_init_irq(sbd, &s->parent_fiq); memory_region_init_io(&s->iomem, OBJECT(s), &icp_pic_ops, s, "icp-pic", 0x00800000); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); return 0; } =20 @@ -487,13 +494,13 @@ static void integratorcp_init(QEMUMachineInitArgs *= args) sysbus_mmio_map((SysBusDevice *)dev, 0, 0x10000000); =20 cpu_pic =3D arm_pic_init_cpu(cpu); - dev =3D sysbus_create_varargs("integrator_pic", 0x14000000, + dev =3D sysbus_create_varargs(TYPE_INTEGRATOR_PIC, 0x14000000, cpu_pic[ARM_PIC_CPU_IRQ], cpu_pic[ARM_PIC_CPU_FIQ], NULL); for (i =3D 0; i < 32; i++) { pic[i] =3D qdev_get_gpio_in(dev, i); } - sysbus_create_simple("integrator_pic", 0xca000000, pic[26]); + sysbus_create_simple(TYPE_INTEGRATOR_PIC, 0xca000000, pic[26]); sysbus_create_varargs("integrator_pit", 0x13000000, pic[5], pic[6], pic[7], NULL); sysbus_create_simple("pl031", 0x15000000, pic[8]); @@ -559,7 +566,7 @@ static void icp_pic_class_init(ObjectClass *klass, vo= id *data) } =20 static const TypeInfo icp_pic_info =3D { - .name =3D "integrator_pic", + .name =3D TYPE_INTEGRATOR_PIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(icp_pic_state), .class_init =3D icp_pic_class_init, --=20 1.8.1.4