Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-15 13:47:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

esp: remove buf parameter from do_cmd()

Browse Source 
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>
This commit is contained in:
Mark Cave-Ayland 2021-03-04 22:10:40 +00:00
parent bb0bc7bbc9
commit c959f21843
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/scsi/esp.c
View File

@ -297,8 +297,9 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, uint8_t busid)
esp_raise_irq(s); 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]; uint8_t busid = buf[0];
do_busid_cmd(s, &buf[1], busid); do_busid_cmd(s, &buf[1], busid);
@ -311,7 +312,7 @@ static void satn_pdma_cb(ESPState *s)
} }
s->do_cmd = 0; s->do_cmd = 0;
if (s->cmdlen) { 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->pdma_cb = satn_pdma_cb;
s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf)); s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf));
if (s->cmdlen) { if (s->cmdlen) {
do_cmd(s, s->cmdbuf); do_cmd(s);
} else { } else {
s->do_cmd = 1; s->do_cmd = 1;
} }
@ -445,7 +446,7 @@ static void do_dma_pdma_cb(ESPState *s)
s->ti_size = 0; s->ti_size = 0;
s->cmdlen = 0; s->cmdlen = 0;
s->do_cmd = 0; s->do_cmd = 0;
do_cmd(s, s->cmdbuf); do_cmd(s);
return; return;
} }
s->async_buf += len; s->async_buf += len;
@ -497,7 +498,7 @@ static void esp_do_dma(ESPState *s)
s->ti_size = 0; s->ti_size = 0;
s->cmdlen = 0; s->cmdlen = 0;
s->do_cmd = 0; s->do_cmd = 0;
do_cmd(s, s->cmdbuf); do_cmd(s);
return; return;
} }
if (s->async_len == 0) { if (s->async_len == 0) {
@ -627,7 +628,7 @@ static void handle_ti(ESPState *s)
s->ti_size = 0; s->ti_size = 0;
s->cmdlen = 0; s->cmdlen = 0;
s->do_cmd = 0; s->do_cmd = 0;
do_cmd(s, s->cmdbuf); do_cmd(s);
} }
} }