Skip to content

Commit

Permalink
esp.c: change esp_fifo_pop() to take ESPState
Browse files Browse the repository at this point in the history
Now that all users of esp_fifo_pop() operate on the main FIFO there is no need
to pass the FIFO explicitly.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20240324191707.623175-7-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  • Loading branch information
mcayland committed Apr 4, 2024
1 parent 0e7dbe2 commit 61fa150
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions hw/scsi/esp.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ static void esp_fifo_push(ESPState *s, uint8_t val)
fifo8_push(&s->fifo, val);
}

static uint8_t esp_fifo_pop(Fifo8 *fifo)
static uint8_t esp_fifo_pop(ESPState *s)
{
if (fifo8_is_empty(fifo)) {
if (fifo8_is_empty(&s->fifo)) {
return 0;
}

return fifo8_pop(fifo);
return fifo8_pop(&s->fifo);
}

static uint32_t esp_fifo8_pop_buf(Fifo8 *fifo, uint8_t *dest, int maxlen)
Expand Down Expand Up @@ -217,7 +217,7 @@ static uint8_t esp_pdma_read(ESPState *s)
{
uint8_t val;

val = esp_fifo_pop(&s->fifo);
val = esp_fifo_pop(s);
return val;
}

Expand Down Expand Up @@ -1184,7 +1184,7 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr)

switch (saddr) {
case ESP_FIFO:
s->rregs[ESP_FIFO] = esp_fifo_pop(&s->fifo);
s->rregs[ESP_FIFO] = esp_fifo_pop(s);
val = s->rregs[ESP_FIFO];
break;
case ESP_RINTR:
Expand Down

0 comments on commit 61fa150

Please sign in to comment.