@@ -546,7 +546,9 @@ static void do_dma_pdma_cb(ESPState *s)
int len;
uint32_t n;
- if (s->do_cmd) {
+ switch (esp_get_phase(s)) {
+ case STAT_MO:
+ case STAT_CD:
/* Copy FIFO into cmdfifo */
n = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
n = MIN(fifo8_num_free(&s->cmdfifo), n);
@@ -578,10 +580,8 @@ static void do_dma_pdma_cb(ESPState *s)
s->rregs[ESP_RINTR] |= INTR_BS;
esp_raise_irq(s);
}
- return;
- }
+ break;
- switch (esp_get_phase(s)) {
case STAT_DO:
if (!s->current_req) {
return;
Currently do_cmd is used to determine whether MESSAGE OUT and COMMAND phase data is being accumulated in cmdfifo. Update esp_do_dma() to check directly for these two SCSI phases instead. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/scsi/esp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)