SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

esp.c: convert esp_do_dma() do_cmd path to check for SCSI phase instead

Browse Source 
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>
Tested-by: Helge Deller <deller@gmx.de>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20240112125420.514425-42-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:33 +00:00
parent 9d1aa52b76
commit ad2725af57
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/scsi/esp.c
View File

@ -635,11 +635,10 @@ static void esp_do_dma(ESPState *s)
int n; int n;
len = esp_get_tc(s); len = esp_get_tc(s);
if (s->do_cmd) {
/* switch (esp_get_phase(s)) {
* handle_ti_cmd() case: esp_do_dma() is called only from case STAT_MO:
* handle_ti_cmd() with do_cmd != NULL (see the assert()) case STAT_CD:
*/
cmdlen = fifo8_num_used(&s->cmdfifo); cmdlen = fifo8_num_used(&s->cmdfifo);
trace_esp_do_dma(cmdlen, len); trace_esp_do_dma(cmdlen, len);
if (s->dma_memory_read) { if (s->dma_memory_read) {
@ -683,10 +682,8 @@ static void esp_do_dma(ESPState *s)
s->rregs[ESP_RINTR] |= INTR_BS; s->rregs[ESP_RINTR] |= INTR_BS;
esp_raise_irq(s); esp_raise_irq(s);
} }
return; break;
}
switch (esp_get_phase(s)) {
case STAT_DO: case STAT_DO:
if (!s->current_req) { if (!s->current_req) {
return; return;