[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/13] esp.c: replace cmdfifo use of esp_fifo_pop_buf() in do_com
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 01/13] esp.c: replace cmdfifo use of esp_fifo_pop_buf() in do_command_phase() |
Date: |
Fri, 16 Feb 2024 21:06:21 +0000 |
The aim is to restrict the esp_fifo_*() functions so that they only operate on
the hardware FIFO. When reading from cmdfifo in do_command_phase() use the
underlying Fifo8 functions directly.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 590ff99744..f8230c74b3 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -265,7 +265,7 @@ static void esp_do_nodma(ESPState *s);
static void do_command_phase(ESPState *s)
{
- uint32_t cmdlen;
+ uint32_t cmdlen, n;
int32_t datalen;
SCSIDevice *current_lun;
uint8_t buf[ESP_CMDFIFO_SZ];
@@ -275,7 +275,7 @@ static void do_command_phase(ESPState *s)
if (!cmdlen || !s->current_dev) {
return;
}
- esp_fifo_pop_buf(&s->cmdfifo, buf, cmdlen);
+ memcpy(buf, fifo8_pop_buf(&s->cmdfifo, cmdlen, &n), cmdlen);
current_lun = scsi_device_find(&s->bus, 0, s->current_dev->id, s->lun);
if (!current_lun) {
--
2.39.2
- [PATCH 00/13] esp: avoid explicit setting of DRQ within ESP state machine, Mark Cave-Ayland, 2024/02/16
- [PATCH 03/13] esp.c: replace cmdfifo use of esp_fifo_pop() in do_message_phase(), Mark Cave-Ayland, 2024/02/16
- [PATCH 04/13] esp.c: change esp_fifo_push() to take ESPState, Mark Cave-Ayland, 2024/02/16
- [PATCH 05/13] esp.c: change esp_fifo_pop() to take ESPState, Mark Cave-Ayland, 2024/02/16
- [PATCH 01/13] esp.c: replace cmdfifo use of esp_fifo_pop_buf() in do_command_phase(),
Mark Cave-Ayland <=
- [PATCH 02/13] esp.c: replace cmdfifo use of esp_fifo_pop_buf() in do_message_phase(), Mark Cave-Ayland, 2024/02/16
- [PATCH 06/13] esp.c: use esp_fifo_push() instead of fifo8_push(), Mark Cave-Ayland, 2024/02/16
- [PATCH 08/13] esp.c: introduce esp_fifo_push_buf() function for pushing to the FIFO, Mark Cave-Ayland, 2024/02/16
- [PATCH 09/13] esp.c: move esp_set_phase() and esp_get_phase() towards the beginning of the file, Mark Cave-Ayland, 2024/02/16
- [PATCH 07/13] esp.c: change esp_fifo_pop_buf() to take ESPState, Mark Cave-Ayland, 2024/02/16
- [PATCH 11/13] esp.c: update esp_fifo_{push, pop}() to call esp_update_drq(), Mark Cave-Ayland, 2024/02/16
- [PATCH 10/13] esp.c: introduce esp_update_drq() and update esp_fifo_{push, pop}_buf() to use it, Mark Cave-Ayland, 2024/02/16
- [PATCH 12/13] esp.c: ensure esp_pdma_write() always calls esp_fifo_push(), Mark Cave-Ayland, 2024/02/16
- [PATCH 13/13] esp.c: remove explicit setting of DRQ within ESP state machine, Mark Cave-Ayland, 2024/02/16