Changeset 22168 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Aug 11, 2009 2:42:25 PM (15 years ago)

Author:

vboxsync

Message:

BIOS: Fix OS/2 bootmanager

File:

• trunk/src/VBox/Devices/PC/BIOS/rombios.c (modified) (4 diffs)

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

@@ -222 +222 @@
 /* Enough for now */
 #    define BX_MAX_SCSI_DEVICES 4
+#    define BX_MAX_STORAGE_DEVICES (BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES)
 
 /* A SCSI device starts always at BX_MAX_ATA_DEVICES. */
@@ -2357 +2358 @@
   // hdidmap  and cdidmap init.
   for (device=0; device<BX_MAX_ATA_DEVICES; device++) {
-    write_byte(ebda_seg,&EbdaData->ata.hdidmap[device],BX_MAX_ATA_DEVICES);
-    write_byte(ebda_seg,&EbdaData->ata.cdidmap[device],BX_MAX_ATA_DEVICES);
+    write_byte(ebda_seg,&EbdaData->ata.hdidmap[device],BX_MAX_STORAGE_DEVICES);
+    write_byte(ebda_seg,&EbdaData->ata.cdidmap[device],BX_MAX_STORAGE_DEVICES);
     }
 
@@ -5420 +5421 @@
 #ifdef VBOX_WITH_SCSI
   // basic check : device has to be defined
-  if ( (GET_ELDL() < 0x80) || (GET_ELDL() >= 0x80 + BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES) ) {
+  if ( (GET_ELDL() < 0x80) || (GET_ELDL() >= 0x80 + BX_MAX_STORAGE_DEVICES) ) {
     BX_INFO("int13_harddisk: function %02x, ELDL out of range %02x\n", GET_AH(), GET_ELDL());
     goto int13_fail;
@@ -5437 +5438 @@
 #ifdef VBOX_WITH_SCSI
   // basic check : device has to be valid
-  if (device >= BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES) {
+  if (device >= BX_MAX_STORAGE_DEVICES) {
     BX_INFO("int13_harddisk: function %02x, unmapped device for ELDL=%02x\n", GET_AH(), GET_ELDL());
     goto int13_fail;