diff options
Diffstat (limited to 'hw/arm11mpcore.c')
| -rw-r--r-- | hw/arm11mpcore.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/hw/arm11mpcore.c b/hw/arm11mpcore.c index 53c5408d13..3c0839c4b4 100644 --- a/hw/arm11mpcore.c +++ b/hw/arm11mpcore.c @@ -217,16 +217,18 @@ static Property mpcore_rirq_properties[] = { static void mpcore_rirq_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); k->init = realview_mpcore_init; + dc->props = mpcore_rirq_properties; } -static DeviceInfo mpcore_rirq_info = { - .name = "realview_mpcore", - .size = sizeof(mpcore_rirq_state), - .props = mpcore_rirq_properties, - .class_init = mpcore_rirq_class_init, +static TypeInfo mpcore_rirq_info = { + .name = "realview_mpcore", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(mpcore_rirq_state), + .class_init = mpcore_rirq_class_init, }; static Property mpcore_priv_properties[] = { @@ -236,22 +238,24 @@ static Property mpcore_priv_properties[] = { static void mpcore_priv_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); k->init = mpcore_priv_init; + dc->props = mpcore_priv_properties; } -static DeviceInfo mpcore_priv_info = { - .name = "arm11mpcore_priv", - .size = sizeof(mpcore_priv_state), - .props = mpcore_priv_properties, - .class_init = mpcore_priv_class_init, +static TypeInfo mpcore_priv_info = { + .name = "arm11mpcore_priv", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(mpcore_priv_state), + .class_init = mpcore_priv_class_init, }; static void arm11mpcore_register_devices(void) { - sysbus_register_withprop(&mpcore_rirq_info); - sysbus_register_withprop(&mpcore_priv_info); + type_register_static(&mpcore_rirq_info); + type_register_static(&mpcore_priv_info); } device_init(arm11mpcore_register_devices) |