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

char: xilinx_uartlite: Convert to realize()

Browse Source 
SysBusDevice::init is depracated. Convert to Object::init and
Device::realize as prescribed by QOM conventions.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Peter Crosthwaite 2014-05-29 02:25:37 -07:00 committed by Edgar E. Iglesias
parent 95faaa73df
commit aa0f607f61
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/char/xilinx_uartlite.c
View File

@ -201,35 +201,39 @@ static void uart_event(void *opaque, int event)
} }
static int xilinx_uartlite_init(SysBusDevice *dev) static void xilinx_uartlite_realize(DeviceState *dev, Error **errp)
{ {
XilinxUARTLite *s = XILINX_UARTLITE(dev); XilinxUARTLite *s = XILINX_UARTLITE(dev);
sysbus_init_irq(dev, &s->irq);
memory_region_init_io(&s->mmio, OBJECT(s), &uart_ops, s,
"xlnx.xps-uartlite", R_MAX * 4);
sysbus_init_mmio(dev, &s->mmio);
s->chr = qemu_char_get_next_serial(); s->chr = qemu_char_get_next_serial();
if (s->chr) if (s->chr)
qemu_chr_add_handlers(s->chr, uart_can_rx, uart_rx, uart_event, s); qemu_chr_add_handlers(s->chr, uart_can_rx, uart_rx, uart_event, s);
return 0; }
static void xilinx_uartlite_init(Object *obj)
{
XilinxUARTLite *s = XILINX_UARTLITE(obj);
sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
memory_region_init_io(&s->mmio, obj, &uart_ops, s,
"xlnx.xps-uartlite", R_MAX * 4);
sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
} }
static void xilinx_uartlite_class_init(ObjectClass *klass, void *data) static void xilinx_uartlite_class_init(ObjectClass *klass, void *data)
{ {
SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
sdc->init = xilinx_uartlite_init;
dc->reset = xilinx_uartlite_reset; dc->reset = xilinx_uartlite_reset;
dc->realize = xilinx_uartlite_realize;
} }
static const TypeInfo xilinx_uartlite_info = { static const TypeInfo xilinx_uartlite_info = {
.name = TYPE_XILINX_UARTLITE, .name = TYPE_XILINX_UARTLITE,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(XilinxUARTLite), .instance_size = sizeof(XilinxUARTLite),
.instance_init = xilinx_uartlite_init,
.class_init = xilinx_uartlite_class_init, .class_init = xilinx_uartlite_class_init,
}; };