From: Mark Cave-Ayland Date: Fri, 12 Jan 2024 12:53:24 +0000 (+0000) Subject: esp.c: copy PDMA logic for transfers to device from do_dma_pdma_cb() to esp_do_dma() X-Git-Tag: v9.0.0-rc0~66^2~56 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19e9afb1a3d905f9892bb696e156f4524f2cbbf6;p=thirdparty%2Fqemu.git esp.c: copy PDMA logic for transfers to device from do_dma_pdma_cb() to esp_do_dma() This is so that PDMA transfers can be performend by esp_do_dma() as well as do_dma_pdma_cb(). Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Tested-by: Thomas Huth Message-Id: <20240112125420.514425-33-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 14c6d052530..65b4baab838 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -640,6 +640,7 @@ static void esp_do_dma(ESPState *s) uint32_t len, cmdlen; int to_device = ((s->rregs[ESP_RSTAT] & 7) == STAT_DO); uint8_t buf[ESP_CMDFIFO_SZ]; + int n; len = esp_get_tc(s); if (s->do_cmd) { @@ -710,6 +711,14 @@ static void esp_do_dma(ESPState *s) esp_dma_ti_check(s); } else { + /* Copy FIFO data to device */ + len = MIN(s->async_len, ESP_FIFO_SZ); + len = MIN(len, fifo8_num_used(&s->fifo)); + n = esp_fifo_pop_buf(&s->fifo, s->async_buf, len); + s->async_buf += n; + s->async_len -= n; + s->ti_size += n; + esp_set_pdma_cb(s, DO_DMA_PDMA_CB); esp_raise_drq(s);