From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWco-000289-9F for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFWcg-00061A-4z for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:18 -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 1WFWcf-00060w-VE for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:10 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 17 Feb 2014 23:24:22 +0100 Message-Id: <1392675899-21210-13-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 12/49] z2: QOM'ify AER915 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 the parent field. Reuse the type constant in z2_init(). Reviewed-by: Peter Crosthwaite [AF: Use TYPE_AER915 in z2_init() too] Signed-off-by: Andreas F=C3=A4rber --- hw/arm/z2.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 97ec381..67c1be8 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -193,15 +193,20 @@ static const TypeInfo zipit_lcd_info =3D { .class_init =3D zipit_lcd_class_init, }; =20 -typedef struct { - I2CSlave i2c; +#define TYPE_AER915 "aer915" +#define AER915(obj) OBJECT_CHECK(AER915State, (obj), TYPE_AER915) + +typedef struct AER915State { + I2CSlave parent_obj; + int len; uint8_t buf[3]; } AER915State; =20 static int aer915_send(I2CSlave *i2c, uint8_t data) { - AER915State *s =3D FROM_I2C_SLAVE(AER915State, i2c); + AER915State *s =3D AER915(i2c); + s->buf[s->len] =3D data; if (s->len++ > 2) { DPRINTF("%s: message too long (%i bytes)\n", @@ -219,7 +224,8 @@ static int aer915_send(I2CSlave *i2c, uint8_t data) =20 static void aer915_event(I2CSlave *i2c, enum i2c_event event) { - AER915State *s =3D FROM_I2C_SLAVE(AER915State, i2c); + AER915State *s =3D AER915(i2c); + switch (event) { case I2C_START_SEND: s->len =3D 0; @@ -238,8 +244,8 @@ static void aer915_event(I2CSlave *i2c, enum i2c_even= t event) =20 static int aer915_recv(I2CSlave *slave) { + AER915State *s =3D AER915(slave); int retval =3D 0x00; - AER915State *s =3D FROM_I2C_SLAVE(AER915State, slave); =20 switch (s->buf[0]) { /* Return hardcoded battery voltage, @@ -290,7 +296,7 @@ static void aer915_class_init(ObjectClass *klass, voi= d *data) } =20 static const TypeInfo aer915_info =3D { - .name =3D "aer915", + .name =3D TYPE_AER915, .parent =3D TYPE_I2C_SLAVE, .instance_size =3D sizeof(AER915State), .class_init =3D aer915_class_init, @@ -351,7 +357,7 @@ static void z2_init(QEMUMachineInitArgs *args) type_register_static(&aer915_info); z2_lcd =3D ssi_create_slave(mpu->ssp[1], "zipit-lcd"); bus =3D pxa2xx_i2c_bus(mpu->i2c[0]); - i2c_create_slave(bus, "aer915", 0x55); + i2c_create_slave(bus, TYPE_AER915, 0x55); wm =3D i2c_create_slave(bus, "wm8750", 0x1b); mpu->i2s->opaque =3D wm; mpu->i2s->codec_out =3D wm8750_dac_dat; --=20 1.8.4.5