mirror of https://github.com/xemu-project/xemu.git
esp.c: replace n variable with len in esp_do_nodma()
This brings esp_do_nodma() in line with esp_do_dma(). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Tested-by: Helge Deller <deller@gmx.de> Tested-by: Thomas Huth <thuth@redhat.com> Message-Id: <20240112125420.514425-84-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
parent
421d1ca509
commit
5a8573391e
|
@ -675,16 +675,16 @@ static void esp_do_nodma(ESPState *s)
|
|||
{
|
||||
uint8_t buf[ESP_FIFO_SZ];
|
||||
uint32_t cmdlen;
|
||||
int n;
|
||||
int len;
|
||||
|
||||
switch (esp_get_phase(s)) {
|
||||
case STAT_MO:
|
||||
switch (s->rregs[ESP_CMD]) {
|
||||
case CMD_SELATN:
|
||||
/* Copy FIFO into cmdfifo */
|
||||
n = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
|
||||
n = MIN(fifo8_num_free(&s->cmdfifo), n);
|
||||
fifo8_push_all(&s->cmdfifo, buf, n);
|
||||
len = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
|
||||
len = MIN(fifo8_num_free(&s->cmdfifo), len);
|
||||
fifo8_push_all(&s->cmdfifo, buf, len);
|
||||
|
||||
if (fifo8_num_used(&s->cmdfifo) >= 1) {
|
||||
/* First byte received, switch to command phase */
|
||||
|
@ -701,9 +701,9 @@ static void esp_do_nodma(ESPState *s)
|
|||
|
||||
case CMD_SELATNS:
|
||||
/* Copy one byte from FIFO into cmdfifo */
|
||||
n = esp_fifo_pop_buf(&s->fifo, buf, 1);
|
||||
n = MIN(fifo8_num_free(&s->cmdfifo), n);
|
||||
fifo8_push_all(&s->cmdfifo, buf, n);
|
||||
len = esp_fifo_pop_buf(&s->fifo, buf, 1);
|
||||
len = MIN(fifo8_num_free(&s->cmdfifo), len);
|
||||
fifo8_push_all(&s->cmdfifo, buf, len);
|
||||
|
||||
if (fifo8_num_used(&s->cmdfifo) >= 1) {
|
||||
/* First byte received, stop in message out phase */
|
||||
|
@ -718,9 +718,9 @@ static void esp_do_nodma(ESPState *s)
|
|||
|
||||
case CMD_TI:
|
||||
/* Copy FIFO into cmdfifo */
|
||||
n = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
|
||||
n = MIN(fifo8_num_free(&s->cmdfifo), n);
|
||||
fifo8_push_all(&s->cmdfifo, buf, n);
|
||||
len = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
|
||||
len = MIN(fifo8_num_free(&s->cmdfifo), len);
|
||||
fifo8_push_all(&s->cmdfifo, buf, len);
|
||||
|
||||
/* ATN remains asserted until FIFO empty */
|
||||
s->cmdfifo_cdb_offset = fifo8_num_used(&s->cmdfifo);
|
||||
|
@ -736,9 +736,9 @@ static void esp_do_nodma(ESPState *s)
|
|||
switch (s->rregs[ESP_CMD]) {
|
||||
case CMD_TI:
|
||||
/* Copy FIFO into cmdfifo */
|
||||
n = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
|
||||
n = MIN(fifo8_num_free(&s->cmdfifo), n);
|
||||
fifo8_push_all(&s->cmdfifo, buf, n);
|
||||
len = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
|
||||
len = MIN(fifo8_num_free(&s->cmdfifo), len);
|
||||
fifo8_push_all(&s->cmdfifo, buf, len);
|
||||
|
||||
cmdlen = fifo8_num_used(&s->cmdfifo);
|
||||
trace_esp_handle_ti_cmd(cmdlen);
|
||||
|
@ -754,7 +754,7 @@ static void esp_do_nodma(ESPState *s)
|
|||
* service interrupt to indicate transfer complete. Otherwise
|
||||
* defer until the next FIFO write.
|
||||
*/
|
||||
if (n) {
|
||||
if (len) {
|
||||
/* Raise interrupt to indicate transfer complete */
|
||||
s->rregs[ESP_RINTR] |= INTR_BS;
|
||||
esp_raise_irq(s);
|
||||
|
@ -765,9 +765,9 @@ static void esp_do_nodma(ESPState *s)
|
|||
case CMD_SEL | CMD_DMA:
|
||||
case CMD_SELATN | CMD_DMA:
|
||||
/* Copy FIFO into cmdfifo */
|
||||
n = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
|
||||
n = MIN(fifo8_num_free(&s->cmdfifo), n);
|
||||
fifo8_push_all(&s->cmdfifo, buf, n);
|
||||
len = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
|
||||
len = MIN(fifo8_num_free(&s->cmdfifo), len);
|
||||
fifo8_push_all(&s->cmdfifo, buf, len);
|
||||
|
||||
/* Handle when DMA transfer is terminated by non-DMA FIFO write */
|
||||
if (esp_cdb_length(s) && esp_cdb_length(s) ==
|
||||
|
@ -780,9 +780,9 @@ static void esp_do_nodma(ESPState *s)
|
|||
case CMD_SEL:
|
||||
case CMD_SELATN:
|
||||
/* FIFO already contain entire CDB: copy to cmdfifo and execute */
|
||||
n = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
|
||||
n = MIN(fifo8_num_free(&s->cmdfifo), n);
|
||||
fifo8_push_all(&s->cmdfifo, buf, n);
|
||||
len = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
|
||||
len = MIN(fifo8_num_free(&s->cmdfifo), len);
|
||||
fifo8_push_all(&s->cmdfifo, buf, len);
|
||||
|
||||
do_cmd(s);
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue