Skip to content

Commit

Permalink
esp.c: update esp_fifo_{push, pop}() to call esp_update_drq()
Browse files Browse the repository at this point in the history
This ensures that the DRQ line is always set correctly when reading/writing
single bytes to/from the FIFO.

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-16-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 743d873 commit ffa3a5f
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions hw/scsi/esp.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,11 @@ static void esp_fifo_push(ESPState *s, uint8_t val)
{
if (fifo8_num_used(&s->fifo) == s->fifo.capacity) {
trace_esp_error_fifo_overrun();
return;
} else {
fifo8_push(&s->fifo, val);
}

fifo8_push(&s->fifo, val);
esp_update_drq(s);
}

static void esp_fifo_push_buf(ESPState *s, uint8_t *buf, int len)
Expand All @@ -184,11 +185,16 @@ static void esp_fifo_push_buf(ESPState *s, uint8_t *buf, int len)

static uint8_t esp_fifo_pop(ESPState *s)
{
uint8_t val;

if (fifo8_is_empty(&s->fifo)) {
return 0;
val = 0;
} else {
val = fifo8_pop(&s->fifo);
}

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

static uint32_t esp_fifo8_pop_buf(Fifo8 *fifo, uint8_t *dest, int maxlen)
Expand Down

0 comments on commit ffa3a5f

Please sign in to comment.