From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t17-00046c-DJ for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0y-0002a5-QP for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:01 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53411 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0y-0002Zz-JL for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:52 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 29970A5388 for ; Mon, 29 Jul 2013 21:21:52 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:02 +0200 Message-Id: <1375125630-24869-86-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 085/173] bitbang_i2c: 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/i2c/bitbang_i2c.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c index 853d455..ca59456 100644 --- a/hw/i2c/bitbang_i2c.c +++ b/hw/i2c/bitbang_i2c.c @@ -185,8 +185,13 @@ bitbang_i2c_interface *bitbang_i2c_init(i2c_bus *bus= ) } =20 /* GPIO interface. */ -typedef struct { - SysBusDevice busdev; + +#define TYPE_GPIO_I2C "gpio_i2c" +#define GPIO_I2C(obj) OBJECT_CHECK(GPIOI2CState, (obj), TYPE_GPIO_I2C) + +typedef struct GPIOI2CState { + SysBusDevice parent_obj; + MemoryRegion dummy_iomem; bitbang_i2c_interface *bitbang; int last_level; @@ -204,19 +209,20 @@ static void bitbang_i2c_gpio_set(void *opaque, int = irq, int level) } } =20 -static int gpio_i2c_init(SysBusDevice *dev) +static int gpio_i2c_init(SysBusDevice *sbd) { - GPIOI2CState *s =3D FROM_SYSBUS(GPIOI2CState, dev); + DeviceState *dev =3D DEVICE(sbd); + GPIOI2CState *s =3D GPIO_I2C(dev); i2c_bus *bus; =20 memory_region_init(&s->dummy_iomem, OBJECT(s), "gpio_i2c", 0); - sysbus_init_mmio(dev, &s->dummy_iomem); + sysbus_init_mmio(sbd, &s->dummy_iomem); =20 - bus =3D i2c_init_bus(&dev->qdev, "i2c"); + bus =3D i2c_init_bus(dev, "i2c"); s->bitbang =3D bitbang_i2c_init(bus); =20 - qdev_init_gpio_in(&dev->qdev, bitbang_i2c_gpio_set, 2); - qdev_init_gpio_out(&dev->qdev, &s->out, 1); + qdev_init_gpio_in(dev, bitbang_i2c_gpio_set, 2); + qdev_init_gpio_out(dev, &s->out, 1); =20 return 0; } @@ -232,7 +238,7 @@ static void gpio_i2c_class_init(ObjectClass *klass, v= oid *data) } =20 static const TypeInfo gpio_i2c_info =3D { - .name =3D "gpio_i2c", + .name =3D TYPE_GPIO_I2C, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(GPIOI2CState), .class_init =3D gpio_i2c_class_init, --=20 1.8.1.4