Commit dffacd46 authored by Don Slutz's avatar Don Slutz Committed by Peter Maydell
Browse files

char/serial: Fix emptyness handling 



The commit 88c1ee73
char/serial: Fix emptyness check

Still causes extra NULL byte(s) to be sent.

So if the fifo is empty, do not send an extra NULL byte.

Reviewed-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: default avatarDon Slutz <dslutz@verizon.com>
Message-id: 1395160174-16006-1-git-send-email-dslutz@verizon.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent bd7ce902

hw/char/serial.c

+4 −2
Original line number Diff line number Diff line
@@ -225,8 +225,10 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque) 


    if (s->tsr_retry <= 0) {

        if (s->fcr & UART_FCR_FE) {

            s->tsr = fifo8_is_empty(&s->xmit_fifo) ?

                        0 : fifo8_pop(&s->xmit_fifo);

            if (fifo8_is_empty(&s->xmit_fifo)) {

                return FALSE;

            }

            s->tsr = fifo8_pop(&s->xmit_fifo);

            if (!s->xmit_fifo.num) {

                s->lsr |= UART_LSR_THRE;

            }