From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWcn-00027v-O4 for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFWcf-00060f-82 for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:17 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41635 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWce-00060Q-TT for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:09 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 17 Feb 2014 23:24:20 +0100 Message-Id: <1392675899-21210-11-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 10/49] pxa2xx: QOM'ify I2C slave 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?= Replace usages of FROM_I2C_SLAVE() and direct parent field accesses with QOM cast macro. Rename parent field to assure we caught all. Reuse type constant in pxa2xx_i2c_init(). Add some missing braces while at it. Signed-off-by: Andreas F=C3=A4rber --- hw/arm/pxa2xx.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index 7de109c..66bc0dc 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -1222,8 +1222,14 @@ static const TypeInfo pxa2xx_rtc_sysbus_info =3D { }; =20 /* I2C Interface */ -typedef struct { - I2CSlave i2c; + +#define TYPE_PXA2XX_I2C_SLAVE "pxa2xx-i2c-slave" +#define PXA2XX_I2C_SLAVE(obj) \ + OBJECT_CHECK(PXA2xxI2CSlaveState, (obj), TYPE_PXA2XX_I2C_SLAVE) + +typedef struct PXA2xxI2CSlaveState { + I2CSlave parent_obj; + PXA2xxI2CState *host; } PXA2xxI2CSlaveState; =20 @@ -1268,7 +1274,7 @@ static void pxa2xx_i2c_update(PXA2xxI2CState *s) /* These are only stubs now. */ static void pxa2xx_i2c_event(I2CSlave *i2c, enum i2c_event event) { - PXA2xxI2CSlaveState *slave =3D FROM_I2C_SLAVE(PXA2xxI2CSlaveState, i= 2c); + PXA2xxI2CSlaveState *slave =3D PXA2XX_I2C_SLAVE(i2c); PXA2xxI2CState *s =3D slave->host; =20 switch (event) { @@ -1292,10 +1298,12 @@ static void pxa2xx_i2c_event(I2CSlave *i2c, enum = i2c_event event) =20 static int pxa2xx_i2c_rx(I2CSlave *i2c) { - PXA2xxI2CSlaveState *slave =3D FROM_I2C_SLAVE(PXA2xxI2CSlaveState, i= 2c); + PXA2xxI2CSlaveState *slave =3D PXA2XX_I2C_SLAVE(i2c); PXA2xxI2CState *s =3D slave->host; - if ((s->control & (1 << 14)) || !(s->control & (1 << 6))) + + if ((s->control & (1 << 14)) || !(s->control & (1 << 6))) { return 0; + } =20 if (s->status & (1 << 0)) { /* RWM */ s->status |=3D 1 << 6; /* set ITE */ @@ -1307,10 +1315,12 @@ static int pxa2xx_i2c_rx(I2CSlave *i2c) =20 static int pxa2xx_i2c_tx(I2CSlave *i2c, uint8_t data) { - PXA2xxI2CSlaveState *slave =3D FROM_I2C_SLAVE(PXA2xxI2CSlaveState, i= 2c); + PXA2xxI2CSlaveState *slave =3D PXA2XX_I2C_SLAVE(i2c); PXA2xxI2CState *s =3D slave->host; - if ((s->control & (1 << 14)) || !(s->control & (1 << 6))) + + if ((s->control & (1 << 14)) || !(s->control & (1 << 6))) { return 1; + } =20 if (!(s->status & (1 << 0))) { /* RWM */ s->status |=3D 1 << 7; /* set IRF */ @@ -1325,6 +1335,7 @@ static uint64_t pxa2xx_i2c_read(void *opaque, hwadd= r addr, unsigned size) { PXA2xxI2CState *s =3D (PXA2xxI2CState *) opaque; + I2CSlave *slave; =20 addr -=3D s->offset; switch (addr) { @@ -1333,7 +1344,8 @@ static uint64_t pxa2xx_i2c_read(void *opaque, hwadd= r addr, case ISR: return s->status | (i2c_bus_busy(s->bus) << 2); case ISAR: - return s->slave->i2c.address; + slave =3D I2C_SLAVE(s->slave); + return slave->address; case IDBR: return s->data; case IBMR: @@ -1408,7 +1420,7 @@ static void pxa2xx_i2c_write(void *opaque, hwaddr a= ddr, break; =20 case ISAR: - i2c_set_slave_address(&s->slave->i2c, value & 0x7f); + i2c_set_slave_address(I2C_SLAVE(s->slave), value & 0x7f); break; =20 case IDBR: @@ -1432,7 +1444,7 @@ static const VMStateDescription vmstate_pxa2xx_i2c_= slave =3D { .minimum_version_id =3D 1, .minimum_version_id_old =3D 1, .fields =3D (VMStateField []) { - VMSTATE_I2C_SLAVE(i2c, PXA2xxI2CSlaveState), + VMSTATE_I2C_SLAVE(parent_obj, PXA2xxI2CSlaveState), VMSTATE_END_OF_LIST() } }; @@ -1470,7 +1482,7 @@ static void pxa2xx_i2c_slave_class_init(ObjectClass= *klass, void *data) } =20 static const TypeInfo pxa2xx_i2c_slave_info =3D { - .name =3D "pxa2xx-i2c-slave", + .name =3D TYPE_PXA2XX_I2C_SLAVE, .parent =3D TYPE_I2C_SLAVE, .instance_size =3D sizeof(PXA2xxI2CSlaveState), .class_init =3D pxa2xx_i2c_slave_class_init, @@ -1496,8 +1508,8 @@ PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base, s =3D PXA2XX_I2C(i2c_dev); /* FIXME: Should the slave device really be on a separate bus? */ i2cbus =3D i2c_init_bus(dev, "dummy"); - dev =3D i2c_create_slave(i2cbus, "pxa2xx-i2c-slave", 0); - s->slave =3D FROM_I2C_SLAVE(PXA2xxI2CSlaveState, I2C_SLAVE(dev)); + dev =3D i2c_create_slave(i2cbus, TYPE_PXA2XX_I2C_SLAVE, 0); + s->slave =3D PXA2XX_I2C_SLAVE(dev); s->slave->host =3D s; =20 return s; --=20 1.8.4.5