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

esp.c: convert esp_do_dma() to switch statement based upon SCSI phase 

Currently only the DATA IN and DATA OUT phases are supported.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Helge Deller <deller@gmx.de>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20240112125420.514425-39-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-01-12 12:53:30 +00:00
parent 5a83e83e1c
commit 1454dc765b
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/scsi/esp.c
View File

@ -626,7 +626,6 @@ static void do_dma_pdma_cb(ESPState *s)
static void esp_do_dma(ESPState *s) static void esp_do_dma(ESPState *s)
{ {
uint32_t len, cmdlen; uint32_t len, cmdlen;
int to_device = (esp_get_phase(s) == STAT_DO);
uint8_t buf[ESP_CMDFIFO_SZ]; uint8_t buf[ESP_CMDFIFO_SZ];
int n; int n;
@ -681,17 +680,19 @@ static void esp_do_dma(ESPState *s)
} }
return; return;
} }
if (!s->current_req) {
return; switch (esp_get_phase(s)) {
} case STAT_DO:
if (s->async_len == 0 && esp_get_tc(s) && s->ti_size) { if (!s->current_req) {
/* Defer until data is available. */ return;
return; }
} if (s->async_len == 0 && esp_get_tc(s) && s->ti_size) {
if (len > s->async_len) { /* Defer until data is available. */
len = s->async_len; return;
} }
if (to_device) { if (len > s->async_len) {
len = s->async_len;
}
if (s->dma_memory_read) { if (s->dma_memory_read) {
s->dma_memory_read(s->dma_opaque, s->async_buf, len); s->dma_memory_read(s->dma_opaque, s->async_buf, len);
@ -727,7 +728,19 @@ static void esp_do_dma(ESPState *s)
esp_dma_ti_check(s); esp_dma_ti_check(s);
} }
} else { break;
case STAT_DI:
if (!s->current_req) {
return;
}
if (s->async_len == 0 && esp_get_tc(s) && s->ti_size) {
/* Defer until data is available. */
return;
}
if (len > s->async_len) {
len = s->async_len;
}
if (s->dma_memory_write) { if (s->dma_memory_write) {
s->dma_memory_write(s->dma_opaque, s->async_buf, len); s->dma_memory_write(s->dma_opaque, s->async_buf, len);
@ -762,6 +775,7 @@ static void esp_do_dma(ESPState *s)
esp_dma_ti_check(s); esp_dma_ti_check(s);
} }
break;
} }
} }