From a1b8d389359358f269511651a0fe1b493dda0ea8 Mon Sep 17 00:00:00 2001 From: Mark Cave-Ayland Date: Fri, 12 Jan 2024 12:53:57 +0000 Subject: [PATCH] esp.c: move non-DMA TI logic to separate esp_nodma_ti_dataout() function This is to allow the logic to be moved during the next commit. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Tested-by: Thomas Huth Message-Id: <20240112125420.514425-66-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 51 +++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index dd6bf6f033..97e48e9526 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -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: @@ -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: