[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next v1 4/6] misc: max111x: QOM casting sweep
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH qom-next v1 4/6] misc: max111x: QOM casting sweep |
Date: |
Tue, 11 Feb 2014 16:29:35 -0800 |
Define and use QOM cast macro. Removes some usages of legacy casting
systems.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
hw/misc/max111x.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c
index 9e50e7e..8c78979 100644
--- a/hw/misc/max111x.c
+++ b/hw/misc/max111x.c
@@ -24,6 +24,9 @@ typedef struct {
#define TYPE_MAX_111X "max111x"
+#define MAX_111X(obj) \
+ OBJECT_CHECK(MAX111xState, (obj), TYPE_MAX_111X)
+
#define TYPE_MAX_1110 "max1110"
#define TYPE_MAX_1111 "max1111"
@@ -97,7 +100,7 @@ static void max111x_write(MAX111xState *s, uint32_t value)
static uint32_t max111x_transfer(SSISlave *dev, uint32_t value)
{
- MAX111xState *s = FROM_SSI_SLAVE(MAX111xState, dev);
+ MAX111xState *s = MAX_111X(dev);
max111x_write(s, value);
return max111x_read(s);
}
@@ -122,7 +125,7 @@ static const VMStateDescription vmstate_max111x = {
static int max111x_init(SSISlave *dev, int inputs)
{
- MAX111xState *s = FROM_SSI_SLAVE(MAX111xState, dev);
+ MAX111xState *s = MAX_111X(dev);
qdev_init_gpio_out(DEVICE(dev), &s->interrupt, 1);
@@ -154,7 +157,7 @@ static int max1111_init(SSISlave *dev)
void max111x_set_input(DeviceState *dev, int line, uint8_t value)
{
- MAX111xState *s = FROM_SSI_SLAVE(MAX111xState, SSI_SLAVE_FROM_QDEV(dev));
+ MAX111xState *s = MAX_111X(dev);
assert(line >= 0 && line < s->inputs);
s->input[line] = value;
}
--
1.8.5.4
- [Qemu-devel] [PATCH qom-next v1 0/6] SSI QOM cleanups, Peter Crosthwaite, 2014/02/11
- [Qemu-devel] [PATCH qom-next v1 1/6] ssi: Convert legacy casts from SSI_SLAVE->DEVICE, Peter Crosthwaite, 2014/02/11
- [Qemu-devel] [PATCH qom-next v1 2/6] ssi: Remove legacy SSI_BUS->BUS cast, Peter Crosthwaite, 2014/02/11
- [Qemu-devel] [PATCH qom-next v1 3/6] misc: max111x: Create abstract max111x class, Peter Crosthwaite, 2014/02/11
- [Qemu-devel] [PATCH qom-next v1 4/6] misc: max111x: QOM casting sweep,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH qom-next v1 5/6] ssi: Remove SSI_SLAVE_FROM_QDEV macro, Peter Crosthwaite, 2014/02/11
- [Qemu-devel] [PATCH qom-next v1 6/6] block/m25p80: Remove FROM_SSI_SLAVE usages, Peter Crosthwaite, 2014/02/11
- Re: [Qemu-devel] [PATCH qom-next v1 0/6] SSI QOM cleanups, Peter Crosthwaite, 2014/02/25