From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWcr-0002EI-AG for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFWci-00062b-Dq for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:21 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41645 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWci-00062P-3T for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:12 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id AC355AC9C 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:26 +0100 Message-Id: <1392675899-21210-17-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 16/49] lm832x: 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 usages of FROM_I2C_SLAVE() and direct parent field accesses with QOM cast macro. Rename parent field. Reviewed-by: Peter Crosthwaite Signed-off-by: Andreas F=C3=A4rber --- hw/input/lm832x.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index f583cf0..4ae1cd9 100644 --- a/hw/input/lm832x.c +++ b/hw/input/lm832x.c @@ -23,8 +23,12 @@ #include "qemu/timer.h" #include "ui/console.h" =20 +#define TYPE_LM8323 "lm8323" +#define LM8323(obj) OBJECT_CHECK(LM823KbdState, (obj), TYPE_LM8323) + typedef struct { - I2CSlave i2c; + I2CSlave parent_obj; + uint8_t i2c_dir; uint8_t i2c_cycle; uint8_t reg; @@ -380,7 +384,7 @@ static void lm_kbd_write(LM823KbdState *s, int reg, i= nt byte, uint8_t value) =20 static void lm_i2c_event(I2CSlave *i2c, enum i2c_event event) { - LM823KbdState *s =3D FROM_I2C_SLAVE(LM823KbdState, i2c); + LM823KbdState *s =3D LM8323(i2c); =20 switch (event) { case I2C_START_RECV: @@ -396,14 +400,14 @@ static void lm_i2c_event(I2CSlave *i2c, enum i2c_ev= ent event) =20 static int lm_i2c_rx(I2CSlave *i2c) { - LM823KbdState *s =3D FROM_I2C_SLAVE(LM823KbdState, i2c); + LM823KbdState *s =3D LM8323(i2c); =20 return lm_kbd_read(s, s->reg, s->i2c_cycle ++); } =20 static int lm_i2c_tx(I2CSlave *i2c, uint8_t data) { - LM823KbdState *s =3D (LM823KbdState *) i2c; + LM823KbdState *s =3D LM8323(i2c); =20 if (!s->i2c_cycle) s->reg =3D data; @@ -431,7 +435,7 @@ static const VMStateDescription vmstate_lm_kbd =3D { .minimum_version_id_old =3D 0, .post_load =3D lm_kbd_post_load, .fields =3D (VMStateField []) { - VMSTATE_I2C_SLAVE(i2c, LM823KbdState), + VMSTATE_I2C_SLAVE(parent_obj, LM823KbdState), VMSTATE_UINT8(i2c_dir, LM823KbdState), VMSTATE_UINT8(i2c_cycle, LM823KbdState), VMSTATE_UINT8(reg, LM823KbdState), @@ -460,13 +464,13 @@ static const VMStateDescription vmstate_lm_kbd =3D = { =20 static int lm8323_init(I2CSlave *i2c) { - LM823KbdState *s =3D FROM_I2C_SLAVE(LM823KbdState, i2c); + LM823KbdState *s =3D LM8323(i2c); =20 s->model =3D 0x8323; s->pwm.tm[0] =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, lm_kbd_pwm0_tick, = s); s->pwm.tm[1] =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, lm_kbd_pwm1_tick, = s); s->pwm.tm[2] =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, lm_kbd_pwm2_tick, = s); - qdev_init_gpio_out(&i2c->qdev, &s->nirq, 1); + qdev_init_gpio_out(DEVICE(i2c), &s->nirq, 1); =20 lm_kbd_reset(s); =20 @@ -476,7 +480,7 @@ static int lm8323_init(I2CSlave *i2c) =20 void lm832x_key_event(DeviceState *dev, int key, int state) { - LM823KbdState *s =3D FROM_I2C_SLAVE(LM823KbdState, I2C_SLAVE(dev)); + LM823KbdState *s =3D LM8323(dev); =20 if ((s->status & INT_ERROR) && (s->error & ERR_FIFOOVR)) return; @@ -507,7 +511,7 @@ static void lm8323_class_init(ObjectClass *klass, voi= d *data) } =20 static const TypeInfo lm8323_info =3D { - .name =3D "lm8323", + .name =3D TYPE_LM8323, .parent =3D TYPE_I2C_SLAVE, .instance_size =3D sizeof(LM823KbdState), .class_init =3D lm8323_class_init, --=20 1.8.4.5