haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

zynq_slcr: QOM cast cleanup

Browse source 
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-26 23:29:03 +02:00
parent f1a0a79f4f
commit a054e2c2dd
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
hw/misc/zynq_slcr.c
View file

@ -114,8 +114,12 @@ typedef enum {
RESET_MAX RESET_MAX
} ResetValues; } ResetValues;
typedef struct { #define TYPE_ZYNQ_SLCR "xilinx,zynq_slcr"
SysBusDevice busdev; #define ZYNQ_SLCR(obj) OBJECT_CHECK(ZynqSLCRState, (obj), TYPE_ZYNQ_SLCR)
typedef struct ZynqSLCRState {
SysBusDevice parent_obj;
MemoryRegion iomem; MemoryRegion iomem;
union { union {
@ -158,9 +162,8 @@ typedef struct {
static void zynq_slcr_reset(DeviceState *d) static void zynq_slcr_reset(DeviceState *d)
{ {
ZynqSLCRState *s = ZYNQ_SLCR(d);
int i; int i;
ZynqSLCRState *s =
FROM_SYSBUS(ZynqSLCRState, SYS_BUS_DEVICE(d));
DB_PRINT("RESET\n"); DB_PRINT("RESET\n");
@ -492,7 +495,7 @@ static const MemoryRegionOps slcr_ops = {
static int zynq_slcr_init(SysBusDevice *dev) static int zynq_slcr_init(SysBusDevice *dev)
{ {
ZynqSLCRState *s = FROM_SYSBUS(ZynqSLCRState, dev); ZynqSLCRState *s = ZYNQ_SLCR(dev);
memory_region_init_io(&s->iomem, OBJECT(s), &slcr_ops, s, "slcr", 0x1000); memory_region_init_io(&s->iomem, OBJECT(s), &slcr_ops, s, "slcr", 0x1000);
sysbus_init_mmio(dev, &s->iomem); sysbus_init_mmio(dev, &s->iomem);
@ -523,7 +526,7 @@ static void zynq_slcr_class_init(ObjectClass *klass, void *data)
static const TypeInfo zynq_slcr_info = { static const TypeInfo zynq_slcr_info = {
.class_init = zynq_slcr_class_init, .class_init = zynq_slcr_class_init,
.name = "xilinx,zynq_slcr", .name = TYPE_ZYNQ_SLCR,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(ZynqSLCRState), .instance_size = sizeof(ZynqSLCRState),
}; };