diff options
Diffstat (limited to 'hw/arm/armv7m.c')
| -rw-r--r-- | hw/arm/armv7m.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 49d30782c..bb2a22d96 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -132,14 +132,14 @@ typedef struct { uint32_t base; } BitBandState; -static void bitband_init(Object *obj) +static int bitband_init(SysBusDevice *dev) { - BitBandState *s = BITBAND(obj); - SysBusDevice *dev = SYS_BUS_DEVICE(obj); + BitBandState *s = BITBAND(dev); - memory_region_init_io(&s->iomem, obj, &bitband_ops, &s->base, + memory_region_init_io(&s->iomem, OBJECT(s), &bitband_ops, &s->base, "bitband", 0x02000000); sysbus_init_mmio(dev, &s->iomem); + return 0; } static void armv7m_bitband_init(void) @@ -244,7 +244,9 @@ static Property bitband_properties[] = { static void bitband_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); + SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + k->init = bitband_init; dc->props = bitband_properties; } @@ -252,7 +254,6 @@ static const TypeInfo bitband_info = { .name = TYPE_BITBAND, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(BitBandState), - .instance_init = bitband_init, .class_init = bitband_class_init, }; |