From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0g-0003Hg-9d for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0a-0002Q1-8s for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:34 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53343 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0a-0002Pv-04 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:28 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:30 +0200 Message-Id: <1375125630-24869-54-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 053/173] stellaris: QOM cast cleanup for stellaris_adc_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 a type constant, use QOM casts, rename the parent field and prepare for QOM realize. Signed-off-by: Andreas F=C3=A4rber --- hw/arm/stellaris.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 05d1a0d..79f6b4e 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -897,9 +897,13 @@ static int stellaris_i2c_init(SysBusDevice *sbd) #define STELLARIS_ADC_FIFO_EMPTY 0x0100 #define STELLARIS_ADC_FIFO_FULL 0x1000 =20 -typedef struct -{ - SysBusDevice busdev; +#define TYPE_STELLARIS_ADC "stellaris-adc" +#define STELLARIS_ADC(obj) \ + OBJECT_CHECK(stellaris_adc_state, (obj), TYPE_STELLARIS_ADC) + +typedef struct StellarisADCState { + SysBusDevice parent_obj; + MemoryRegion iomem; uint32_t actss; uint32_t ris; @@ -1148,21 +1152,22 @@ static const VMStateDescription vmstate_stellaris= _adc =3D { } }; =20 -static int stellaris_adc_init(SysBusDevice *dev) +static int stellaris_adc_init(SysBusDevice *sbd) { - stellaris_adc_state *s =3D FROM_SYSBUS(stellaris_adc_state, dev); + DeviceState *dev =3D DEVICE(sbd); + stellaris_adc_state *s =3D STELLARIS_ADC(dev); int n; =20 for (n =3D 0; n < 4; n++) { - sysbus_init_irq(dev, &s->irq[n]); + sysbus_init_irq(sbd, &s->irq[n]); } =20 memory_region_init_io(&s->iomem, OBJECT(s), &stellaris_adc_ops, s, "adc", 0x1000); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); stellaris_adc_reset(s); - qdev_init_gpio_in(&dev->qdev, stellaris_adc_trigger, 1); - vmstate_register(&dev->qdev, -1, &vmstate_stellaris_adc, s); + qdev_init_gpio_in(dev, stellaris_adc_trigger, 1); + vmstate_register(dev, -1, &vmstate_stellaris_adc, s); return 0; } =20 @@ -1219,7 +1224,7 @@ static void stellaris_init(const char *kernel_filen= ame, const char *cpu_model, flash_size, sram_size, kernel_filename, cpu_model)= ; =20 if (board->dc1 & (1 << 16)) { - dev =3D sysbus_create_varargs("stellaris-adc", 0x40038000, + dev =3D sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000, pic[14], pic[15], pic[16], pic[17], = NULL); adc =3D qdev_get_gpio_in(dev, 0); } else { @@ -1397,7 +1402,7 @@ static void stellaris_adc_class_init(ObjectClass *k= lass, void *data) } =20 static const TypeInfo stellaris_adc_info =3D { - .name =3D "stellaris-adc", + .name =3D TYPE_STELLARIS_ADC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(stellaris_adc_state), .class_init =3D stellaris_adc_class_init, --=20 1.8.1.4