[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 135/173] sun4m: QOM cast cleanup for IDRegState
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 135/173] sun4m: QOM cast cleanup for IDRegState |
Date: |
Mon, 29 Jul 2013 21:19:52 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/sparc/sun4m.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 5c7bd31..eb3b11b 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -559,6 +559,9 @@ static void tcx_init(hwaddr addr, int vram_size, int width,
}
/* NCR89C100/MACIO Internal ID register */
+
+#define TYPE_MACIO_ID_REGISTER "macio_idreg"
+
static const uint8_t idreg_data[] = { 0xfe, 0x81, 0x01, 0x03 };
static void idreg_init(hwaddr addr)
@@ -566,7 +569,7 @@ static void idreg_init(hwaddr addr)
DeviceState *dev;
SysBusDevice *s;
- dev = qdev_create(NULL, "macio_idreg");
+ dev = qdev_create(NULL, TYPE_MACIO_ID_REGISTER);
qdev_init_nofail(dev);
s = SYS_BUS_DEVICE(dev);
@@ -574,14 +577,18 @@ static void idreg_init(hwaddr addr)
cpu_physical_memory_write_rom(addr, idreg_data, sizeof(idreg_data));
}
+#define MACIO_ID_REGISTER(obj) \
+ OBJECT_CHECK(IDRegState, (obj), TYPE_MACIO_ID_REGISTER)
+
typedef struct IDRegState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion mem;
} IDRegState;
static int idreg_init1(SysBusDevice *dev)
{
- IDRegState *s = FROM_SYSBUS(IDRegState, dev);
+ IDRegState *s = MACIO_ID_REGISTER(dev);
memory_region_init_ram(&s->mem, OBJECT(s),
"sun4m.idreg", sizeof(idreg_data));
@@ -599,7 +606,7 @@ static void idreg_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo idreg_info = {
- .name = "macio_idreg",
+ .name = TYPE_MACIO_ID_REGISTER,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(IDRegState),
.class_init = idreg_class_init,
--
1.8.1.4
- [Qemu-devel] [PULL 126/173] stellaris_enet: Fix NetClientInfo::cleanup, (continued)
- [Qemu-devel] [PULL 126/173] stellaris_enet: Fix NetClientInfo::cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 127/173] xgmac: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 128/173] xilinx_ethlite: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 129/173] ds1225y: Drop bogus qdev field from NvRamState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 131/173] ppce500_spin: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 130/173] ds1225y: QOM cast cleanup for SysBusNvRamState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 133/173] pl181: Rename pl181_state to PL181State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 134/173] pl181: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 132/173] milkymist-memcard: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 136/173] sun4m: QOM cast cleanup for AFXState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 135/173] sun4m: QOM cast cleanup for IDRegState,
Andreas Färber <=
- [Qemu-devel] [PULL 138/173] sun4m: QOM cast cleanup for RamDevice, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 137/173] sun4m: QOM cast cleanup for PROMState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 139/173] sun4u: QOM cast cleanup for PROMState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 140/173] sun4u: QOM cast cleanup for RamDevice, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 141/173] pl022: Rename pl022_state to PL022State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 142/173] pl022: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 144/173] arm_timer: Rename sp804_state to SP804State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 143/173] xilinx_spi: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 145/173] arm_timer: QOM cast cleanup for SP804State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 146/173] arm_timer: QOM cast cleanup for icp_pit_state, Andreas Färber, 2013/07/29