[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/11] esp: move get_cmd() post-DMA code to get_cmd_cb()
From: |
Laurent Vivier |
Subject: |
[PULL 02/11] esp: move get_cmd() post-DMA code to get_cmd_cb() |
Date: |
Mon, 28 Oct 2019 19:16:34 +0100 |
This will be needed to implement pseudo-DMA
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
---
hw/scsi/esp.c | 46 +++++++++++++++++++++++++++++-----------------
1 file changed, 29 insertions(+), 17 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 09b28cba17..0230ede21d 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -84,6 +84,34 @@ void esp_request_cancelled(SCSIRequest *req)
}
}
+static int get_cmd_cb(ESPState *s)
+{
+ int target;
+
+ target = s->wregs[ESP_WBUSID] & BUSID_DID;
+
+ s->ti_size = 0;
+ s->ti_rptr = 0;
+ s->ti_wptr = 0;
+
+ if (s->current_req) {
+ /* Started a new command before the old one finished. Cancel it. */
+ scsi_req_cancel(s->current_req);
+ s->async_len = 0;
+ }
+
+ s->current_dev = scsi_device_find(&s->bus, 0, target, 0);
+ if (!s->current_dev) {
+ /* No such drive */
+ s->rregs[ESP_RSTAT] = 0;
+ s->rregs[ESP_RINTR] = INTR_DC;
+ s->rregs[ESP_RSEQ] = SEQ_0;
+ esp_raise_irq(s);
+ return -1;
+ }
+ return 0;
+}
+
static uint32_t get_cmd(ESPState *s, uint8_t *buf, uint8_t buflen)
{
uint32_t dmalen;
@@ -108,23 +136,7 @@ static uint32_t get_cmd(ESPState *s, uint8_t *buf, uint8_t
buflen)
}
trace_esp_get_cmd(dmalen, target);
- s->ti_size = 0;
- s->ti_rptr = 0;
- s->ti_wptr = 0;
-
- if (s->current_req) {
- /* Started a new command before the old one finished. Cancel it. */
- scsi_req_cancel(s->current_req);
- s->async_len = 0;
- }
-
- s->current_dev = scsi_device_find(&s->bus, 0, target, 0);
- if (!s->current_dev) {
- // No such drive
- s->rregs[ESP_RSTAT] = 0;
- s->rregs[ESP_RINTR] = INTR_DC;
- s->rregs[ESP_RSEQ] = SEQ_0;
- esp_raise_irq(s);
+ if (get_cmd_cb(s) < 0) {
return 0;
}
return dmalen;
--
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 <=
- [PULL 01/11] esp: move handle_ti_cmd() cleanup code to esp_do_dma()., Laurent Vivier, 2019/10/28
- [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