[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 38/56] fifo8: add fifo8_peek_buf() function
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 38/56] fifo8: add fifo8_peek_buf() function |
Date: |
Wed, 11 Sep 2024 14:14:03 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This is a wrapper function around fifo8_peekpop_buf() that allows the
caller to peek into the FIFO, including handling the case where there
is a wraparound of the internal FIFO buffer.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Octavian Purdila <tavip@google.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240828122258.928947-8-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/qemu/fifo8.h | 14 ++++++++++++++
util/fifo8.c | 5 +++++
2 files changed, 19 insertions(+)
diff --git a/include/qemu/fifo8.h b/include/qemu/fifo8.h
index d1d06754d8..d09984b146 100644
--- a/include/qemu/fifo8.h
+++ b/include/qemu/fifo8.h
@@ -76,6 +76,20 @@ uint8_t fifo8_pop(Fifo8 *fifo);
*/
uint32_t fifo8_pop_buf(Fifo8 *fifo, uint8_t *dest, uint32_t destlen);
+/**
+ * fifo8_peek_buf:
+ * @fifo: FIFO to read from
+ * @dest: the buffer to write the data into (can be NULL)
+ * @destlen: size of @dest and maximum number of bytes to peek
+ *
+ * Peek a number of elements from the FIFO up to a maximum of @destlen.
+ * The peeked data is copied into the @dest buffer.
+ * Care is taken when the data wraps around in the ring buffer.
+ *
+ * Returns: number of bytes peeked.
+ */
+uint32_t fifo8_peek_buf(Fifo8 *fifo, uint8_t *dest, uint32_t destlen);
+
/**
* fifo8_pop_bufptr:
* @fifo: FIFO to pop from
diff --git a/util/fifo8.c b/util/fifo8.c
index 1031ffbe7e..a8f5cea158 100644
--- a/util/fifo8.c
+++ b/util/fifo8.c
@@ -140,6 +140,11 @@ uint32_t fifo8_pop_buf(Fifo8 *fifo, uint8_t *dest,
uint32_t destlen)
return fifo8_peekpop_buf(fifo, dest, destlen, true);
}
+uint32_t fifo8_peek_buf(Fifo8 *fifo, uint8_t *dest, uint32_t destlen)
+{
+ return fifo8_peekpop_buf(fifo, dest, destlen, false);
+}
+
void fifo8_drop(Fifo8 *fifo, uint32_t len)
{
len -= fifo8_pop_buf(fifo, NULL, len);
--
2.45.2
- [PULL 30/56] hw/char/pl011: Rename RX FIFO methods, (continued)
- [PULL 30/56] hw/char/pl011: Rename RX FIFO methods, Philippe Mathieu-Daudé, 2024/09/11
- [PULL 32/56] fifo8: rename fifo8_peekpop_buf() to fifo8_peekpop_bufptr(), Philippe Mathieu-Daudé, 2024/09/11
- [PULL 20/56] seccomp: Remove check for CRIS host, Philippe Mathieu-Daudé, 2024/09/11
- [PULL 29/56] hw/char/pl011: Warn when using disabled transmitter, Philippe Mathieu-Daudé, 2024/09/11
- [PULL 34/56] fifo8: add skip parameter to fifo8_peekpop_bufptr(), Philippe Mathieu-Daudé, 2024/09/11
- [PULL 23/56] hw/char/pl011: Remove unused 'readbuff' field, Philippe Mathieu-Daudé, 2024/09/11
- [PULL 26/56] hw/char/pl011: Split RX/TX path of pl011_reset_fifo(), Philippe Mathieu-Daudé, 2024/09/11
- [PULL 27/56] hw/char/pl011: Extract pl011_write_txdata() from pl011_write(), Philippe Mathieu-Daudé, 2024/09/11
- [PULL 33/56] fifo8: introduce head variable for fifo8_peekpop_bufptr(), Philippe Mathieu-Daudé, 2024/09/11
- [PULL 28/56] hw/char/pl011: Extract pl011_read_rxdata() from pl011_read(), Philippe Mathieu-Daudé, 2024/09/11
- [PULL 38/56] fifo8: add fifo8_peek_buf() function,
Philippe Mathieu-Daudé <=
- [PULL 36/56] fifo8: rename fifo8_pop_buf() to fifo8_peekpop_buf(), Philippe Mathieu-Daudé, 2024/09/11
- [PULL 42/56] tests/unit: Expand test_fifo8_peek_buf_wrap() coverage, Philippe Mathieu-Daudé, 2024/09/11
- [PULL 37/56] fifo8: honour do_pop argument in fifo8_peekpop_buf(), Philippe Mathieu-Daudé, 2024/09/11
- [PULL 39/56] fifo8: introduce fifo8_peek() function, Philippe Mathieu-Daudé, 2024/09/11
- [PULL 43/56] tests/unit: Comment FIFO8 tests, Philippe Mathieu-Daudé, 2024/09/11
- [PULL 44/56] hw/char/escc: convert Sun mouse to use QemuInputHandler, Philippe Mathieu-Daudé, 2024/09/11
- [PULL 35/56] fifo8: replace fifo8_pop_bufptr() with fifo8_peekpop_bufptr() in fifo8_pop_buf(), Philippe Mathieu-Daudé, 2024/09/11
- [PULL 40/56] tests/unit: add test-fifo unit test, Philippe Mathieu-Daudé, 2024/09/11
- [PULL 41/56] tests/unit: Strengthen FIFO8 tests, Philippe Mathieu-Daudé, 2024/09/11
- [PULL 45/56] hw/input/adb-mouse: convert to use QemuInputHandler, Philippe Mathieu-Daudé, 2024/09/11