From 90c933255b1f1ad25b8e591ce88404d89819878c Mon Sep 17 00:00:00 2001
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Date: Wed, 28 Aug 2024 13:22:53 +0100
Subject: [PATCH] fifo8: replace fifo8_pop_bufptr() with fifo8_peekpop_bufptr()
in fifo8_pop_buf()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The upcoming peek functionality will require passing a non-zero
value to fifo8_peekpop_bufptr().
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-5-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
util/fifo8.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/fifo8.c b/util/fifo8.c
index 62d6430b05..efe0117b1f 100644
--- a/util/fifo8.c
+++ b/util/fifo8.c
@@ -116,7 +116,7 @@ uint32_t fifo8_pop_buf(Fifo8 *fifo, uint8_t *dest, uint32_t destlen)
}
len = destlen;
- buf = fifo8_pop_bufptr(fifo, len, &n1);
+ buf = fifo8_peekpop_bufptr(fifo, len, 0, &n1, true);
if (dest) {
memcpy(dest, buf, n1);
}
@@ -125,7 +125,7 @@ uint32_t fifo8_pop_buf(Fifo8 *fifo, uint8_t *dest, uint32_t destlen)
len -= n1;
len = MIN(len, fifo8_num_used(fifo));
if (len) {
- buf = fifo8_pop_bufptr(fifo, len, &n2);
+ buf = fifo8_peekpop_bufptr(fifo, len, 0, &n2, true);
if (dest) {
memcpy(&dest[n1], buf, n2);
}