mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sun4m: QOM cast cleanup for IDRegState

Browse Source 
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-27 13:33:46 +02:00
parent 630f444268
commit ef9dfa4c1c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/sparc/sun4m.c
View File

@ -559,6 +559,9 @@ static void tcx_init(hwaddr addr, int vram_size, int width,
} }
/* NCR89C100/MACIO Internal ID register */ /* NCR89C100/MACIO Internal ID register */
#define TYPE_MACIO_ID_REGISTER "macio_idreg"
static const uint8_t idreg_data[] = { 0xfe, 0x81, 0x01, 0x03 }; static const uint8_t idreg_data[] = { 0xfe, 0x81, 0x01, 0x03 };
static void idreg_init(hwaddr addr) static void idreg_init(hwaddr addr)
@ -566,7 +569,7 @@ static void idreg_init(hwaddr addr)
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
dev = qdev_create(NULL, "macio_idreg"); dev = qdev_create(NULL, TYPE_MACIO_ID_REGISTER);
qdev_init_nofail(dev); qdev_init_nofail(dev);
s = SYS_BUS_DEVICE(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)); 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 { typedef struct IDRegState {
SysBusDevice busdev; SysBusDevice parent_obj;
MemoryRegion mem; MemoryRegion mem;
} IDRegState; } IDRegState;
static int idreg_init1(SysBusDevice *dev) 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), memory_region_init_ram(&s->mem, OBJECT(s),
"sun4m.idreg", sizeof(idreg_data)); "sun4m.idreg", sizeof(idreg_data));
@ -599,7 +606,7 @@ static void idreg_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo idreg_info = { static const TypeInfo idreg_info = {
.name = "macio_idreg", .name = TYPE_MACIO_ID_REGISTER,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(IDRegState), .instance_size = sizeof(IDRegState),
.class_init = idreg_class_init, .class_init = idreg_class_init,