From 95faaa73dfe705a3c6411d855cdbf099c596ec25 Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Thu, 29 May 2014 02:25:03 -0700 Subject: char: xilinx_uartlite: Don't reset from init This refresh of the device state is intended to be a reset side effect. Move it to a proper reset handler rather than do it at init time. Signed-off-by: Peter Crosthwaite Signed-off-by: Edgar E. Iglesias --- hw/char/xilinx_uartlite.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'hw/char') diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index b0d1d04af7..d810e5f227 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -87,6 +87,11 @@ static void uart_update_status(XilinxUARTLite *s) s->regs[R_STATUS] = r; } +static void xilinx_uartlite_reset(DeviceState *dev) +{ + uart_update_status(XILINX_UARTLITE(dev)); +} + static uint64_t uart_read(void *opaque, hwaddr addr, unsigned int size) { @@ -202,7 +207,6 @@ static int xilinx_uartlite_init(SysBusDevice *dev) sysbus_init_irq(dev, &s->irq); - uart_update_status(s); memory_region_init_io(&s->mmio, OBJECT(s), &uart_ops, s, "xlnx.xps-uartlite", R_MAX * 4); sysbus_init_mmio(dev, &s->mmio); @@ -216,8 +220,10 @@ static int xilinx_uartlite_init(SysBusDevice *dev) static void xilinx_uartlite_class_init(ObjectClass *klass, void *data) { SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); sdc->init = xilinx_uartlite_init; + dc->reset = xilinx_uartlite_reset; } static const TypeInfo xilinx_uartlite_info = { -- cgit v1.2.3