[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/13] esp.c: change esp_fifo_pop() to take ESPState
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 05/13] esp.c: change esp_fifo_pop() to take ESPState |
Date: |
Fri, 16 Feb 2024 21:06:25 +0000 |
Now that all users of esp_fifo_pop() operate on the main FIFO there is no need
to pass the FIFO explicitly.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index b898e43e2b..0e42ff50e7 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -116,13 +116,13 @@ static void esp_fifo_push(ESPState *s, uint8_t val)
fifo8_push(&s->fifo, val);
}
-static uint8_t esp_fifo_pop(Fifo8 *fifo)
+static uint8_t esp_fifo_pop(ESPState *s)
{
- if (fifo8_is_empty(fifo)) {
+ if (fifo8_is_empty(&s->fifo)) {
return 0;
}
- return fifo8_pop(fifo);
+ return fifo8_pop(&s->fifo);
}
static uint32_t esp_fifo_pop_buf(Fifo8 *fifo, uint8_t *dest, int maxlen)
@@ -212,7 +212,7 @@ static uint8_t esp_pdma_read(ESPState *s)
{
uint8_t val;
- val = esp_fifo_pop(&s->fifo);
+ val = esp_fifo_pop(s);
return val;
}
@@ -1184,7 +1184,7 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr)
switch (saddr) {
case ESP_FIFO:
- s->rregs[ESP_FIFO] = esp_fifo_pop(&s->fifo);
+ s->rregs[ESP_FIFO] = esp_fifo_pop(s);
val = s->rregs[ESP_FIFO];
break;
case ESP_RINTR:
--
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 <=
- [PATCH 01/13] esp.c: replace cmdfifo use of esp_fifo_pop_buf() in do_command_phase(), Mark Cave-Ayland, 2024/02/16
- [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