ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

esp.c: change esp_fifo_push() to take ESPState 

Now that all users of esp_fifo_push() 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-6-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2024-03-24 19:16:54 +00:00
parent 1828000b48
commit 0e7dbe29c2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/scsi/esp.c
View File

@ -106,14 +106,14 @@ void esp_request_cancelled(SCSIRequest *req)
} }
} }
static void esp_fifo_push(Fifo8 *fifo, uint8_t val) static void esp_fifo_push(ESPState *s, uint8_t val)
{ {
if (fifo8_num_used(fifo) == fifo->capacity) { if (fifo8_num_used(&s->fifo) == s->fifo.capacity) {
trace_esp_error_fifo_overrun(); trace_esp_error_fifo_overrun();
return; return;
} }
fifo8_push(fifo, val); fifo8_push(&s->fifo, val);
} }
static uint8_t esp_fifo_pop(Fifo8 *fifo) static uint8_t esp_fifo_pop(Fifo8 *fifo)
@ -229,7 +229,7 @@ static void esp_pdma_write(ESPState *s, uint8_t val)
return; return;
} }
esp_fifo_push(&s->fifo, val); esp_fifo_push(s, val);
dmalen--; dmalen--;
esp_set_tc(s, dmalen); esp_set_tc(s, dmalen);
@ -1240,7 +1240,7 @@ void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
break; break;
case ESP_FIFO: case ESP_FIFO:
if (!fifo8_is_full(&s->fifo)) { if (!fifo8_is_full(&s->fifo)) {
esp_fifo_push(&s->fifo, val); esp_fifo_push(s, val);
} }
esp_do_nodma(s); esp_do_nodma(s);
break; break;