[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/11] esp: move handle_ti_cmd() cleanup code to esp_do_dma().
From: |
Laurent Vivier |
Subject: |
[PULL 01/11] esp: move handle_ti_cmd() cleanup code to esp_do_dma(). |
Date: |
Mon, 28 Oct 2019 19:16:33 +0100 |
To prepare following patches move do_cmd and DMA special case
from handle_ti() to esp_do_dma().
This part of the code must be only executed with real DMA, not with
pseudo-DMA. And PDMA is detected in esp_do_dma(), so move this part
of the code in esp_do_dma(). We keep the code in handle_ti_cmd()
in the case no DMA is done.
Signed-off-by: Laurent Vivier <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
---
hw/scsi/esp.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 841d79b60e..09b28cba17 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -249,10 +249,19 @@ static void esp_do_dma(ESPState *s)
len = s->dma_left;
if (s->do_cmd) {
+ /*
+ * handle_ti_cmd() case: esp_do_dma() is called only from
+ * handle_ti_cmd() with do_cmd != NULL (see the assert())
+ */
trace_esp_do_dma(s->cmdlen, len);
assert (s->cmdlen <= sizeof(s->cmdbuf) &&
len <= sizeof(s->cmdbuf) - s->cmdlen);
s->dma_memory_read(s->dma_opaque, &s->cmdbuf[s->cmdlen], len);
+ trace_esp_handle_ti_cmd(s->cmdlen);
+ s->ti_size = 0;
+ s->cmdlen = 0;
+ s->do_cmd = 0;
+ do_cmd(s, s->cmdbuf);
return;
}
if (s->async_len == 0) {
@@ -373,8 +382,7 @@ static void handle_ti(ESPState *s)
s->dma_left = minlen;
s->rregs[ESP_RSTAT] &= ~STAT_TC;
esp_do_dma(s);
- }
- if (s->do_cmd) {
+ } else if (s->do_cmd) {
trace_esp_handle_ti_cmd(s->cmdlen);
s->ti_size = 0;
s->cmdlen = 0;
--
2.21.0
- [PULL 00/11] Q800 branch patches, Laurent Vivier, 2019/10/28
- [PULL 02/11] esp: move get_cmd() post-DMA code to get_cmd_cb(), Laurent Vivier, 2019/10/28
- [PULL 01/11] esp: move handle_ti_cmd() cleanup code to esp_do_dma().,
Laurent Vivier <=
- [PULL 03/11] esp: add pseudo-DMA as used by Macintosh, Laurent Vivier, 2019/10/28
- [PULL 05/11] hw/m68k: add VIA support, Laurent Vivier, 2019/10/28
- [PULL 04/11] dp8393x: manage big endian bus, Laurent Vivier, 2019/10/28
- [PULL 06/11] hw/m68k: implement ADB bus support for via, Laurent Vivier, 2019/10/28
- [PULL 08/11] hw/m68k: add Nubus macfb video card, Laurent Vivier, 2019/10/28
- [PULL 11/11] BootLinuxConsoleTest: Test the Quadra 800, Laurent Vivier, 2019/10/28