hw/mips/jazz: create ESP device directly via qdev
MIPS jazz is the last user of the legacy esp_init() function so move creation of the ESP device over to use qdev. Note that the esp_reset and dma_enable qemu_irqs are currently unused and so we do not wire these up and instead remove the variables to prevent the compiler emitting unused variable warnings. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Message-Id: <20180613094727.11326-2-mark.cave-ayland@ilande.co.uk> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Tested-by: Hervé Poussineau <hpoussin@reactos.org>
This commit is contained in:
parent
e2c81a4510
commit
09eb69a573
|
@ -145,10 +145,10 @@ static void mips_jazz_init(MachineState *machine,
|
||||||
ISABus *isa_bus;
|
ISABus *isa_bus;
|
||||||
ISADevice *pit;
|
ISADevice *pit;
|
||||||
DriveInfo *fds[MAX_FD];
|
DriveInfo *fds[MAX_FD];
|
||||||
qemu_irq esp_reset, dma_enable;
|
|
||||||
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
||||||
MemoryRegion *bios = g_new(MemoryRegion, 1);
|
MemoryRegion *bios = g_new(MemoryRegion, 1);
|
||||||
MemoryRegion *bios2 = g_new(MemoryRegion, 1);
|
MemoryRegion *bios2 = g_new(MemoryRegion, 1);
|
||||||
|
SysBusESPState *sysbus_esp;
|
||||||
ESPState *esp;
|
ESPState *esp;
|
||||||
|
|
||||||
/* init CPUs */
|
/* init CPUs */
|
||||||
|
@ -281,8 +281,21 @@ static void mips_jazz_init(MachineState *machine,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* SCSI adapter */
|
/* SCSI adapter */
|
||||||
esp = esp_init(0x80002000, 0, rc4030_dma_read, rc4030_dma_write, dmas[0],
|
dev = qdev_create(NULL, TYPE_ESP);
|
||||||
qdev_get_gpio_in(rc4030, 5), &esp_reset, &dma_enable);
|
sysbus_esp = ESP_STATE(dev);
|
||||||
|
esp = &sysbus_esp->esp;
|
||||||
|
esp->dma_memory_read = rc4030_dma_read;
|
||||||
|
esp->dma_memory_write = rc4030_dma_write;
|
||||||
|
esp->dma_opaque = dmas[0];
|
||||||
|
sysbus_esp->it_shift = 0;
|
||||||
|
/* XXX for now until rc4030 has been changed to use DMA enable signal */
|
||||||
|
esp->dma_enabled = 1;
|
||||||
|
qdev_init_nofail(dev);
|
||||||
|
|
||||||
|
sysbus = SYS_BUS_DEVICE(dev);
|
||||||
|
sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(rc4030, 5));
|
||||||
|
sysbus_mmio_map(sysbus, 0, 0x80002000);
|
||||||
|
|
||||||
scsi_bus_legacy_handle_cmdline(&esp->bus);
|
scsi_bus_legacy_handle_cmdline(&esp->bus);
|
||||||
|
|
||||||
/* Floppy */
|
/* Floppy */
|
||||||
|
|
Loading…
Reference in New Issue