motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-02 06:51:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

esp.c: remove s_without_satn_pdma_cb() PDMA callback

Browse source 
This can now be handled by the existing do_dma_pdma_cb() function.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Helge Deller <deller@gmx.de>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20240112125420.514425-37-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 2024-01-12 12:53:28 +00:00
parent 1b2e34ca2e
commit 66fd565733
2 changed files with 1 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
hw/scsi/esp.c
View file

@ -408,23 +408,6 @@ static void handle_satn(ESPState *s)
} }
} }
static void s_without_satn_pdma_cb(ESPState *s)
{
uint8_t buf[ESP_FIFO_SZ];
int n;
/* Copy FIFO into cmdfifo */
n = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
n = MIN(fifo8_num_free(&s->cmdfifo), n);
fifo8_push_all(&s->cmdfifo, buf, n);
if (!esp_get_tc(s) && !fifo8_is_empty(&s->cmdfifo)) {
s->cmdfifo_cdb_offset = 0;
s->do_cmd = 0;
do_cmd(s);
}
}
static void handle_s_without_atn(ESPState *s) static void handle_s_without_atn(ESPState *s)
{ {
int32_t cmdlen; int32_t cmdlen;
@ -433,7 +416,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, DO_DMA_PDMA_CB);
if (esp_select(s) < 0) { if (esp_select(s) < 0) {
return; return;
} }
@ -856,9 +839,6 @@ static void esp_pdma_cb(ESPState *s)
case SATN_PDMA_CB: case SATN_PDMA_CB:
satn_pdma_cb(s); satn_pdma_cb(s);
break; break;
case S_WITHOUT_SATN_PDMA_CB:
s_without_satn_pdma_cb(s);
break;
case SATN_STOP_PDMA_CB: case SATN_STOP_PDMA_CB:
satn_stop_pdma_cb(s); satn_stop_pdma_cb(s);
break; break;

1
include/hw/scsi/esp.h
View file

@ -153,7 +153,6 @@ struct SysBusESPState {
/* PDMA callbacks */ /* PDMA callbacks */
enum pdma_cb { enum pdma_cb {
SATN_PDMA_CB = 0, SATN_PDMA_CB = 0,
S_WITHOUT_SATN_PDMA_CB = 1,
SATN_STOP_PDMA_CB = 2, SATN_STOP_PDMA_CB = 2,
WRITE_RESPONSE_PDMA_CB = 3, WRITE_RESPONSE_PDMA_CB = 3,
DO_DMA_PDMA_CB = 4 DO_DMA_PDMA_CB = 4