Skip to content

Commit

Permalink
esp.c: move non-DMA TI logic to separate esp_nodma_ti_dataout() function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mcayland committed Feb 13, 2024
1 parent 9655f72 commit a1b8d38
Showing 1 changed file with 29 additions and 22 deletions.
51 changes: 29 additions & 22 deletions hw/scsi/esp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
uint8_t buf[ESP_FIFO_SZ];
uint32_t cmdlen;
int len, n;
int n;

switch (esp_get_phase(s)) {
case STAT_MO:
Expand Down Expand Up @@ -743,27 +770,7 @@ static void esp_do_nodma(ESPState *s)
break;

case STAT_DO:
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);
esp_nodma_ti_dataout(s);
break;

case STAT_DI:
Expand Down

0 comments on commit a1b8d38

Please sign in to comment.