On 08/06/18 21:05, Laurent Vivier wrote:
From: Laurent Vivier <laur...@vivier.eu>
Signed-off-by: Laurent Vivier <laur...@vivier.eu>
---
hw/mips/mips_jazz.c | 2 +-
hw/scsi/esp.c | 330 +++++++++++++++++++++++++++++++++++++++++++++-----
include/hw/scsi/esp.h | 15 ++-
3 files changed, 313 insertions(+), 34 deletions(-)
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 90cb306f53..87118f2d03 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -282,7 +282,7 @@ static void mips_jazz_init(MachineState *machine,
/* SCSI adapter */
esp = esp_init(0x80002000, 0, rc4030_dma_read, rc4030_dma_write, dmas[0],
- qdev_get_gpio_in(rc4030, 5), &esp_reset, &dma_enable);
+ qdev_get_gpio_in(rc4030, 5), NULL, &esp_reset, &dma_enable);
scsi_bus_legacy_handle_cmdline(&esp->bus);
/* Floppy */
A quick note here: last year I removed esp_init() from all of the SPARC
code which means that mips/jazz is the last remaining user.
If we can switch this over to using qdev properties similar to how I did
in 7f773ff5d0: sparc32_dma: make esp device child of espdma device then
we can remove this function completely.
Hervé, is this something that you could take a quick look at?
ATB,
Mark.
