X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=hw%2Fsun4m.c;h=9b6aae53c8e373ec889ae9cdc7129f70dd2d37f7;hb=4de9b249d37c1b382cc3e5a21fad1b4a11cec2fa;hp=c6765d9e17d3fae3a6fa5406a13700e4fae59342;hpb=fa1fb14cd2f4f24e158b1bb284bd193e79899575;p=qemu

diff --git a/hw/sun4m.c b/hw/sun4m.c
index c6765d9..9b6aae5 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -262,12 +262,13 @@ static void sun4m_init(int ram_size, int vga_ram_size, int boot_device,
     slavio_serial_init(PHYS_JJ_SER, PHYS_JJ_SER_IRQ, serial_hds[1], serial_hds[0]);
     fdctrl_init(PHYS_JJ_FLOPPY_IRQ, 0, 1, PHYS_JJ_FDC, fd_table);
     main_esp = esp_init(bs_table, PHYS_JJ_ESP, dma);
-    for (i = 0; i < MAX_SCSI_DISKS; i++) {
-        if (scsi_disks_info[i].adapter == SCSI_ESP &&
-            scsi_disks_info[i].device_type != SCSI_NONE) {
-            esp_scsi_attach(main_esp, bs_scsi_table[i], scsi_disks_info[i].id);
+
+    for (i = 0; i < MAX_DISKS; i++) {
+        if (bs_table[i]) {
+            esp_scsi_attach(main_esp, bs_table[i], i);
         }
     }
+
     slavio_misc = slavio_misc_init(PHYS_JJ_SLAVIO, PHYS_JJ_ME_IRQ);
     cs_init(PHYS_JJ_CS, PHYS_JJ_CS_IRQ, slavio_intctl);
     sparc32_dma_set_reset_data(dma, main_esp, main_lance);