Message ID | 20240324191707.623175-2-mark.cave-ayland@ilande.co.uk |
---|---|
State | New |
Headers | show |
Series | esp: avoid explicit setting of DRQ within ESP state machine | expand |
On 24/3/24 20:16, Mark Cave-Ayland wrote: > Update esp_fifo_pop_buf() to be a simple wrapper onto the new esp_fifo8_pop_buf() > function. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/scsi/esp.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > +static uint32_t esp_fifo_pop_buf(Fifo8 *fifo, uint8_t *dest, int maxlen) If future cleanups, maxlen can be unsigned (size_t), anyhow: Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > +{ > + return esp_fifo8_pop_buf(fifo, dest, maxlen); > +} > + > static uint32_t esp_get_tc(ESPState *s) > { > uint32_t dmalen;
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 590ff99744..1b7b118a0b 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -125,7 +125,7 @@ static uint8_t esp_fifo_pop(Fifo8 *fifo) return fifo8_pop(fifo); } -static uint32_t esp_fifo_pop_buf(Fifo8 *fifo, uint8_t *dest, int maxlen) +static uint32_t esp_fifo8_pop_buf(Fifo8 *fifo, uint8_t *dest, int maxlen) { const uint8_t *buf; uint32_t n, n2; @@ -155,6 +155,11 @@ static uint32_t esp_fifo_pop_buf(Fifo8 *fifo, uint8_t *dest, int maxlen) return n; } +static uint32_t esp_fifo_pop_buf(Fifo8 *fifo, uint8_t *dest, int maxlen) +{ + return esp_fifo8_pop_buf(fifo, dest, maxlen); +} + static uint32_t esp_get_tc(ESPState *s) { uint32_t dmalen;
Update esp_fifo_pop_buf() to be a simple wrapper onto the new esp_fifo8_pop_buf() function. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/scsi/esp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)