david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

char/cadence_uart: Fix reset.

Browse Source 
Don't reset the uart as an init step. Register the reset function as a
proper reset fn instead.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: d82cd2e65e5a6f8b6deeecb6cced61f0bf3f8c89.1388626249.git.peter.crosthwaite@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Crosthwaite 2014-01-06 10:16:38 +00:00 committed by Peter Maydell
parent 362f656878
commit b56fab8847
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/char/cadence_uart.c
View File

@ -431,8 +431,10 @@ static const MemoryRegionOps uart_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static void cadence_uart_reset(UartState *s) static void cadence_uart_reset(DeviceState *dev)
{ {
UartState *s = CADENCE_UART(dev);
s->r[R_CR] = 0x00000128; s->r[R_CR] = 0x00000128;
s->r[R_IMR] = 0; s->r[R_IMR] = 0;
s->r[R_CISR] = 0; s->r[R_CISR] = 0;
@ -465,8 +467,6 @@ static int cadence_uart_init(SysBusDevice *dev)
s->chr = qemu_char_get_next_serial(); s->chr = qemu_char_get_next_serial();
cadence_uart_reset(s);
if (s->chr) { if (s->chr) {
qemu_chr_add_handlers(s->chr, uart_can_receive, uart_receive, qemu_chr_add_handlers(s->chr, uart_can_receive, uart_receive,
uart_event, s); uart_event, s);
@ -508,6 +508,7 @@ static void cadence_uart_class_init(ObjectClass *klass, void *data)
sdc->init = cadence_uart_init; sdc->init = cadence_uart_init;
dc->vmsd = &vmstate_cadence_uart; dc->vmsd = &vmstate_cadence_uart;
dc->reset = cadence_uart_reset;
} }
static const TypeInfo cadence_uart_info = { static const TypeInfo cadence_uart_info = {