[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/9] fifo8: honour do_pop argument in fifo8_peekpop_buf()
|
From: |
Mark Cave-Ayland |
|
Subject: |
[PATCH 6/9] fifo8: honour do_pop argument in fifo8_peekpop_buf() |
|
Date: |
Wed, 28 Aug 2024 13:22:55 +0100 |
Pass the do_pop value from fifo8_peekpop_buf() to fifo8_peekpop_bufptr() to
allow peeks to the FIFO buffer, including adjusting the skip parameter to
handle the case where the internal FIFO buffer wraps around.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
util/fifo8.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/fifo8.c b/util/fifo8.c
index 5453cbc1b0..1031ffbe7e 100644
--- a/util/fifo8.c
+++ b/util/fifo8.c
@@ -117,7 +117,7 @@ static uint32_t fifo8_peekpop_buf(Fifo8 *fifo, uint8_t
*dest, uint32_t destlen,
}
len = destlen;
- buf = fifo8_peekpop_bufptr(fifo, len, 0, &n1, true);
+ buf = fifo8_peekpop_bufptr(fifo, len, 0, &n1, do_pop);
if (dest) {
memcpy(dest, buf, n1);
}
@@ -126,7 +126,7 @@ static uint32_t fifo8_peekpop_buf(Fifo8 *fifo, uint8_t
*dest, uint32_t destlen,
len -= n1;
len = MIN(len, fifo8_num_used(fifo));
if (len) {
- buf = fifo8_peekpop_bufptr(fifo, len, 0, &n2, true);
+ buf = fifo8_peekpop_bufptr(fifo, len, do_pop ? 0 : n1, &n2, do_pop);
if (dest) {
memcpy(&dest[n1], buf, n2);
}
--
2.39.2
- Re: [PATCH 2/9] fifo8: introduce head variable for fifo8_peekpop_bufptr(), (continued)
- [PATCH 3/9] fifo8: add skip parameter to fifo8_peekpop_bufptr(), Mark Cave-Ayland, 2024/08/28
- [PATCH 4/9] fifo8: replace fifo8_pop_bufptr() with fifo8_peekpop_bufptr() in fifo8_pop_buf(), Mark Cave-Ayland, 2024/08/28
- [PATCH 5/9] fifo8: rename fifo8_pop_buf() to fifo8_peekpop_buf(), Mark Cave-Ayland, 2024/08/28
- [PATCH 6/9] fifo8: honour do_pop argument in fifo8_peekpop_buf(),
Mark Cave-Ayland <=
- [PATCH 7/9] fifo8: add fifo8_peek_buf() function, Mark Cave-Ayland, 2024/08/28
- [PATCH 8/9] fifo8: introduce fifo8_peek() function, Mark Cave-Ayland, 2024/08/28
- [PATCH 9/9] tests/unit: add test-fifo unit test, Mark Cave-Ayland, 2024/08/28