From 2d6ee8e7e17227d5eb8c6e9a054dd88d5b37c5ae Mon Sep 17 00:00:00 2001 From: Juergen Lock Date: Sat, 12 Sep 2009 18:52:22 +0200 Subject: qemu serial: lost tx irqs (affecting FreeBSD's new uart(4) driver) Well one problem seems to be the rx condition, ... if ((s->ier & UART_IER_RDI) && (s->lsr & UART_LSR_DR)) is not enough to trigger an irq, yet still causes the following conditions not to be checked anymore at all. Signed-off-by: Juergen Lock Acked-by: Jan Kiszka Acked-by: Stefano Stabellini Signed-off-by: Aurelien Jarno --- hw/serial.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'hw/serial.c') diff --git a/hw/serial.c b/hw/serial.c index 1f4ce77191..a22770fbbc 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -197,12 +197,10 @@ static void serial_update_irq(SerialState *s) * this is not in the specification but is observed on existing * hardware. */ tmp_iir = UART_IIR_CTI; - } else if ((s->ier & UART_IER_RDI) && (s->lsr & UART_LSR_DR)) { - if (!(s->fcr & UART_FCR_FE)) { - tmp_iir = UART_IIR_RDI; - } else if (s->recv_fifo.count >= s->recv_fifo.itl) { - tmp_iir = UART_IIR_RDI; - } + } else if ((s->ier & UART_IER_RDI) && (s->lsr & UART_LSR_DR) && + (!(s->fcr & UART_FCR_FE) || + s->recv_fifo.count >= s->recv_fifo.itl)) { + tmp_iir = UART_IIR_RDI; } else if ((s->ier & UART_IER_THRI) && s->thr_ipending) { tmp_iir = UART_IIR_THRI; } else if ((s->ier & UART_IER_MSI) && (s->msr & UART_MSR_ANY_DELTA)) { -- cgit v1.2.3