[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/48] max7310: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 15/48] max7310: QOM'ify |
Date: |
Mon, 10 Feb 2014 19:36:32 +0100 |
Replace FROM_I2C_SLAVE() usages with QOM cast macro.
Rename parent field.
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/gpio/max7310.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c
index 59b2877..cfcd89c 100644
--- a/hw/gpio/max7310.c
+++ b/hw/gpio/max7310.c
@@ -9,8 +9,12 @@
#include "hw/i2c/i2c.h"
-typedef struct {
- I2CSlave i2c;
+#define TYPE_MAX7310 "max7310"
+#define MAX7310(obj) OBJECT_CHECK(MAX7310State, (obj), TYPE_MAX7310)
+
+typedef struct MAX7310State {
+ I2CSlave parent_obj;
+
int i2c_command_byte;
int len;
@@ -25,7 +29,8 @@ typedef struct {
static void max7310_reset(DeviceState *dev)
{
- MAX7310State *s = FROM_I2C_SLAVE(MAX7310State, I2C_SLAVE(dev));
+ MAX7310State *s = MAX7310(dev);
+
s->level &= s->direction;
s->direction = 0xff;
s->polarity = 0xf0;
@@ -35,7 +40,7 @@ static void max7310_reset(DeviceState *dev)
static int max7310_rx(I2CSlave *i2c)
{
- MAX7310State *s = (MAX7310State *) i2c;
+ MAX7310State *s = MAX7310(i2c);
switch (s->command) {
case 0x00: /* Input port */
@@ -70,7 +75,7 @@ static int max7310_rx(I2CSlave *i2c)
static int max7310_tx(I2CSlave *i2c, uint8_t data)
{
- MAX7310State *s = (MAX7310State *) i2c;
+ MAX7310State *s = MAX7310(i2c);
uint8_t diff;
int line;
@@ -125,7 +130,7 @@ static int max7310_tx(I2CSlave *i2c, uint8_t data)
static void max7310_event(I2CSlave *i2c, enum i2c_event event)
{
- MAX7310State *s = (MAX7310State *) i2c;
+ MAX7310State *s = MAX7310(i2c);
s->len = 0;
switch (event) {
@@ -156,7 +161,7 @@ static const VMStateDescription vmstate_max7310 = {
VMSTATE_UINT8(polarity, MAX7310State),
VMSTATE_UINT8(status, MAX7310State),
VMSTATE_UINT8(command, MAX7310State),
- VMSTATE_I2C_SLAVE(i2c, MAX7310State),
+ VMSTATE_I2C_SLAVE(parent_obj, MAX7310State),
VMSTATE_END_OF_LIST()
}
};
@@ -177,7 +182,7 @@ static void max7310_gpio_set(void *opaque, int line, int
level)
* but also accepts sequences that are not SMBus so return an I2C device. */
static int max7310_init(I2CSlave *i2c)
{
- MAX7310State *s = FROM_I2C_SLAVE(MAX7310State, i2c);
+ MAX7310State *s = MAX7310(i2c);
qdev_init_gpio_in(&i2c->qdev, max7310_gpio_set, 8);
qdev_init_gpio_out(&i2c->qdev, s->handler, 8);
@@ -199,7 +204,7 @@ static void max7310_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo max7310_info = {
- .name = "max7310",
+ .name = TYPE_MAX7310,
.parent = TYPE_I2C_SLAVE,
.instance_size = sizeof(MAX7310State),
.class_init = max7310_class_init,
--
1.8.4.5
- [Qemu-devel] [PULL 06/48] qom-test: Test shutdown in addition to startup, (continued)
- [Qemu-devel] [PULL 06/48] qom-test: Test shutdown in addition to startup, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 19/48] i2c: Drop FROM_I2C_SLAVE() macro, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 05/48] qom-test: Run for all available machines, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 13/48] wm8750: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 03/48] ppcemb-softmmu: Drop Mac and e500 emulation, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 17/48] ds1338: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 02/48] prep: Drop from ppcemb-softmmu, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 04/48] target-ppc: Make ppc40x CPUs available in ppcemb, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 18/48] twl92230: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 20/48] tests: Add e1000 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 15/48] max7310: QOM'ify,
Andreas Färber <=
- [Qemu-devel] [PULL 27/48] tests: Add tpci200 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 25/48] tests: Add ne2000 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 28/48] tests: Add ipoctal232 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 21/48] tests: Add vmxnet3 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 22/48] tests: Add rtl8139 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 30/48] ipack: QOM parent field cleanup for IPackBus, Andreas Färber, 2014/02/10