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

esp: consolidate esp_cmdfifo_pop() into esp_fifo_pop()

Browse Source 
Each FIFO currently has its own pop functions with the only difference being
the capacity check. The original reason for this was that the fifo8
implementation doesn't have a formal API for retrieving the FIFO capacity,
however there are multiple examples within QEMU where the capacity field is
accessed directly.

Change esp_fifo_pop() to access the FIFO capacity directly and then consolidate
esp_cmdfifo_pop() into esp_fifo_pop().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20210407195801.685-5-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2021-04-07 20:57:53 +01:00
parent e5455b8c1c
commit c5fef9112b
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/scsi/esp.c
View File

@ -107,22 +107,14 @@ static void esp_fifo_push(Fifo8 *fifo, uint8_t val)
fifo8_push(fifo, val);
}
static uint8_t esp_fifo_pop(ESPState *s)
static uint8_t esp_fifo_pop(Fifo8 *fifo)
{
if (fifo8_is_empty(&s->fifo)) {
if (fifo8_is_empty(fifo)) {
return 0;
}
return fifo8_pop(&s->fifo);
}
static uint8_t esp_cmdfifo_pop(ESPState *s)
{
if (fifo8_is_empty(&s->cmdfifo)) {
return 0;
}
return fifo8_pop(&s->cmdfifo);
return fifo8_pop(fifo);
}
static uint32_t esp_get_tc(ESPState *s)
@ -159,9 +151,9 @@ static uint8_t esp_pdma_read(ESPState *s)
uint8_t val;
if (s->do_cmd) {
val = esp_cmdfifo_pop(s);
val = esp_fifo_pop(&s->cmdfifo);
} else {
val = esp_fifo_pop(s);
val = esp_fifo_pop(&s->fifo);
}
return val;
@ -887,7 +879,7 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr)
qemu_log_mask(LOG_UNIMP, "esp: PIO data read not implemented\n");
s->rregs[ESP_FIFO] = 0;
} else {
s->rregs[ESP_FIFO] = esp_fifo_pop(s);
s->rregs[ESP_FIFO] = esp_fifo_pop(&s->fifo);
}
val = s->rregs[ESP_FIFO];
break;