From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWcq-0002C9-8C for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFWch-000621-Jb for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:20 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41640 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWch-00060w-DS for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:11 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 365ACAC9F for ; Mon, 17 Feb 2014 22:25:11 +0000 (UTC) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 17 Feb 2014 23:24:25 +0100 Message-Id: <1392675899-21210-16-git-send-email-afaerber@suse.de> In-Reply-To: <1392675899-21210-1-git-send-email-afaerber@suse.de> References: <1392675899-21210-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 v2 15/49] max7310: QOM'ify 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?= Replace FROM_I2C_SLAVE() usages with QOM cast macro. Rename parent field. Reviewed-by: Peter Crosthwaite Signed-off-by: Andreas F=C3=A4rber --- hw/gpio/max7310.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c index 59b2877..cfcd89c 100644 --- a/hw/gpio/max7310.c +++ b/hw/gpio/max7310.c @@ -9,8 +9,12 @@ =20 #include "hw/i2c/i2c.h" =20 -typedef struct { - I2CSlave i2c; +#define TYPE_MAX7310 "max7310" +#define MAX7310(obj) OBJECT_CHECK(MAX7310State, (obj), TYPE_MAX7310) + +typedef struct MAX7310State { + I2CSlave parent_obj; + int i2c_command_byte; int len; =20 @@ -25,7 +29,8 @@ typedef struct { =20 static void max7310_reset(DeviceState *dev) { - MAX7310State *s =3D FROM_I2C_SLAVE(MAX7310State, I2C_SLAVE(dev)); + MAX7310State *s =3D MAX7310(dev); + s->level &=3D s->direction; s->direction =3D 0xff; s->polarity =3D 0xf0; @@ -35,7 +40,7 @@ static void max7310_reset(DeviceState *dev) =20 static int max7310_rx(I2CSlave *i2c) { - MAX7310State *s =3D (MAX7310State *) i2c; + MAX7310State *s =3D MAX7310(i2c); =20 switch (s->command) { case 0x00: /* Input port */ @@ -70,7 +75,7 @@ static int max7310_rx(I2CSlave *i2c) =20 static int max7310_tx(I2CSlave *i2c, uint8_t data) { - MAX7310State *s =3D (MAX7310State *) i2c; + MAX7310State *s =3D MAX7310(i2c); uint8_t diff; int line; =20 @@ -125,7 +130,7 @@ static int max7310_tx(I2CSlave *i2c, uint8_t data) =20 static void max7310_event(I2CSlave *i2c, enum i2c_event event) { - MAX7310State *s =3D (MAX7310State *) i2c; + MAX7310State *s =3D MAX7310(i2c); s->len =3D 0; =20 switch (event) { @@ -156,7 +161,7 @@ static const VMStateDescription vmstate_max7310 =3D { VMSTATE_UINT8(polarity, MAX7310State), VMSTATE_UINT8(status, MAX7310State), VMSTATE_UINT8(command, MAX7310State), - VMSTATE_I2C_SLAVE(i2c, MAX7310State), + VMSTATE_I2C_SLAVE(parent_obj, MAX7310State), VMSTATE_END_OF_LIST() } }; @@ -177,7 +182,7 @@ static void max7310_gpio_set(void *opaque, int line, = int level) * but also accepts sequences that are not SMBus so return an I2C device= . */ static int max7310_init(I2CSlave *i2c) { - MAX7310State *s =3D FROM_I2C_SLAVE(MAX7310State, i2c); + MAX7310State *s =3D MAX7310(i2c); =20 qdev_init_gpio_in(&i2c->qdev, max7310_gpio_set, 8); qdev_init_gpio_out(&i2c->qdev, s->handler, 8); @@ -199,7 +204,7 @@ static void max7310_class_init(ObjectClass *klass, vo= id *data) } =20 static const TypeInfo max7310_info =3D { - .name =3D "max7310", + .name =3D TYPE_MAX7310, .parent =3D TYPE_I2C_SLAVE, .instance_size =3D sizeof(MAX7310State), .class_init =3D max7310_class_init, --=20 1.8.4.5