[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 14/16] esp.c: update esp_fifo_{push, pop}() to call esp_update
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 14/16] esp.c: update esp_fifo_{push, pop}() to call esp_update_drq() |
Date: |
Wed, 13 Mar 2024 08:58:08 +0000 |
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>
---
hw/scsi/esp.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 53a1c7ceaf..52a69599b2 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -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)
@@ -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_fifo_pop_buf(ESPState *s, uint8_t *dest, int maxlen)
--
2.39.2
- [PATCH v2 07/16] esp.c: change esp_fifo_pop_buf() to take ESPState, (continued)
- [PATCH v2 07/16] esp.c: change esp_fifo_pop_buf() to take ESPState, Mark Cave-Ayland, 2024/03/13
- [PATCH v2 08/16] esp.c: introduce esp_fifo_push_buf() function for pushing to the FIFO, Mark Cave-Ayland, 2024/03/13
- [PATCH v2 09/16] esp.c: don't assert() if FIFO empty when executing non-DMA SELATNS, Mark Cave-Ayland, 2024/03/13
- [PATCH v2 10/16] esp.c: don't assert() if FIFO empty when executing esp_cdb_length(), Mark Cave-Ayland, 2024/03/13
- [PATCH v2 12/16] esp.c: move esp_set_phase() and esp_get_phase() towards the beginning of the file, Mark Cave-Ayland, 2024/03/13
- [PATCH v2 11/16] esp.c: don't overflow cmdfifo if cmdfifo_cdb_offset >= ESP_CMDFIFO_SZ, Mark Cave-Ayland, 2024/03/13
- [PATCH v2 14/16] esp.c: update esp_fifo_{push, pop}() to call esp_update_drq(),
Mark Cave-Ayland <=
- [PATCH v2 15/16] esp.c: ensure esp_pdma_write() always calls esp_fifo_push(), Mark Cave-Ayland, 2024/03/13
- [PATCH v2 13/16] esp.c: introduce esp_update_drq() and update esp_fifo_{push, pop}_buf() to use it, Mark Cave-Ayland, 2024/03/13
- [PATCH v2 16/16] esp.c: remove explicit setting of DRQ within ESP state machine, Mark Cave-Ayland, 2024/03/13