aboutsummaryrefslogtreecommitdiff
path: root/hw/scsi
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2024-01-12 12:53:57 +0000
committerMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2024-02-13 19:37:28 +0000
commita1b8d389359358f269511651a0fe1b493dda0ea8 (patch)
tree1e699bf06cddc887ff5ef757d7ff7def7904fbcf /hw/scsi
parent9655f72c20385a535158540ab1daaf71b9222d68 (diff)
downloadqemu-a1b8d389359358f269511651a0fe1b493dda0ea8.zip
qemu-a1b8d389359358f269511651a0fe1b493dda0ea8.tar.gz
qemu-a1b8d389359358f269511651a0fe1b493dda0ea8.tar.bz2
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 <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>
Diffstat (limited to 'hw/scsi')
-rw-r--r--hw/scsi/esp.c51
1 files changed, 29 insertions, 22 deletions
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index dd6bf6f..97e48e9 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: