From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Wed, 19 Feb 2025 14:35:53 +0000 (+0100)
Subject: hw/char/pl011: Simplify a bit pl011_can_receive()
X-Git-Tag: v10.0.0-rc0~32^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f33af61dbab3b6fe0923bd829461584eaa41039e;p=thirdparty%2Fqemu.git

hw/char/pl011: Simplify a bit pl011_can_receive()

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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250220092903.3726-3-philmd@linaro.org>
---

diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 12a2d4bc7b..5bb83c5421 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;
 }