mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

esp: use pdma_origin directly in esp_pdma_read()/esp_pdma_write() 

This is the first step in removing get_pdma_buf() from esp.c.

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-17-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2021-03-04 22:10:37 +00:00
parent 761bef75dd
commit 6e3fafa8bb
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/scsi/esp.c
View File

@ -153,16 +153,38 @@ static uint8_t *get_pdma_buf(ESPState *s)
static uint8_t esp_pdma_read(ESPState *s) static uint8_t esp_pdma_read(ESPState *s)
{ {
uint8_t *buf = get_pdma_buf(s); switch (s->pdma_origin) {
case PDMA:
return buf[s->pdma_cur++]; return s->pdma_buf[s->pdma_cur++];
case TI:
return s->ti_buf[s->pdma_cur++];
case CMD:
return s->cmdbuf[s->pdma_cur++];
case ASYNC:
return s->async_buf[s->pdma_cur++];
default:
g_assert_not_reached();
}
} }
static void esp_pdma_write(ESPState *s, uint8_t val) static void esp_pdma_write(ESPState *s, uint8_t val)
{ {
uint8_t *buf = get_pdma_buf(s); switch (s->pdma_origin) {
case PDMA:
buf[s->pdma_cur++] = val; s->pdma_buf[s->pdma_cur++] = val;
break;
case TI:
s->ti_buf[s->pdma_cur++] = val;
break;
case CMD:
s->cmdbuf[s->pdma_cur++] = val;
break;
case ASYNC:
s->async_buf[s->pdma_cur++] = val;
break;
default:
g_assert_not_reached();
}
} }
static int get_cmd_cb(ESPState *s) static int get_cmd_cb(ESPState *s)