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

esp: convert ESPState pdma_cb from a function pointer to an integer

Browse Source 
This prepares for the inclusion of the current PDMA callback in the migration
stream since the callback is referenced by an integer instead of a function
pointer.

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: <20220305155530.9265-9-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2022-03-05 15:55:28 +00:00
parent d0243b094b
commit 77987ef5a3
2 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hw/scsi/esp.c
View File

@ -195,16 +195,11 @@ static void esp_pdma_write(ESPState *s, uint8_t val)
esp_set_tc(s, dmalen); esp_set_tc(s, dmalen);
} }
static void esp_set_pdma_cb(ESPState *s, void (*cb)(ESPState *)) static void esp_set_pdma_cb(ESPState *s, enum pdma_cb cb)
{ {
s->pdma_cb = cb; s->pdma_cb = cb;
} }
static void esp_pdma_cb(ESPState *s)
{
s->pdma_cb(s);
}
static int esp_select(ESPState *s) static int esp_select(ESPState *s)
{ {
int target; int target;
@ -366,7 +361,7 @@ static void handle_satn(ESPState *s)
s->dma_cb = handle_satn; s->dma_cb = handle_satn;
return; return;
} }
esp_set_pdma_cb(s, satn_pdma_cb); esp_set_pdma_cb(s, SATN_PDMA_CB);
cmdlen = get_cmd(s, ESP_CMDFIFO_SZ); cmdlen = get_cmd(s, ESP_CMDFIFO_SZ);
if (cmdlen > 0) { if (cmdlen > 0) {
s->cmdfifo_cdb_offset = 1; s->cmdfifo_cdb_offset = 1;
@ -397,7 +392,7 @@ static void handle_s_without_atn(ESPState *s)
s->dma_cb = handle_s_without_atn; s->dma_cb = handle_s_without_atn;
return; return;
} }
esp_set_pdma_cb(s, s_without_satn_pdma_cb); esp_set_pdma_cb(s, S_WITHOUT_SATN_PDMA_CB);
cmdlen = get_cmd(s, ESP_CMDFIFO_SZ); cmdlen = get_cmd(s, ESP_CMDFIFO_SZ);
if (cmdlen > 0) { if (cmdlen > 0) {
s->cmdfifo_cdb_offset = 0; s->cmdfifo_cdb_offset = 0;
@ -432,7 +427,7 @@ static void handle_satn_stop(ESPState *s)
s->dma_cb = handle_satn_stop; s->dma_cb = handle_satn_stop;
return; return;
} }
esp_set_pdma_cb(s, satn_stop_pdma_cb); esp_set_pdma_cb(s, SATN_STOP_PDMA_CB);
cmdlen = get_cmd(s, 1); cmdlen = get_cmd(s, 1);
if (cmdlen > 0) { if (cmdlen > 0) {
trace_esp_handle_satn_stop(fifo8_num_used(&s->cmdfifo)); trace_esp_handle_satn_stop(fifo8_num_used(&s->cmdfifo));
@ -474,7 +469,7 @@ static void write_response(ESPState *s)
s->rregs[ESP_RINTR] |= INTR_BS | INTR_FC; s->rregs[ESP_RINTR] |= INTR_BS | INTR_FC;
s->rregs[ESP_RSEQ] = SEQ_CD; s->rregs[ESP_RSEQ] = SEQ_CD;
} else { } else {
esp_set_pdma_cb(s, write_response_pdma_cb); esp_set_pdma_cb(s, WRITE_RESPONSE_PDMA_CB);
esp_raise_drq(s); esp_raise_drq(s);
return; return;
} }
@ -614,7 +609,7 @@ static void esp_do_dma(ESPState *s)
s->dma_memory_read(s->dma_opaque, buf, len); s->dma_memory_read(s->dma_opaque, buf, len);
fifo8_push_all(&s->cmdfifo, buf, len); fifo8_push_all(&s->cmdfifo, buf, len);
} else { } else {
esp_set_pdma_cb(s, do_dma_pdma_cb); esp_set_pdma_cb(s, DO_DMA_PDMA_CB);
esp_raise_drq(s); esp_raise_drq(s);
return; return;
} }
@ -656,7 +651,7 @@ static void esp_do_dma(ESPState *s)
if (s->dma_memory_read) { if (s->dma_memory_read) {
s->dma_memory_read(s->dma_opaque, s->async_buf, len); s->dma_memory_read(s->dma_opaque, s->async_buf, len);
} else { } else {
esp_set_pdma_cb(s, do_dma_pdma_cb); esp_set_pdma_cb(s, DO_DMA_PDMA_CB);
esp_raise_drq(s); esp_raise_drq(s);
return; return;
} }
@ -688,7 +683,7 @@ static void esp_do_dma(ESPState *s)
} }
esp_set_tc(s, esp_get_tc(s) - len); esp_set_tc(s, esp_get_tc(s) - len);
esp_set_pdma_cb(s, do_dma_pdma_cb); esp_set_pdma_cb(s, DO_DMA_PDMA_CB);
esp_raise_drq(s); esp_raise_drq(s);
/* Indicate transfer to FIFO is complete */ /* Indicate transfer to FIFO is complete */
@ -787,6 +782,29 @@ static void esp_do_nodma(ESPState *s)
esp_raise_irq(s); esp_raise_irq(s);
} }
static void esp_pdma_cb(ESPState *s)
{
switch (s->pdma_cb) {
case SATN_PDMA_CB:
satn_pdma_cb(s);
break;
case S_WITHOUT_SATN_PDMA_CB:
s_without_satn_pdma_cb(s);
break;
case SATN_STOP_PDMA_CB:
satn_stop_pdma_cb(s);
break;
case WRITE_RESPONSE_PDMA_CB:
write_response_pdma_cb(s);
break;
case DO_DMA_PDMA_CB:
do_dma_pdma_cb(s);
break;
default:
g_assert_not_reached();
}
}
void esp_command_complete(SCSIRequest *req, size_t resid) void esp_command_complete(SCSIRequest *req, size_t resid)
{ {
ESPState *s = req->hba_private; ESPState *s = req->hba_private;

11
include/hw/scsi/esp.h
View File

@ -51,7 +51,7 @@ struct ESPState {
ESPDMAMemoryReadWriteFunc dma_memory_write; ESPDMAMemoryReadWriteFunc dma_memory_write;
void *dma_opaque; void *dma_opaque;
void (*dma_cb)(ESPState *s); void (*dma_cb)(ESPState *s);
void (*pdma_cb)(ESPState *s); uint8_t pdma_cb;
uint8_t mig_version_id; uint8_t mig_version_id;
@ -150,6 +150,15 @@ struct SysBusESPState {
#define TCHI_FAS100A 0x4 #define TCHI_FAS100A 0x4
#define TCHI_AM53C974 0x12 #define TCHI_AM53C974 0x12
/* PDMA callbacks */
enum pdma_cb {
SATN_PDMA_CB = 0,
S_WITHOUT_SATN_PDMA_CB = 1,
SATN_STOP_PDMA_CB = 2,
WRITE_RESPONSE_PDMA_CB = 3,
DO_DMA_PDMA_CB = 4
};
void esp_dma_enable(ESPState *s, int irq, int level); void esp_dma_enable(ESPState *s, int irq, int level);
void esp_request_cancelled(SCSIRequest *req); void esp_request_cancelled(SCSIRequest *req);
void esp_command_complete(SCSIRequest *req, size_t resid); void esp_command_complete(SCSIRequest *req, size_t resid);