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

PL181 write fix 

The PL181 data transfer loop incorrectly terminates after the last FIFO
word is popped, discarding the last 3 bytes of data on a write transfer.

Signed-off-by: Paul Brook <paul@codesourcery.com>
This commit is contained in:
Paul Brook 2010-02-22 15:33:59 +00:00
parent 238431a9d8
commit bc3b26f535
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/pl181.c
View File

@ -184,37 +184,39 @@ static void pl181_fifo_run(pl181_state *s)
uint32_t bits; uint32_t bits;
uint32_t value; uint32_t value;
int n; int n;
int limit;
int is_read; int is_read;
is_read = (s->datactrl & PL181_DATA_DIRECTION) != 0; is_read = (s->datactrl & PL181_DATA_DIRECTION) != 0;
if (s->datacnt != 0 && (!is_read || sd_data_ready(s->card)) if (s->datacnt != 0 && (!is_read || sd_data_ready(s->card))
&& !s->linux_hack) { && !s->linux_hack) {
limit = is_read ? PL181_FIFO_LEN : 0; if (is_read) {
n = 0; n = 0;
value = 0; value = 0;
while (s->datacnt && s->fifo_len != limit) { while (s->datacnt && s->fifo_len < PL181_FIFO_LEN) {
if (is_read) {
value |= (uint32_t)sd_read_data(s->card) << (n * 8); value |= (uint32_t)sd_read_data(s->card) << (n * 8);
s->datacnt--;
n++; n++;
if (n == 4) { if (n == 4) {
pl181_fifo_push(s, value); pl181_fifo_push(s, value);
value = 0;
n = 0; n = 0;
value = 0;
} }
} else { }
if (n != 0) {
pl181_fifo_push(s, value);
}
} else { /* write */
n = 0;
while (s->datacnt > 0 && (s->fifo_len > 0 || n > 0)) {
if (n == 0) { if (n == 0) {
value = pl181_fifo_pop(s); value = pl181_fifo_pop(s);
n = 4; n = 4;
} }
n--;
s->datacnt--;
sd_write_data(s->card, value & 0xff); sd_write_data(s->card, value & 0xff);
value >>= 8; value >>= 8;
n--;
} }
s->datacnt--;
}
if (n && is_read) {
pl181_fifo_push(s, value);
} }
} }
s->status &= ~(PL181_STATUS_RX_FIFO | PL181_STATUS_TX_FIFO); s->status &= ~(PL181_STATUS_RX_FIFO | PL181_STATUS_TX_FIFO);