| Message ID | 20250220092903.3726-9-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/char: Improve RX FIFO depth uses | expand |
Am Thu, 20 Feb 2025 10:29:01 +0100 schrieb Philippe Mathieu-Daudé <philmd@linaro.org>: > While we model a 4-elements RX FIFO since the MCF UART model > was introduced in commit 20dcee94833 ("MCF5208 emulation"), > we only read 1 char at a time! > > Have the IOCanReadHandler handler return how many elements are > available, and use that in the IOReadHandler handler. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Luc Michel <luc.michel@amd.com> > --- > hw/char/mcf_uart.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c > index 95f269ee9b7..529c26be93a 100644 > --- a/hw/char/mcf_uart.c > +++ b/hw/char/mcf_uart.c > @@ -281,14 +281,16 @@ static int mcf_uart_can_receive(void *opaque) > { > mcf_uart_state *s = (mcf_uart_state *)opaque; > > - return s->rx_enabled && (s->sr & MCF_UART_FFULL) == 0; > + return s->rx_enabled ? FIFO_DEPTH - s->fifo_len : 0; > } > > static void mcf_uart_receive(void *opaque, const uint8_t *buf, int size) > { > mcf_uart_state *s = (mcf_uart_state *)opaque; > > - mcf_uart_push_byte(s, buf[0]); > + for (int i = 0; i < size; i++) { > + mcf_uart_push_byte(s, buf[i]); > + } > } Tested-by: Thomas Huth <huth@tuxfamily.org> Reviewed-by: Thomas Huth <huth@tuxfamily.org>
diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 95f269ee9b7..529c26be93a 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -281,14 +281,16 @@ static int mcf_uart_can_receive(void *opaque) { mcf_uart_state *s = (mcf_uart_state *)opaque; - return s->rx_enabled && (s->sr & MCF_UART_FFULL) == 0; + return s->rx_enabled ? FIFO_DEPTH - s->fifo_len : 0; } static void mcf_uart_receive(void *opaque, const uint8_t *buf, int size) { mcf_uart_state *s = (mcf_uart_state *)opaque; - mcf_uart_push_byte(s, buf[0]); + for (int i = 0; i < size; i++) { + mcf_uart_push_byte(s, buf[i]); + } } static const MemoryRegionOps mcf_uart_ops = {
While we model a 4-elements RX FIFO since the MCF UART model was introduced in commit 20dcee94833 ("MCF5208 emulation"), we only read 1 char at a time! Have the IOCanReadHandler handler return how many elements are available, and use that in the IOReadHandler handler. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Luc Michel <luc.michel@amd.com> --- hw/char/mcf_uart.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)