Changeset 43475 in vbox for trunk/src/VBox/Devices/PC/BIOS/eltorito.c

Timestamp:

Sep 30, 2012 9:30:51 PM (12 years ago)

Author:

vboxsync

Message:

BIOS: Support for SCSI CD-ROMs, larger than 64K SCSI transfers.

File:

• trunk/src/VBox/Devices/PC/BIOS/eltorito.c (modified) (5 diffs)

trunk/src/VBox/Devices/PC/BIOS/eltorito.c

@@ -268 +268 @@
     {
         //@todo: Use indirect calls instead?
-        if (device > BX_MAX_ATA_DEVICES)
+        if (VBOX_IS_AHCI_DEVICE(device))
             error = ahci_cmd_packet(device, 12, (char __far *)&atapicmd, 0, 2048L, ATA_DATA_IN, &buffer);
+        else if (VBOX_IS_SCSI_DEVICE(device))
+            error = scsi_cmd_packet(device, 12, (char __far *)&atapicmd, 0, 2048L, ATA_DATA_IN, &buffer);
         else
             error = ata_cmd_packet(device, 12, (char __far *)&atapicmd, 0, 2048L, ATA_DATA_IN, &buffer);
@@ -304 +306 @@
 #endif
 
-    if (device > BX_MAX_ATA_DEVICES)
+    if (VBOX_IS_AHCI_DEVICE(device))
         error = ahci_cmd_packet(device, 12, (char __far *)&atapicmd, 0, 2048L, ATA_DATA_IN, &buffer);
+    else if (VBOX_IS_SCSI_DEVICE(device))
+        error = scsi_cmd_packet(device, 12, (char __far *)&atapicmd, 0, 2048L, ATA_DATA_IN, &buffer);
     else
         error = ata_cmd_packet(device, 12, (char __far *)&atapicmd, 0, 2048L, ATA_DATA_IN, &buffer);
@@ -368 +372 @@
     bios_dsk->drqp.skip_a = 2048 - nbsectors * 512UL % 2048;
 
-    if (device > BX_MAX_ATA_DEVICES)
+    if (VBOX_IS_AHCI_DEVICE(device))
         error = ahci_cmd_packet(device, 12, (char __far *)&atapicmd, 0, nbsectors*512L, ATA_DATA_IN, MK_FP(boot_segment,0));
+    else if (VBOX_IS_SCSI_DEVICE(device))
+        error = scsi_cmd_packet(device, 12, (char __far *)&atapicmd, 0, nbsectors*512L, ATA_DATA_IN, MK_FP(boot_segment,0));
     else
         error = ata_cmd_packet(device, 12, (char __far *)&atapicmd, 0, nbsectors*512L, ATA_DATA_IN, MK_FP(boot_segment,0));
@@ -554 +560 @@
         bios_dsk->drqp.skip_a = 2048 - nbsectors * 512UL % 2048 - bios_dsk->drqp.skip_b;
 
-        if (device > BX_MAX_ATA_DEVICES)
+        if (VBOX_IS_AHCI_DEVICE(device))
             status = ahci_cmd_packet(device, 12, (char __far *)&atapicmd, before*512, nbsectors*512L, ATA_DATA_IN, MK_FP(segment,offset));
+        else if (VBOX_IS_SCSI_DEVICE(device))
+            status = scsi_cmd_packet(device, 12, (char __far *)&atapicmd, before*512, nbsectors*512L, ATA_DATA_IN, MK_FP(segment,offset));
         else
             status = ata_cmd_packet(device, 12, (char __far *)&atapicmd, before*512, nbsectors*512L, ATA_DATA_IN, MK_FP(segment,offset));
@@ -758 +766 @@
         bios_dsk->drqp.sect_sz = 2048;
 
-        if (device > BX_MAX_ATA_DEVICES)
+        if (VBOX_IS_AHCI_DEVICE(device))
             status = ahci_cmd_packet(device, 12, (char __far *)&atapicmd, 0, count*2048L, ATA_DATA_IN, MK_FP(segment,offset));
+        else if (VBOX_IS_SCSI_DEVICE(device))
+            status = scsi_cmd_packet(device, 12, (char __far *)&atapicmd, 0, count*2048L, ATA_DATA_IN, MK_FP(segment,offset));
         else
             status = ata_cmd_packet(device, 12, (char __far *)&atapicmd, 0, count*2048L, ATA_DATA_IN, MK_FP(segment,offset));