| Message ID | 20250220092903.3726-3-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/char: Improve RX FIFO depth uses | expand |
On 2/20/25 01:28, Philippe Mathieu-Daudé wrote: > Introduce 'fifo_depth' and 'fifo_available' local variables > to better express the 'r' variable use. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Luc Michel <luc.michel@amd.com> > --- > hw/char/pl011.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > > diff --git a/hw/char/pl011.c b/hw/char/pl011.c > index 12a2d4bc7bd..5bb83c54216 100644 > --- a/hw/char/pl011.c > +++ b/hw/char/pl011.c > @@ -486,7 +486,9 @@ static void pl011_write(void *opaque, hwaddr offset, > static int pl011_can_receive(void *opaque) > { > PL011State *s = (PL011State *)opaque; > - int r; > + unsigned fifo_depth = pl011_get_fifo_depth(s); > + unsigned fifo_available = fifo_depth - s->read_count; > + int r = fifo_available ? 1 : 0; This is begging for a bool, though. Both in the local and the return type. r~
diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 12a2d4bc7bd..5bb83c54216 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -486,7 +486,9 @@ static void pl011_write(void *opaque, hwaddr offset, static int pl011_can_receive(void *opaque) { PL011State *s = (PL011State *)opaque; - int r; + unsigned fifo_depth = pl011_get_fifo_depth(s); + unsigned fifo_available = fifo_depth - s->read_count; + int r = fifo_available ? 1 : 0; if (!(s->cr & CR_UARTEN)) { qemu_log_mask(LOG_GUEST_ERROR, @@ -496,7 +498,6 @@ static int pl011_can_receive(void *opaque) qemu_log_mask(LOG_GUEST_ERROR, "PL011 receiving data on disabled RX UART\n"); } - r = s->read_count < pl011_get_fifo_depth(s); trace_pl011_can_receive(s->lcr, s->read_count, r); return r; }