[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 85/88] esp.c: rename irq_data IRQ to drq_irq
From: |
Mark Cave-Ayland |
Subject: |
[PULL 85/88] esp.c: rename irq_data IRQ to drq_irq |
Date: |
Tue, 13 Feb 2024 19:40:49 +0000 |
The IRQ represented by irq_data is actually the DRQ (DMA request) line so rename
it accordingly.
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-86-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp.c | 8 ++++----
include/hw/scsi/esp.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 5583b3eb56..fb68606f00 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -62,13 +62,13 @@ static void esp_lower_irq(ESPState *s)
static void esp_raise_drq(ESPState *s)
{
- qemu_irq_raise(s->irq_data);
+ qemu_irq_raise(s->drq_irq);
trace_esp_raise_drq();
}
static void esp_lower_drq(ESPState *s)
{
- qemu_irq_lower(s->irq_data);
+ qemu_irq_lower(s->drq_irq);
trace_esp_lower_drq();
}
@@ -1062,7 +1062,7 @@ void esp_hard_reset(ESPState *s)
static void esp_soft_reset(ESPState *s)
{
qemu_irq_lower(s->irq);
- qemu_irq_lower(s->irq_data);
+ qemu_irq_lower(s->drq_irq);
esp_hard_reset(s);
}
@@ -1489,7 +1489,7 @@ static void sysbus_esp_realize(DeviceState *dev, Error
**errp)
}
sysbus_init_irq(sbd, &s->irq);
- sysbus_init_irq(sbd, &s->irq_data);
+ sysbus_init_irq(sbd, &s->drq_irq);
assert(sysbus->it_shift != -1);
s->chip_id = TCHI_FAS100A;
diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h
index 39b416f538..c6e8b64e20 100644
--- a/include/hw/scsi/esp.h
+++ b/include/hw/scsi/esp.h
@@ -25,7 +25,7 @@ struct ESPState {
uint8_t rregs[ESP_REGS];
uint8_t wregs[ESP_REGS];
qemu_irq irq;
- qemu_irq irq_data;
+ qemu_irq drq_irq;
uint8_t chip_id;
bool tchi_written;
int32_t ti_size;
--
2.39.2
- [PULL 54/88] esp.c: move CMD_ICCS command logic to esp_do_dma(), (continued)
- [PULL 54/88] esp.c: move CMD_ICCS command logic to esp_do_dma(), Mark Cave-Ayland, 2024/02/13
- [PULL 87/88] esp.c: switch TypeInfo registration to use DEFINE_TYPES() macro, Mark Cave-Ayland, 2024/02/13
- [PULL 67/88] esp.c: replace get_cmd() with esp_do_nodma(), Mark Cave-Ayland, 2024/02/13
- [PULL 53/88] esp.c: replace do_dma_pdma_cb() with esp_do_dma(), Mark Cave-Ayland, 2024/02/13
- [PULL 88/88] esp.c: add my copyright to the file, Mark Cave-Ayland, 2024/02/13
- [PULL 83/88] esp.c: replace n variable with len in esp_do_nodma(), Mark Cave-Ayland, 2024/02/13
- [PULL 52/88] esp.c: move CMD_SELATNS end of command logic to esp_do_dma() and do_dma_pdma_cb(), Mark Cave-Ayland, 2024/02/13
- [PULL 62/88] esp.c: zero command register when TI command terminates due to phase change, Mark Cave-Ayland, 2024/02/13
- [PULL 77/88] esp.c: only transfer non-DMA MESSAGE OUT phase data for specific commands, Mark Cave-Ayland, 2024/02/13
- [PULL 55/88] esp.c: always use esp_do_dma() in pdma_cb(), Mark Cave-Ayland, 2024/02/13
- [PULL 85/88] esp.c: rename irq_data IRQ to drq_irq,
Mark Cave-Ayland <=
- [PULL 76/88] esp.c: only transfer non-DMA COMMAND phase data for specific commands, Mark Cave-Ayland, 2024/02/13
- [PULL 66/88] esp.c: process non-DMA FIFO writes in esp_do_nodma(), Mark Cave-Ayland, 2024/02/13
- [PULL 63/88] esp.c: remove unneeded ti_cmd field, Mark Cave-Ayland, 2024/02/13
- [PULL 50/88] esp.c: move CMD_TI end of message phase detection to esp_do_dma() and do_dma_pdma_cb(), Mark Cave-Ayland, 2024/02/13
- [PULL 86/88] esp.c: keep track of the DRQ state during DMA, Mark Cave-Ayland, 2024/02/13
- [PULL 61/88] esp.c: remove DATA IN phase logic when reading from FIFO, Mark Cave-Ayland, 2024/02/13
- [PULL 68/88] esp.c: move write_response() non-DMA logic to esp_do_nodma(), Mark Cave-Ayland, 2024/02/13
- [PULL 74/88] esp.c: handle non-DMA FIFO writes used to terminate DMA commands, Mark Cave-Ayland, 2024/02/13
- [PULL 59/88] esp.c: separate logic based upon ESP command in esp_transfer_data(), Mark Cave-Ayland, 2024/02/13
- [PULL 72/88] esp.c: handle TC underflow for DMA SCSI requests, Mark Cave-Ayland, 2024/02/13