From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1I-0004R3-ED for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t19-0002eo-8t for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53440 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t18-0002ea-Uq for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:03 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:15 +0200 Message-Id: <1375125630-24869-99-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 098/173] omap_intc: QOM'ify omap-intc and omap2-intc 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?= Create a new abstract base type and let omap-intc and omap2-intc inherit from it. Introduce a type constant and use QOM casts. Signed-off-by: Andreas F=C3=A4rber --- hw/intc/omap_intc.c | 57 ++++++++++++++++++++++++++++++++---------------= ------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index bca8585..7dd63da 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -32,8 +32,13 @@ struct omap_intr_handler_bank_s { unsigned char priority[32]; }; =20 +#define TYPE_OMAP_INTC "common-omap-intc" +#define OMAP_INTC(obj) \ + OBJECT_CHECK(struct omap_intr_handler_s, (obj), TYPE_OMAP_INTC) + struct omap_intr_handler_s { - SysBusDevice busdev; + SysBusDevice parent_obj; + qemu_irq *pins; qemu_irq parent_intr[2]; MemoryRegion mmio; @@ -328,8 +333,7 @@ static const MemoryRegionOps omap_inth_mem_ops =3D { =20 static void omap_inth_reset(DeviceState *dev) { - struct omap_intr_handler_s *s =3D FROM_SYSBUS(struct omap_intr_handl= er_s, - SYS_BUS_DEVICE(dev)); + struct omap_intr_handler_s *s =3D OMAP_INTC(dev); int i; =20 for (i =3D 0; i < s->nbanks; ++i){ @@ -356,20 +360,21 @@ static void omap_inth_reset(DeviceState *dev) qemu_set_irq(s->parent_intr[1], 0); } =20 -static int omap_intc_init(SysBusDevice *dev) +static int omap_intc_init(SysBusDevice *sbd) { - struct omap_intr_handler_s *s; - s =3D FROM_SYSBUS(struct omap_intr_handler_s, dev); + DeviceState *dev =3D DEVICE(sbd); + struct omap_intr_handler_s *s =3D OMAP_INTC(dev); + if (!s->iclk) { hw_error("omap-intc: clk not connected\n"); } s->nbanks =3D 1; - sysbus_init_irq(dev, &s->parent_intr[0]); - sysbus_init_irq(dev, &s->parent_intr[1]); - qdev_init_gpio_in(&dev->qdev, omap_set_intr, s->nbanks * 32); + sysbus_init_irq(sbd, &s->parent_intr[0]); + sysbus_init_irq(sbd, &s->parent_intr[1]); + qdev_init_gpio_in(dev, omap_set_intr, s->nbanks * 32); memory_region_init_io(&s->mmio, OBJECT(s), &omap_inth_mem_ops, s, "omap-intc", s->size); - sysbus_init_mmio(dev, &s->mmio); + sysbus_init_mmio(sbd, &s->mmio); return 0; } =20 @@ -391,8 +396,7 @@ static void omap_intc_class_init(ObjectClass *klass, = void *data) =20 static const TypeInfo omap_intc_info =3D { .name =3D "omap-intc", - .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(struct omap_intr_handler_s), + .parent =3D TYPE_OMAP_INTC, .class_init =3D omap_intc_class_init, }; =20 @@ -500,8 +504,9 @@ static void omap2_inth_write(void *opaque, hwaddr add= r, case 0x10: /* INTC_SYSCONFIG */ s->autoidle &=3D 4; s->autoidle |=3D (value & 1) << 2; - if (value & 2) /* SOFTRESET */ - omap_inth_reset(&s->busdev.qdev); + if (value & 2) { /* SOFTR= ESET */ + omap_inth_reset(DEVICE(s)); + } return; =20 case 0x48: /* INTC_CONTROL */ @@ -594,10 +599,11 @@ static const MemoryRegionOps omap2_inth_mem_ops =3D= { }, }; =20 -static int omap2_intc_init(SysBusDevice *dev) +static int omap2_intc_init(SysBusDevice *sbd) { - struct omap_intr_handler_s *s; - s =3D FROM_SYSBUS(struct omap_intr_handler_s, dev); + DeviceState *dev =3D DEVICE(sbd); + struct omap_intr_handler_s *s =3D OMAP_INTC(dev); + if (!s->iclk) { hw_error("omap2-intc: iclk not connected\n"); } @@ -606,12 +612,12 @@ static int omap2_intc_init(SysBusDevice *dev) } s->level_only =3D 1; s->nbanks =3D 3; - sysbus_init_irq(dev, &s->parent_intr[0]); - sysbus_init_irq(dev, &s->parent_intr[1]); - qdev_init_gpio_in(&dev->qdev, omap_set_intr_noedge, s->nbanks * 32); + sysbus_init_irq(sbd, &s->parent_intr[0]); + sysbus_init_irq(sbd, &s->parent_intr[1]); + qdev_init_gpio_in(dev, omap_set_intr_noedge, s->nbanks * 32); memory_region_init_io(&s->mmio, OBJECT(s), &omap2_inth_mem_ops, s, "omap2-intc", 0x1000); - sysbus_init_mmio(dev, &s->mmio); + sysbus_init_mmio(sbd, &s->mmio); return 0; } =20 @@ -635,13 +641,20 @@ static void omap2_intc_class_init(ObjectClass *klas= s, void *data) =20 static const TypeInfo omap2_intc_info =3D { .name =3D "omap2-intc", + .parent =3D TYPE_OMAP_INTC, + .class_init =3D omap2_intc_class_init, +}; + +static const TypeInfo omap_intc_type_info =3D { + .name =3D TYPE_OMAP_INTC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(struct omap_intr_handler_s), - .class_init =3D omap2_intc_class_init, + .abstract =3D true, }; =20 static void omap_intc_register_types(void) { + type_register_static(&omap_intc_type_info); type_register_static(&omap_intc_info); type_register_static(&omap2_intc_info); } --=20 1.8.1.4