[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 18/25] esp: use ti_wptr/ti_rptr to manage the current FIFO positi
|
From: |
Mark Cave-Ayland |
|
Subject: |
[PATCH 18/25] esp: use ti_wptr/ti_rptr to manage the current FIFO position for PDMA |
|
Date: |
Wed, 30 Dec 2020 15:37:38 +0000 |
This eliminates the last user of the PDMA-specific pdma_cur variable which can
now be removed.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp.c | 23 ++++++++---------------
include/hw/scsi/esp.h | 1 -
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 23ec93c8ed..b43d0941f0 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -127,11 +127,9 @@ static uint32_t esp_get_stc(ESPState *s)
return dmalen;
}
-static void set_pdma(ESPState *s, enum pdma_origin_id origin,
- uint32_t index, uint32_t len)
+static void set_pdma(ESPState *s, enum pdma_origin_id origin, uint32_t len)
{
s->pdma_origin = origin;
- s->pdma_cur = index;
s->pdma_len = len;
}
@@ -146,11 +144,10 @@ static uint8_t esp_pdma_read(ESPState *s)
switch (s->pdma_origin) {
case TI:
- val = s->ti_buf[s->pdma_cur++];
+ val = s->ti_buf[s->ti_rptr++];
break;
case CMD:
val = s->cmdbuf[s->cmdlen++];
- s->pdma_cur++;
break;
case ASYNC:
val = s->async_buf[0];
@@ -158,7 +155,6 @@ static uint8_t esp_pdma_read(ESPState *s)
s->async_len--;
s->async_buf++;
}
- s->pdma_cur++;
break;
default:
g_assert_not_reached();
@@ -182,11 +178,10 @@ static void esp_pdma_write(ESPState *s, uint8_t val)
switch (s->pdma_origin) {
case TI:
- s->ti_buf[s->pdma_cur++] = val;
+ s->ti_buf[s->ti_wptr++] = val;
break;
case CMD:
s->cmdbuf[s->cmdlen++] = val;
- s->pdma_cur++;
break;
case ASYNC:
s->async_buf[0] = val;
@@ -194,7 +189,6 @@ static void esp_pdma_write(ESPState *s, uint8_t val)
s->async_len--;
s->async_buf++;
}
- s->pdma_cur++;
break;
default:
g_assert_not_reached();
@@ -248,7 +242,7 @@ static uint32_t get_cmd(ESPState *s, uint8_t *buf, uint8_t
buflen)
if (s->dma_memory_read) {
s->dma_memory_read(s->dma_opaque, buf, dmalen);
} else {
- set_pdma(s, CMD, 0, dmalen);
+ set_pdma(s, CMD, dmalen);
esp_raise_drq(s);
return 0;
}
@@ -410,7 +404,7 @@ static void write_response(ESPState *s)
s->rregs[ESP_RINTR] = INTR_BS | INTR_FC;
s->rregs[ESP_RSEQ] = SEQ_CD;
} else {
- set_pdma(s, TI, 0, 2);
+ set_pdma(s, TI, 2);
s->pdma_cb = write_response_pdma_cb;
esp_raise_drq(s);
return;
@@ -480,7 +474,7 @@ static void esp_do_dma(ESPState *s)
if (s->dma_memory_read) {
s->dma_memory_read(s->dma_opaque, &s->cmdbuf[s->cmdlen], len);
} else {
- set_pdma(s, CMD, s->cmdlen, len);
+ set_pdma(s, CMD, len);
s->pdma_cb = do_dma_pdma_cb;
esp_raise_drq(s);
return;
@@ -503,7 +497,7 @@ static void esp_do_dma(ESPState *s)
if (s->dma_memory_read) {
s->dma_memory_read(s->dma_opaque, s->async_buf, len);
} else {
- set_pdma(s, ASYNC, 0, len);
+ set_pdma(s, ASYNC, len);
s->pdma_cb = do_dma_pdma_cb;
esp_raise_drq(s);
return;
@@ -512,7 +506,7 @@ static void esp_do_dma(ESPState *s)
if (s->dma_memory_write) {
s->dma_memory_write(s->dma_opaque, s->async_buf, len);
} else {
- set_pdma(s, ASYNC, 0, len);
+ set_pdma(s, ASYNC, len);
s->pdma_cb = do_dma_pdma_cb;
esp_raise_drq(s);
return;
@@ -859,7 +853,6 @@ static const VMStateDescription vmstate_esp_pdma = {
.fields = (VMStateField[]) {
VMSTATE_INT32(pdma_origin, ESPState),
VMSTATE_UINT32(pdma_len, ESPState),
- VMSTATE_UINT32(pdma_cur, ESPState),
VMSTATE_END_OF_LIST()
}
};
diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h
index fd4779b497..292136344a 100644
--- a/include/hw/scsi/esp.h
+++ b/include/hw/scsi/esp.h
@@ -53,7 +53,6 @@ struct ESPState {
void (*dma_cb)(ESPState *s);
int pdma_origin;
uint32_t pdma_len;
- uint32_t pdma_cur;
void (*pdma_cb)(ESPState *s);
/* Legacy field for vmstate_sysbus_esp_scsi version < 2 */
--
2.20.1
- [PATCH 08/25] esp: apply transfer length adjustment when STC is zero at TC load time, (continued)
- [PATCH 08/25] esp: apply transfer length adjustment when STC is zero at TC load time, Mark Cave-Ayland, 2020/12/30
- [PATCH 09/25] esp: remove dma_counter from ESPState, Mark Cave-Ayland, 2020/12/30
- [PATCH 10/25] esp: remove dma_left from ESPState, Mark Cave-Ayland, 2020/12/30
- [PATCH 11/25] esp: remove minlen restriction in handle_ti, Mark Cave-Ayland, 2020/12/30
- [PATCH 12/25] esp: introduce esp_pdma_read() and esp_pdma_write() functions, Mark Cave-Ayland, 2020/12/30
- [PATCH 14/25] esp: move pdma_len and TC logic into esp_pdma_read()/esp_pdma_write(), Mark Cave-Ayland, 2020/12/30
- [PATCH 13/25] esp: use pdma_origin directly in esp_pdma_read()/esp_pdma_write(), Mark Cave-Ayland, 2020/12/30
- [PATCH 16/25] esp: remove redundant pdma_start from ESPState, Mark Cave-Ayland, 2020/12/30
- [PATCH 15/25] esp: accumulate SCSI commands for PDMA transfers in cmdbuf instead of pdma_buf, Mark Cave-Ayland, 2020/12/30
- [PATCH 17/25] esp: move PDMA length adjustments into esp_pdma_read()/esp_pdma_write(), Mark Cave-Ayland, 2020/12/30
- [PATCH 18/25] esp: use ti_wptr/ti_rptr to manage the current FIFO position for PDMA,
Mark Cave-Ayland <=
- [PATCH 19/25] esp: use in-built TC to determine PDMA transfer length, Mark Cave-Ayland, 2020/12/30
- [PATCH 20/25] esp: remove CMD pdma_origin, Mark Cave-Ayland, 2020/12/30
- [PATCH 21/25] esp: rename get_cmd_cb() to esp_select(), Mark Cave-Ayland, 2020/12/30
- [PATCH 22/25] esp: fix PDMA target selection, Mark Cave-Ayland, 2020/12/30
- [PATCH 23/25] esp: use FIFO for PDMA transfers between initiator and device, Mark Cave-Ayland, 2020/12/30
- [PATCH 24/25] esp: remove pdma_origin from ESPState, Mark Cave-Ayland, 2020/12/30
- [PATCH 25/25] esp: add 4 byte PDMA read and write transfers, Mark Cave-Ayland, 2020/12/30