Changeset 16537 in vbox

Timestamp:

Feb 5, 2009 5:55:47 PM (16 years ago)

Author:

vboxsync

Message:

BIOS part to make Vista boot from the LsiLogic controller and boot speedup

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• logo.c (modified) (1 diff)
• rombios.c (modified) (4 diffs)

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

@@ -305 +305 @@
         device = read_byte(ebda_seg, &EbdaData->ata.hdidmap[actual_device]);
     }
+
+    if ((first_ctrl_printed == 0) && (second_ctrl_printed == 0))
+        printf("No hard disks found");
 
     printf("\n");

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

@@ -220 +220 @@
 
 #ifdef VBOX_WITH_SCSI
-#    define BX_MAX_SCSI_DEVICES 1
+#    define BX_MAX_SCSI_DEVICES 2
 #endif
 
@@ -5539 +5539 @@
 
       // Get logical geometry from table
-      nlc   = read_word(ebda_seg, &EbdaData->ata.devices[device].lchs.cylinders);
-      nlh   = read_word(ebda_seg, &EbdaData->ata.devices[device].lchs.heads);
-      nlspt = read_word(ebda_seg, &EbdaData->ata.devices[device].lchs.spt);
+#ifdef VBOX_WITH_SCSI
+      if (!VBOX_IS_SCSI_DEVICE(device))
+#endif
+      {
+        nlc   = read_word(ebda_seg, &EbdaData->ata.devices[device].lchs.cylinders);
+        nlh   = read_word(ebda_seg, &EbdaData->ata.devices[device].lchs.heads);
+        nlspt = read_word(ebda_seg, &EbdaData->ata.devices[device].lchs.spt);
+      }
+#ifdef VBOX_WITH_SCSI
+      else
+      {
+        Bit8u scsi_device = VBOX_GET_SCSI_DEVICE(device);
+        nlc   = read_word(ebda_seg, &EbdaData->scsi.devices[scsi_device].device_info.lchs.cylinders);
+        nlh   = read_word(ebda_seg, &EbdaData->scsi.devices[scsi_device].device_info.lchs.heads);
+        nlspt = read_word(ebda_seg, &EbdaData->scsi.devices[scsi_device].device_info.lchs.spt);
+      }
+#endif
+
       count = read_byte(ebda_seg, &EbdaData->ata.hdcount);
-
 #ifndef VBOX
       nlc = nlc - 2; /* 0 based , last sector not used */
@@ -5578 +5592 @@
 
       // Get physical geometry from table
-      npc   = read_word(ebda_seg, &EbdaData->ata.devices[device].pchs.cylinders);
-      nph   = read_word(ebda_seg, &EbdaData->ata.devices[device].pchs.heads);
-      npspt = read_word(ebda_seg, &EbdaData->ata.devices[device].pchs.spt);
+#ifdef VBOX_WITH_SCSI
+      if (!VBOX_IS_SCSI_DEVICE(device))
+#endif
+      {
+        npc   = read_word(ebda_seg, &EbdaData->ata.devices[device].pchs.cylinders);
+        nph   = read_word(ebda_seg, &EbdaData->ata.devices[device].pchs.heads);
+        npspt = read_word(ebda_seg, &EbdaData->ata.devices[device].pchs.spt);
+      }
+#ifdef VBOX_WITH_SCSI
+      else
+      {
+        Bit8u scsi_device = VBOX_GET_SCSI_DEVICE(device);
+        npc   = read_word(ebda_seg, &EbdaData->scsi.devices[scsi_device].device_info.pchs.cylinders);
+        nph   = read_word(ebda_seg, &EbdaData->scsi.devices[scsi_device].device_info.pchs.heads);
+        npspt = read_word(ebda_seg, &EbdaData->scsi.devices[scsi_device].device_info.pchs.spt);
+      }
+#endif
 
       // Compute sector count seen by int13
@@ -5714 +5742 @@
         Bit16u   blksize;
 
-        npc     = read_word(ebda_seg, &EbdaData->ata.devices[device].pchs.cylinders);
-        nph     = read_word(ebda_seg, &EbdaData->ata.devices[device].pchs.heads);
-        npspt   = read_word(ebda_seg, &EbdaData->ata.devices[device].pchs.spt);
-        lba     = read_dword(ebda_seg, &EbdaData->ata.devices[device].sectors);
-        blksize = read_word(ebda_seg, &EbdaData->ata.devices[device].blksize);
+#ifdef VBOX_WITH_SCSI
+        if (!VBOX_IS_SCSI_DEVICE(device))
+#endif
+        {
+          npc     = read_word(ebda_seg, &EbdaData->ata.devices[device].pchs.cylinders);
+          nph     = read_word(ebda_seg, &EbdaData->ata.devices[device].pchs.heads);
+          npspt   = read_word(ebda_seg, &EbdaData->ata.devices[device].pchs.spt);
+          lba     = read_dword(ebda_seg, &EbdaData->ata.devices[device].sectors);
+          blksize = read_word(ebda_seg, &EbdaData->ata.devices[device].blksize);
+        }
+#ifdef VBOX_WITH_SCSI
+        else
+        {
+          Bit8u scsi_device = VBOX_GET_SCSI_DEVICE(device);
+          npc     = read_word(ebda_seg, &EbdaData->scsi.devices[scsi_device].device_info.pchs.cylinders);
+          nph     = read_word(ebda_seg, &EbdaData->scsi.devices[scsi_device].device_info.pchs.heads);
+          npspt   = read_word(ebda_seg, &EbdaData->scsi.devices[scsi_device].device_info.pchs.spt);
+          lba     = read_dword(ebda_seg, &EbdaData->scsi.devices[scsi_device].device_info.sectors);
+          blksize = read_word(ebda_seg, &EbdaData->scsi.devices[scsi_device].device_info.blksize);
+        }
+#endif
 
         write_word(DS, SI+(Bit16u)&Int13DPT->size, 0x1a);