mirror of https://github.com/xemu-project/xemu.git
fifo8: replace fifo8_pop_bufptr() with fifo8_peekpop_bufptr() in fifo8_pop_buf()
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>
This commit is contained in:
parent
e8b33243bb
commit
90c933255b
|
@ -116,7 +116,7 @@ uint32_t fifo8_pop_buf(Fifo8 *fifo, uint8_t *dest, uint32_t destlen)
|
||||||
}
|
}
|
||||||
|
|
||||||
len = destlen;
|
len = destlen;
|
||||||
buf = fifo8_pop_bufptr(fifo, len, &n1);
|
buf = fifo8_peekpop_bufptr(fifo, len, 0, &n1, true);
|
||||||
if (dest) {
|
if (dest) {
|
||||||
memcpy(dest, buf, n1);
|
memcpy(dest, buf, n1);
|
||||||
}
|
}
|
||||||
|
@ -125,7 +125,7 @@ uint32_t fifo8_pop_buf(Fifo8 *fifo, uint8_t *dest, uint32_t destlen)
|
||||||
len -= n1;
|
len -= n1;
|
||||||
len = MIN(len, fifo8_num_used(fifo));
|
len = MIN(len, fifo8_num_used(fifo));
|
||||||
if (len) {
|
if (len) {
|
||||||
buf = fifo8_pop_bufptr(fifo, len, &n2);
|
buf = fifo8_peekpop_bufptr(fifo, len, 0, &n2, true);
|
||||||
if (dest) {
|
if (dest) {
|
||||||
memcpy(&dest[n1], buf, n2);
|
memcpy(&dest[n1], buf, n2);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue