[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 06/16] hw/char/pl011: Extract pl011_write_txdata() from pl011_
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v5 06/16] hw/char/pl011: Extract pl011_write_txdata() from pl011_write() |
Date: |
Fri, 19 Jul 2024 20:10:31 +0200 |
When implementing FIFO, this code will become more complex.
Start by factoring it out to a new pl011_write_txdata() function.
No functional change intended.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
---
hw/char/pl011.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 3d294c3b52..c2ee9b0321 100644
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -221,6 +221,18 @@ static void pl011_loopback_tx(PL011State *s, uint32_t
value)
pl011_put_fifo(s, value);
}
+static void pl011_write_txdata(PL011State *s, uint8_t data)
+{
+ /* ??? Check if transmitter is enabled. */
+
+ /* XXX this blocks entire thread. Rewrite to use
+ * qemu_chr_fe_write and background I/O callbacks */
+ qemu_chr_fe_write_all(&s->chr, &data, 1);
+ pl011_loopback_tx(s, data);
+ s->int_level |= INT_TX;
+ pl011_update(s);
+}
+
static uint64_t pl011_read(void *opaque, hwaddr offset,
unsigned size)
{
@@ -388,14 +400,8 @@ static void pl011_write(void *opaque, hwaddr offset,
switch (offset >> 2) {
case 0: /* UARTDR */
- /* ??? Check if transmitter is enabled. */
ch = value;
- /* XXX this blocks entire thread. Rewrite to use
- * qemu_chr_fe_write and background I/O callbacks */
- qemu_chr_fe_write_all(&s->chr, &ch, 1);
- pl011_loopback_tx(s, ch);
- s->int_level |= INT_TX;
- pl011_update(s);
+ pl011_write_txdata(s, ch);
break;
case 1: /* UARTRSR/UARTECR */
s->rsr = 0;
--
2.41.0
- [PATCH v5 00/16] hw/char/pl011: Implement TX (async) FIFO to avoid blocking the main loop, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 01/16] tests/avocado: Add 'device:pl011' tag to tests exercising PL011 UART, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 02/16] hw/char/pl011: Remove unused 'readbuff' field, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 03/16] hw/char/pl011: Move pl011_put_fifo() earlier, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 04/16] hw/char/pl011: Move pl011_loopback_enabled|tx() around, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 05/16] hw/char/pl011: Split RX/TX path of pl011_reset_fifo(), Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 06/16] hw/char/pl011: Extract pl011_write_txdata() from pl011_write(),
Philippe Mathieu-Daudé <=
- [PATCH v5 07/16] hw/char/pl011: Extract pl011_read_rxdata() from pl011_read(), Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 08/16] hw/char/pl011: Warn when using disabled transmitter, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 09/16] tests/qtest: Update tests using PL011 UART, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 10/16] hw/char/pl011: Check if receiver is enabled, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 13/16] hw/char/pl011: Introduce pl011_xmit() as GSource, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 11/16] hw/char/pl011: Rename RX FIFO methods, Philippe Mathieu-Daudé, 2024/07/19
- [RFC PATCH v5 16/16] hw/char/pl011: Implement TX FIFO, Philippe Mathieu-Daudé, 2024/07/19