summaryrefslogtreecommitdiff
path: root/hw/mips_jazz.c
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2009-05-14 22:35:07 +0100
committerPaul Brook <paul@codesourcery.com>2009-05-14 22:35:07 +0100
commitcfb9de9ce48d108cfc56052dc9bc402a6197c199 (patch)
tree082fc9ead002d62b270d240f4f1eecb25c5572c1 /hw/mips_jazz.c
parent418dcf5b7da0efefea33ad4e96434feff57524d5 (diff)
downloadqemu-cfb9de9ce48d108cfc56052dc9bc402a6197c199.zip
ESP SCSI qdev conversion
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/mips_jazz.c')
-rw-r--r--hw/mips_jazz.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 5cc709a52f..292137fec9 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -129,8 +129,6 @@ void mips_jazz_init (ram_addr_t ram_size,
qemu_irq *rc4030, *i8259;
rc4030_dma *dmas;
void* rc4030_opaque;
- void *scsi_hba;
- int hd;
int s_rtc, s_dma_dummy;
NICInfo *nd;
PITState *pit;
@@ -226,15 +224,9 @@ void mips_jazz_init (ram_addr_t ram_size,
}
/* SCSI adapter */
- scsi_hba = esp_init(0x80002000, 0,
- rc4030_dma_read, rc4030_dma_write, dmas[0],
- rc4030[5], &esp_reset);
- for (n = 0; n < ESP_MAX_DEVS; n++) {
- hd = drive_get_index(IF_SCSI, 0, n);
- if (hd != -1) {
- esp_scsi_attach(scsi_hba, drives_table[hd].bdrv, n);
- }
- }
+ esp_init(0x80002000, 0,
+ rc4030_dma_read, rc4030_dma_write, dmas[0],
+ rc4030[5], &esp_reset);
/* Floppy */
if (drive_get_max_bus(IF_FLOPPY) >= MAX_FD) {