[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 16/42] esp: use pdma_origin directly in esp_pdma_read()/esp_pd
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 16/42] esp: use pdma_origin directly in esp_pdma_read()/esp_pdma_write() |
Date: |
Tue, 9 Feb 2021 19:29:52 +0000 |
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>
---
hw/scsi/esp.c | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index b0cba889a9..cfeba2feb0 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -153,16 +153,38 @@ static uint8_t *get_pdma_buf(ESPState *s)
static uint8_t esp_pdma_read(ESPState *s)
{
- uint8_t *buf = get_pdma_buf(s);
-
- return buf[s->pdma_cur++];
+ switch (s->pdma_origin) {
+ case PDMA:
+ 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)
{
- uint8_t *buf = get_pdma_buf(s);
-
- buf[s->pdma_cur++] = val;
+ switch (s->pdma_origin) {
+ case PDMA:
+ 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)
--
2.20.1
- [PATCH v2 12/42] esp: remove dma_counter from ESPState, (continued)
- [PATCH v2 16/42] esp: use pdma_origin directly in esp_pdma_read()/esp_pdma_write(),
Mark Cave-Ayland <=
- [PATCH v2 17/42] esp: move pdma_len and TC logic into esp_pdma_read()/esp_pdma_write(), Mark Cave-Ayland, 2021/02/09
- [PATCH v2 18/42] esp: accumulate SCSI commands for PDMA transfers in cmdbuf instead of pdma_buf, Mark Cave-Ayland, 2021/02/09
- [PATCH v2 19/42] esp: remove buf parameter from do_cmd(), Mark Cave-Ayland, 2021/02/09
- [PATCH v2 20/42] esp: remove the buf and buflen parameters from get_cmd(), Mark Cave-Ayland, 2021/02/09
- [PATCH v2 21/42] esp: remove redundant pdma_start from ESPState, Mark Cave-Ayland, 2021/02/09