ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

esp: move PDMA length adjustments into esp_pdma_read()/esp_pdma_write() 

Here the updates to async_len and ti_size are moved into the corresponding
esp_pdma_read()/esp_pdma_write() function to eliminate the reference to
pdma_cur in do_dma_pdma_cb().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210304221103.6369-23-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2021-03-04 22:10:43 +00:00
parent 2c573cfe19
commit 93efe2e624
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/scsi/esp.c
View File

@ -153,12 +153,18 @@ static uint8_t esp_pdma_read(ESPState *s)
s->pdma_cur++; s->pdma_cur++;
break; break;
case ASYNC: case ASYNC:
val = s->async_buf[s->pdma_cur++]; val = s->async_buf[0];
if (s->async_len > 0) {
s->async_len--;
s->async_buf++;
}
s->pdma_cur++;
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
} }
s->ti_size--;
s->pdma_len--; s->pdma_len--;
dmalen--; dmalen--;
esp_set_tc(s, dmalen); esp_set_tc(s, dmalen);
@ -183,12 +189,18 @@ static void esp_pdma_write(ESPState *s, uint8_t val)
s->pdma_cur++; s->pdma_cur++;
break; break;
case ASYNC: case ASYNC:
s->async_buf[s->pdma_cur++] = val; s->async_buf[0] = val;
if (s->async_len > 0) {
s->async_len--;
s->async_buf++;
}
s->pdma_cur++;
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
} }
s->ti_size++;
s->pdma_len--; s->pdma_len--;
dmalen--; dmalen--;
esp_set_tc(s, dmalen); esp_set_tc(s, dmalen);
@ -427,7 +439,6 @@ 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->rregs[ESP_RSTAT] & 7) == STAT_DO); int to_device = ((s->rregs[ESP_RSTAT] & 7) == STAT_DO);
int len = s->pdma_cur;
if (s->do_cmd) { if (s->do_cmd) {
s->ti_size = 0; s->ti_size = 0;
@ -436,13 +447,6 @@ static void do_dma_pdma_cb(ESPState *s)
do_cmd(s); do_cmd(s);
return; return;
} }
s->async_buf += len;
s->async_len -= len;
if (to_device) {
s->ti_size += len;
} else {
s->ti_size -= len;
}
if (s->async_len == 0) { if (s->async_len == 0) {
scsi_req_continue(s->current_req); scsi_req_continue(s->current_req);
/* /*