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

esp.c: move non-DMA TI logic to separate esp_nodma_ti_dataout() function

Browse Source 
This is to allow the logic to be moved during the next commit.

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-66-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:57 +00:00
parent 9655f72c20
commit a1b8d38935
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
hw/scsi/esp.c
View File

@ -697,11 +697,38 @@ static void esp_do_dma(ESPState *s)
} }
} }
static void esp_nodma_ti_dataout(ESPState *s)
{
int len;
if (!s->current_req) {
return;
}
if (s->async_len == 0) {
/* Defer until data is available. */
return;
}
len = MIN(s->async_len, ESP_FIFO_SZ);
len = MIN(len, fifo8_num_used(&s->fifo));
esp_fifo_pop_buf(&s->fifo, s->async_buf, len);
s->async_buf += len;
s->async_len -= len;
s->ti_size += len;
if (s->async_len == 0) {
scsi_req_continue(s->current_req);
return;
}
s->rregs[ESP_RINTR] |= INTR_BS;
esp_raise_irq(s);
}
static void esp_do_nodma(ESPState *s) static void esp_do_nodma(ESPState *s)
{ {
uint8_t buf[ESP_FIFO_SZ]; uint8_t buf[ESP_FIFO_SZ];
uint32_t cmdlen; uint32_t cmdlen;
int len, n; int n;
switch (esp_get_phase(s)) { switch (esp_get_phase(s)) {
case STAT_MO: case STAT_MO:
@ -743,27 +770,7 @@ static void esp_do_nodma(ESPState *s)
break; break;
case STAT_DO: case STAT_DO:
if (!s->current_req) { esp_nodma_ti_dataout(s);
return;
}
if (s->async_len == 0) {
/* Defer until data is available. */
return;
}
len = MIN(s->async_len, ESP_FIFO_SZ);
len = MIN(len, fifo8_num_used(&s->fifo));
esp_fifo_pop_buf(&s->fifo, s->async_buf, len);
s->async_buf += len;
s->async_len -= len;
s->ti_size += len;
if (s->async_len == 0) {
scsi_req_continue(s->current_req);
return;
}
s->rregs[ESP_RINTR] |= INTR_BS;
esp_raise_irq(s);
break; break;
case STAT_DI: case STAT_DI: