On 22:08 Wed 19 Feb , 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(-)
>
> diff --git a/hw/char/pl011.c b/hw/char/pl011.c
> index 60cea1d9a16..bcd516d682d 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, "PL011 reading data on disabled UART\n");
> @@ -494,7 +496,6 @@ static int pl011_can_receive(void *opaque)
> if (!(s->cr & CR_RXE)) {
> qemu_log_mask(LOG_GUEST_ERROR, "PL011 reading data on disabled TX UART\n");
> }
> - r = s->read_count < pl011_get_fifo_depth(s);
> trace_pl011_can_receive(s->lcr, s->read_count, r);
> return r;
> }
> --
> 2.47.1
>
--