[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/48] tosa: QOM'ify DAC
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 11/48] tosa: QOM'ify DAC |
Date: |
Mon, 10 Feb 2014 19:36:28 +0100 |
Replace usages of FROM_I2C_SLAVE() with QOM cast macro.
Rename parent field. Use type constant in tosa_tg_init().
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
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;
}
+#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;
static int tosa_dac_send(I2CSlave *i2c, uint8_t data)
{
- TosaDACState *s = FROM_I2C_SLAVE(TosaDACState, i2c);
+ TosaDACState *s = TOSA_DAC(i2c);
+
s->buf[s->len] = data;
if (s->len ++ > 2) {
#ifdef VERBOSE
@@ -159,7 +164,8 @@ static int tosa_dac_send(I2CSlave *i2c, uint8_t data)
static void tosa_dac_event(I2CSlave *i2c, enum i2c_event event)
{
- TosaDACState *s = FROM_I2C_SLAVE(TosaDACState, i2c);
+ TosaDACState *s = TOSA_DAC(i2c);
+
s->len = 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 = 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");
}
@@ -271,7 +277,7 @@ static void tosa_dac_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo tosa_dac_info = {
- .name = "tosa_dac",
+ .name = TYPE_TOSA_DAC,
.parent = TYPE_I2C_SLAVE,
.instance_size = sizeof(TosaDACState),
.class_init = tosa_dac_class_init,
--
1.8.4.5
- [Qemu-devel] [PULL 00/48] QOM devices patch queue 2014-02-10, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 11/48] tosa: QOM'ify DAC,
Andreas Färber <=
- [Qemu-devel] [PULL 08/48] nand: Don't use qdev_create() in nand_init(), Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 09/48] i2c: Rename i2c_bus to I2CBus, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 01/48] qtest: don't report signals if qtest driver enabled, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 10/48] pxa2xx: QOM'ify I2C slave, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 12/48] z2: QOM'ify AER915, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 07/48] tests: Run qom-test for every architecture, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 16/48] lm832x: QOM'ify, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 14/48] ssd0303: QOM'ify, Andreas Färber, 2014/02/10
- [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