diff options
Diffstat (limited to 'hw/milkymist-uart.c')
| -rw-r--r-- | hw/milkymist-uart.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/hw/milkymist-uart.c b/hw/milkymist-uart.c index 312976dfe5..f9a229cf68 100644 --- a/hw/milkymist-uart.c +++ b/hw/milkymist-uart.c @@ -199,7 +199,7 @@ static int milkymist_uart_init(SysBusDevice *dev) "milkymist-uart", R_MAX * 4); sysbus_init_mmio(dev, &s->regs_region); - s->chr = qdev_init_chardev(&dev->qdev); + s->chr = qemu_char_get_next_serial(); if (s->chr) { qemu_chr_add_handlers(s->chr, uart_can_rx, uart_rx, uart_event, s); } @@ -220,22 +220,24 @@ static const VMStateDescription vmstate_milkymist_uart = { static void milkymist_uart_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); k->init = milkymist_uart_init; + dc->reset = milkymist_uart_reset; + dc->vmsd = &vmstate_milkymist_uart; } -static DeviceInfo milkymist_uart_info = { - .name = "milkymist-uart", - .size = sizeof(MilkymistUartState), - .vmsd = &vmstate_milkymist_uart, - .reset = milkymist_uart_reset, - .class_init = milkymist_uart_class_init, +static TypeInfo milkymist_uart_info = { + .name = "milkymist-uart", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(MilkymistUartState), + .class_init = milkymist_uart_class_init, }; static void milkymist_uart_register(void) { - sysbus_register_withprop(&milkymist_uart_info); + type_register_static(&milkymist_uart_info); } device_init(milkymist_uart_register) |