| Message ID | 20210209193018.31339-21-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
| Series | esp: consolidate PDMA transfer buffers and other fixes | expand |
On 2/9/21 8:29 PM, Mark Cave-Ayland wrote: > Now that all SCSI commands are accumulated in cmdbuf, remove the buf and buflen > parameters from get_cmd() since these always reference cmdbuf and ESP_CMDBUF_SZ > respectively. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/scsi/esp.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Le 09/02/2021 à 20:29, Mark Cave-Ayland a écrit : > Now that all SCSI commands are accumulated in cmdbuf, remove the buf and buflen > parameters from get_cmd() since these always reference cmdbuf and ESP_CMDBUF_SZ > respectively. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/scsi/esp.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c > index bb467fbcdf..7055520a26 100644 > --- a/hw/scsi/esp.c > +++ b/hw/scsi/esp.c > @@ -236,15 +236,16 @@ static int get_cmd_cb(ESPState *s) > return 0; > } > > -static uint32_t get_cmd(ESPState *s, uint8_t *buf, uint8_t buflen) > +static uint32_t get_cmd(ESPState *s) > { > + uint8_t *buf = s->cmdbuf; > uint32_t dmalen; > int target; > > target = s->wregs[ESP_WBUSID] & BUSID_DID; > if (s->dma) { > dmalen = esp_get_tc(s); > - if (dmalen > buflen) { > + if (dmalen > ESP_CMDBUF_SZ) { > return 0; > } > if (s->dma_memory_read) { > @@ -323,7 +324,7 @@ static void handle_satn(ESPState *s) > return; > } > s->pdma_cb = satn_pdma_cb; > - s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf)); > + s->cmdlen = get_cmd(s); > if (s->cmdlen) { > do_cmd(s); > } else { > @@ -349,7 +350,7 @@ static void handle_s_without_atn(ESPState *s) > return; > } > s->pdma_cb = s_without_satn_pdma_cb; > - s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf)); > + s->cmdlen = get_cmd(s); > if (s->cmdlen) { > do_busid_cmd(s, s->cmdbuf, 0); > } else { > @@ -380,7 +381,7 @@ static void handle_satn_stop(ESPState *s) > return; > } > s->pdma_cb = satn_stop_pdma_cb; > - s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf)); > + s->cmdlen = get_cmd(s); > if (s->cmdlen) { > trace_esp_handle_satn_stop(s->cmdlen); > s->do_cmd = 1; > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index bb467fbcdf..7055520a26 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -236,15 +236,16 @@ static int get_cmd_cb(ESPState *s) return 0; } -static uint32_t get_cmd(ESPState *s, uint8_t *buf, uint8_t buflen) +static uint32_t get_cmd(ESPState *s) { + uint8_t *buf = s->cmdbuf; uint32_t dmalen; int target; target = s->wregs[ESP_WBUSID] & BUSID_DID; if (s->dma) { dmalen = esp_get_tc(s); - if (dmalen > buflen) { + if (dmalen > ESP_CMDBUF_SZ) { return 0; } if (s->dma_memory_read) { @@ -323,7 +324,7 @@ static void handle_satn(ESPState *s) return; } s->pdma_cb = satn_pdma_cb; - s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf)); + s->cmdlen = get_cmd(s); if (s->cmdlen) { do_cmd(s); } else { @@ -349,7 +350,7 @@ static void handle_s_without_atn(ESPState *s) return; } s->pdma_cb = s_without_satn_pdma_cb; - s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf)); + s->cmdlen = get_cmd(s); if (s->cmdlen) { do_busid_cmd(s, s->cmdbuf, 0); } else { @@ -380,7 +381,7 @@ static void handle_satn_stop(ESPState *s) return; } s->pdma_cb = satn_stop_pdma_cb; - s->cmdlen = get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf)); + s->cmdlen = get_cmd(s); if (s->cmdlen) { trace_esp_handle_satn_stop(s->cmdlen); s->do_cmd = 1;
Now that all SCSI commands are accumulated in cmdbuf, remove the buf and buflen parameters from get_cmd() since these always reference cmdbuf and ESP_CMDBUF_SZ respectively. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/scsi/esp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)