From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWco-000288-67 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-00060q-Iz for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:18 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41638 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWcf-00060b-Cw 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:21 +0100 Message-Id: <1392675899-21210-12-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 11/49] tosa: QOM'ify DAC 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() with QOM cast macro. Rename parent field. Use type constant in tosa_tg_init(). Reviewed-by: Peter Crosthwaite Signed-off-by: Andreas F=C3=A4rber --- hw/arm/tosa.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index dd224d3..2069f55 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -132,15 +132,20 @@ static int tosa_ssp_init(SSISlave *dev) return 0; } =20 +#define TYPE_TOSA_DAC "tosa_dac" +#define TOSA_DAC(obj) OBJECT_CHECK(TosaDACState, (obj), TYPE_TOSA_DAC) + typedef struct { - I2CSlave i2c; + I2CSlave parent_obj; + int len; char buf[3]; } TosaDACState; =20 static int tosa_dac_send(I2CSlave *i2c, uint8_t data) { - TosaDACState *s =3D FROM_I2C_SLAVE(TosaDACState, i2c); + TosaDACState *s =3D TOSA_DAC(i2c); + s->buf[s->len] =3D data; if (s->len ++ > 2) { #ifdef VERBOSE @@ -159,7 +164,8 @@ static int tosa_dac_send(I2CSlave *i2c, uint8_t data) =20 static void tosa_dac_event(I2CSlave *i2c, enum i2c_event event) { - TosaDACState *s =3D FROM_I2C_SLAVE(TosaDACState, i2c); + TosaDACState *s =3D TOSA_DAC(i2c); + s->len =3D 0; switch (event) { case I2C_START_SEND: @@ -195,7 +201,7 @@ static int tosa_dac_init(I2CSlave *i2c) static void tosa_tg_init(PXA2xxState *cpu) { I2CBus *bus =3D pxa2xx_i2c_bus(cpu->i2c[0]); - i2c_create_slave(bus, "tosa_dac", DAC_BASE); + i2c_create_slave(bus, TYPE_TOSA_DAC, DAC_BASE); ssi_create_slave(cpu->ssp[1], "tosa-ssp"); } =20 @@ -271,7 +277,7 @@ static void tosa_dac_class_init(ObjectClass *klass, v= oid *data) } =20 static const TypeInfo tosa_dac_info =3D { - .name =3D "tosa_dac", + .name =3D TYPE_TOSA_DAC, .parent =3D TYPE_I2C_SLAVE, .instance_size =3D sizeof(TosaDACState), .class_init =3D tosa_dac_class_init, --=20 1.8.4.5