[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 16/49] lm832x: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL v2 16/49] lm832x: QOM'ify |
Date: |
Mon, 17 Feb 2014 23:24:26 +0100 |
Replace usages of FROM_I2C_SLAVE() and direct parent field accesses with
QOM cast macro. Rename parent field.
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
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"
+#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, int
byte, uint8_t value)
static void lm_i2c_event(I2CSlave *i2c, enum i2c_event event)
{
- LM823KbdState *s = FROM_I2C_SLAVE(LM823KbdState, i2c);
+ LM823KbdState *s = LM8323(i2c);
switch (event) {
case I2C_START_RECV:
@@ -396,14 +400,14 @@ static void lm_i2c_event(I2CSlave *i2c, enum i2c_event
event)
static int lm_i2c_rx(I2CSlave *i2c)
{
- LM823KbdState *s = FROM_I2C_SLAVE(LM823KbdState, i2c);
+ LM823KbdState *s = LM8323(i2c);
return lm_kbd_read(s, s->reg, s->i2c_cycle ++);
}
static int lm_i2c_tx(I2CSlave *i2c, uint8_t data)
{
- LM823KbdState *s = (LM823KbdState *) i2c;
+ LM823KbdState *s = LM8323(i2c);
if (!s->i2c_cycle)
s->reg = data;
@@ -431,7 +435,7 @@ static const VMStateDescription vmstate_lm_kbd = {
.minimum_version_id_old = 0,
.post_load = lm_kbd_post_load,
.fields = (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 = {
static int lm8323_init(I2CSlave *i2c)
{
- LM823KbdState *s = FROM_I2C_SLAVE(LM823KbdState, i2c);
+ LM823KbdState *s = LM8323(i2c);
s->model = 0x8323;
s->pwm.tm[0] = timer_new_ns(QEMU_CLOCK_VIRTUAL, lm_kbd_pwm0_tick, s);
s->pwm.tm[1] = timer_new_ns(QEMU_CLOCK_VIRTUAL, lm_kbd_pwm1_tick, s);
s->pwm.tm[2] = 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);
lm_kbd_reset(s);
@@ -476,7 +480,7 @@ static int lm8323_init(I2CSlave *i2c)
void lm832x_key_event(DeviceState *dev, int key, int state)
{
- LM823KbdState *s = FROM_I2C_SLAVE(LM823KbdState, I2C_SLAVE(dev));
+ LM823KbdState *s = LM8323(dev);
if ((s->status & INT_ERROR) && (s->error & ERR_FIFOOVR))
return;
@@ -507,7 +511,7 @@ static void lm8323_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo lm8323_info = {
- .name = "lm8323",
+ .name = TYPE_LM8323,
.parent = TYPE_I2C_SLAVE,
.instance_size = sizeof(LM823KbdState),
.class_init = lm8323_class_init,
--
1.8.4.5
- [Qemu-devel] [PULL v2 07/49] tests: Run qom-test for every architecture, (continued)
- [Qemu-devel] [PULL v2 07/49] tests: Run qom-test for every architecture, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 08/49] nand: Don't use qdev_create() in nand_init(), Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 06/49] qom-test: Test shutdown in addition to startup, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 10/49] pxa2xx: QOM'ify I2C slave, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 11/49] tosa: QOM'ify DAC, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 12/49] z2: QOM'ify AER915, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 13/49] wm8750: QOM'ify, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 09/49] i2c: Rename i2c_bus to I2CBus, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 14/49] ssd0303: QOM'ify, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 15/49] max7310: QOM'ify, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 16/49] lm832x: QOM'ify,
Andreas Färber <=
- [Qemu-devel] [PULL v2 17/49] ds1338: QOM'ify, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 18/49] twl92230: QOM'ify, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 19/49] i2c: Drop FROM_I2C_SLAVE() macro, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 21/49] tests: Add vmxnet3 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 20/49] tests: Add e1000 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 24/49] tests: Add eepro100 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 26/49] tests: Add virtio-net qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 28/49] tests: Add ipoctal232 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 22/49] tests: Add rtl8139 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 25/49] tests: Add ne2000 qtest, Andreas Färber, 2014/02/17