From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2pef-0004dI-Af for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2pec-0003rW-84 for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:29 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46369 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2peb-0003rJ-UA for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:26 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 72720A52D7 for ; Fri, 26 Jul 2013 23:34:25 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 23:34:10 +0200 Message-Id: <1374874454-15549-11-git-send-email-afaerber@suse.de> In-Reply-To: <1374874454-15549-1-git-send-email-afaerber@suse.de> References: <1374874454-15549-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 10/14] mst_fpga: 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/misc/mst_fpga.c | 68 +++++++++++++++++++++++++++++-------------------= ------ 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c index 604be5e..c96810f 100644 --- a/hw/misc/mst_fpga.c +++ b/hw/misc/mst_fpga.c @@ -35,25 +35,30 @@ #define MST_PCMCIA_CD0_IRQ 9 #define MST_PCMCIA_CD1_IRQ 13 =20 +#define TYPE_MAINSTONE_FPGA "mainstone-fpga" +#define MAINSTONE_FPGA(obj) \ + OBJECT_CHECK(mst_irq_state, (obj), TYPE_MAINSTONE_FPGA) + typedef struct mst_irq_state{ - SysBusDevice busdev; - MemoryRegion iomem; - - qemu_irq parent; - - uint32_t prev_level; - uint32_t leddat1; - uint32_t leddat2; - uint32_t ledctrl; - uint32_t gpswr; - uint32_t mscwr1; - uint32_t mscwr2; - uint32_t mscwr3; - uint32_t mscrd; - uint32_t intmskena; - uint32_t intsetclr; - uint32_t pcmcia0; - uint32_t pcmcia1; + SysBusDevice parent_obj; + + MemoryRegion iomem; + + qemu_irq parent; + + uint32_t prev_level; + uint32_t leddat1; + uint32_t leddat2; + uint32_t ledctrl; + uint32_t gpswr; + uint32_t mscwr1; + uint32_t mscwr2; + uint32_t mscwr3; + uint32_t mscrd; + uint32_t intmskena; + uint32_t intsetclr; + uint32_t pcmcia0; + uint32_t pcmcia1; }mst_irq_state; =20 static void @@ -194,24 +199,23 @@ static int mst_fpga_post_load(void *opaque, int ver= sion_id) return 0; } =20 -static int mst_fpga_init(SysBusDevice *dev) +static int mst_fpga_init(SysBusDevice *sbd) { - mst_irq_state *s; - - s =3D FROM_SYSBUS(mst_irq_state, dev); + DeviceState *dev =3D DEVICE(sbd); + mst_irq_state *s =3D MAINSTONE_FPGA(dev); =20 - s->pcmcia0 =3D MST_PCMCIAx_READY | MST_PCMCIAx_nCD; - s->pcmcia1 =3D MST_PCMCIAx_READY | MST_PCMCIAx_nCD; + s->pcmcia0 =3D MST_PCMCIAx_READY | MST_PCMCIAx_nCD; + s->pcmcia1 =3D MST_PCMCIAx_READY | MST_PCMCIAx_nCD; =20 - sysbus_init_irq(dev, &s->parent); + sysbus_init_irq(sbd, &s->parent); =20 - /* alloc the external 16 irqs */ - qdev_init_gpio_in(&dev->qdev, mst_fpga_set_irq, MST_NUM_IRQS); + /* alloc the external 16 irqs */ + qdev_init_gpio_in(dev, mst_fpga_set_irq, MST_NUM_IRQS); =20 - memory_region_init_io(&s->iomem, OBJECT(s), &mst_fpga_ops, s, - "fpga", 0x00100000); - sysbus_init_mmio(dev, &s->iomem); - return 0; + memory_region_init_io(&s->iomem, OBJECT(s), &mst_fpga_ops, s, + "fpga", 0x00100000); + sysbus_init_mmio(sbd, &s->iomem); + return 0; } =20 static VMStateDescription vmstate_mst_fpga_regs =3D { @@ -249,7 +253,7 @@ static void mst_fpga_class_init(ObjectClass *klass, v= oid *data) } =20 static const TypeInfo mst_fpga_info =3D { - .name =3D "mainstone-fpga", + .name =3D TYPE_MAINSTONE_FPGA, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(mst_irq_state), .class_init =3D mst_fpga_class_init, --=20 1.8.1.4