mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp: determine transfer direction directly from SCSI phase

Browse Source 
The transfer direction is currently determined by checking the sign of ti_size
but as this series progresses ti_size can be zero at the end of the transfer.

Use the SCSI phase to determine the transfer direction as used in other SCSI
controller implementations.

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-9-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2021-03-04 22:10:29 +00:00
parent 960ebfd94e
commit 4ca2ba6fb0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/scsi/esp.c
View File

@ -356,7 +356,7 @@ static void esp_dma_done(ESPState *s)
static void do_dma_pdma_cb(ESPState *s) static void do_dma_pdma_cb(ESPState *s)
{ {
int to_device = (s->ti_size < 0); int to_device = ((s->rregs[ESP_RSTAT] & 7) == STAT_DO);
int len = s->pdma_cur - s->pdma_start; int len = s->pdma_cur - s->pdma_start;
if (s->do_cmd) { if (s->do_cmd) {
s->ti_size = 0; s->ti_size = 0;
@ -392,7 +392,7 @@ static void do_dma_pdma_cb(ESPState *s)
static void esp_do_dma(ESPState *s) static void esp_do_dma(ESPState *s)
{ {
uint32_t len; uint32_t len;
int to_device; int to_device = ((s->rregs[ESP_RSTAT] & 7) == STAT_DO);
len = s->dma_left; len = s->dma_left;
if (s->do_cmd) { if (s->do_cmd) {
@ -425,7 +425,6 @@ static void esp_do_dma(ESPState *s)
if (len > s->async_len) { if (len > s->async_len) {
len = s->async_len; len = s->async_len;
} }
to_device = (s->ti_size < 0);
if (to_device) { if (to_device) {
if (s->dma_memory_read) { if (s->dma_memory_read) {
s->dma_memory_read(s->dma_opaque, s->async_buf, len); s->dma_memory_read(s->dma_opaque, s->async_buf, len);