summaryrefslogtreecommitdiffstats
path: root/hw/scsi/esp.c
diff options
context:
space:
mode:
authorMark Cave-Ayland2021-03-04 23:10:40 +0100
committerMark Cave-Ayland2021-03-07 11:39:05 +0100
commitc959f218437c8828490267d42f42f9aa851dd8ea (patch)
treec614743d468034109d9f94085b44934d59cbf334 /hw/scsi/esp.c
parentesp: accumulate SCSI commands for PDMA transfers in cmdbuf instead of pdma_buf (diff)
downloadqemu-c959f218437c8828490267d42f42f9aa851dd8ea.tar.gz
qemu-c959f218437c8828490267d42f42f9aa851dd8ea.tar.xz
qemu-c959f218437c8828490267d42f42f9aa851dd8ea.zip
esp: remove buf parameter from do_cmd()
Now that all SCSI commands are accumulated in cmdbuf, remove the buf parameter from do_cmd() since this always points to cmdbuf. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Message-Id: <20210304221103.6369-20-mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'hw/scsi/esp.c')
-rw-r--r--hw/scsi/esp.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 66caa95815..8ebf5e8d4b 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -297,8 +297,9 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, uint8_t busid)
esp_raise_irq(s);
}
-static void do_cmd(ESPState *s, uint8_t *buf)
+static void do_cmd(ESPState *s)
{
+ uint8_t *buf = s->cmdbuf;
uint8_t busid = buf[0];
do_busid_cmd(s, &buf[1], busid);
@@ -311,7 +312,7 @@ static void satn_pdma_cb(ESPState *s)
}
s->do_cmd = 0;
if (s->cmdlen) {
- do_cmd(s, s->cmdbuf);
+ do_cmd(s);
}
}
@@ -324,7 +325,7 @@ static void handle_satn(ESPState *s)
s->pdma_cb = satn_pdma_cb;
s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf));
if (s->cmdlen) {
- do_cmd(s, s->cmdbuf);
+ do_cmd(s);
} else {
s->do_cmd = 1;
}
@@ -445,7 +446,7 @@ static void do_dma_pdma_cb(ESPState *s)
s->ti_size = 0;
s->cmdlen = 0;
s->do_cmd = 0;
- do_cmd(s, s->cmdbuf);
+ do_cmd(s);
return;
}
s->async_buf += len;
@@ -497,7 +498,7 @@ static void esp_do_dma(ESPState *s)
s->ti_size = 0;
s->cmdlen = 0;
s->do_cmd = 0;
- do_cmd(s, s->cmdbuf);
+ do_cmd(s);
return;
}
if (s->async_len == 0) {
@@ -627,7 +628,7 @@ static void handle_ti(ESPState *s)
s->ti_size = 0;
s->cmdlen = 0;
s->do_cmd = 0;
- do_cmd(s, s->cmdbuf);
+ do_cmd(s);
}
}