Changeset 18324 in vbox for trunk/src

Timestamp:

Mar 26, 2009 4:01:52 PM (16 years ago)

Author:

vboxsync

Message:

BIOS: Make it possible to select SCSI disks on the boot screen

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

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

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

@@ -258 +258 @@
 {
     Bit16u ebda_seg=read_word(0x0040,0x000E);
-    Bit8u actual_device = 0;
-    Bit8u first_ctrl_printed = 0;
-    Bit8u second_ctrl_printed = 0;
+    Bit8u hd_count;
+    Bit8u hd_curr = 0;
+    Bit8u ide_ctrl_printed = 0;
+    Bit8u sata_ctrl_printed = 0;
+    Bit8u scsi_ctrl_printed = 0;
     Bit8u device;
 
-    device = read_byte(ebda_seg, &EbdaData->ata.hdidmap[actual_device]);
-
-    while ((actual_device < BX_MAX_ATA_DEVICES) && (device < BX_MAX_ATA_DEVICES))
-    {
-        Bit8u device_position;
-
-        device_position = device;
-
-        if ((device_position < 4) && (first_ctrl_printed == 0))
-        {
-            printf("IDE controller:\n");
-            first_ctrl_printed = 1;
-        }
-        else if ((device_position >= 4) && (second_ctrl_printed == 0))
-        {
-            printf("\n\nAHCI controller:\n");
-            second_ctrl_printed = 1;
-        }
-
-        printf("\n    %d) ", actual_device+1);
-
-        /*
-         * If actual_device is bigger than or equal 4
-         * this is the next controller and
-         * the positions start at the beginning.
-         */
-        if (device_position >= 4)
-            device_position -= 4;
-
-        if (device_position / 2)
-            printf("Secondary ");
+    hd_count = read_byte(ebda_seg, &EbdaData->ata.hdcount);
+
+    for (hd_curr = 0; hd_curr < hd_count; hd_curr++)
+    {
+        device = read_byte(ebda_seg, &EbdaData->ata.hdidmap[hd_curr]);
+
+        if (!VBOX_IS_SCSI_DEVICE(device))
+        {
+
+            if ((device < 4) && (ide_ctrl_printed == 0))
+            {
+                printf("IDE controller:\n");
+                ide_ctrl_printed = 1;
+            }
+            else if ((device >= 4) && (sata_ctrl_printed == 0))
+            {
+                printf("\n\nAHCI controller:\n");
+                sata_ctrl_printed = 1;
+            }
+
+            printf("\n    %d) ", hd_curr+1);
+
+            /*
+             * If actual_device is bigger than or equal 4
+             * this is the next controller and
+             * the positions start at the beginning.
+             */
+            if (device >= 4)
+                device -= 4;
+
+            if (device / 2)
+                printf("Secondary ");
+            else
+                printf("Primary ");
+
+            if (device % 2)
+                printf("Slave");
+            else
+                printf("Master");
+        }
         else
-            printf("Primary ");
-
-        if (device_position % 2)
-            printf("Slave");
-        else
-            printf("Master");
-
-        actual_device++;
-        device = read_byte(ebda_seg, &EbdaData->ata.hdidmap[actual_device]);
+        {
+            if (scsi_ctrl_printed == 0)
+            {
+                printf("\n\nSCSI controller:\n");
+                scsi_ctrl_printed = 1;
+            }
+
+            printf("\n    %d) Hard disk", hd_curr+1);
+
+        }
     }
 
-    if ((first_ctrl_printed == 0) && (second_ctrl_printed == 0))
+    if (   (ide_ctrl_printed == 0)
+        && (sata_ctrl_printed == 0)
+        && (scsi_ctrl_printed == 0))
         printf("No hard disks found");
 
@@ -316 +330 @@
 {
     Bit16u ebda_seg=read_word(0x0040,0x000E);
-    Bit8u actual_device;
-    Bit8u detected_devices = 0;
-
-    for (actual_device = 0; actual_device < BX_MAX_ATA_DEVICES; actual_device++)
-    {
-        Bit8u device = read_byte(ebda_seg, &EbdaData->ata.hdidmap[actual_device]);
-
-        if (device < BX_MAX_ATA_DEVICES)
-        {
-            scode--;
-            if (scode == 0x01)
-                return actual_device;
-        }
-    }
+
+    /* Check that the scan code is in the range of detected hard disks. */
+    Bit8u hd_count = read_byte(ebda_seg, &EbdaData->ata.hdcount);
+
+    /* The key '1' has scancode 0x02 which represents the first disk */
+    scode -= 2;
+
+    if (scode < hd_count)
+        return scode;
 
     /* Scancode is higher than number of available devices */
-    return 0x08;
+    return 0xff;
 }
 
@@ -472 +481 @@
 
                     /*
-                     * We support a maximum of 8 boot drives.
-                     * If this value is bigger than 7 not all
-                     * values are used and the user pressed
-                     * and invalid key.
-                     * Wait for the next pressed key.
+                     * 0xff indicates that there is no mapping
+                     * from the scan code to a hard drive.
+                     * Wait for next keystroke.
                      */
-                    if (boot_drive > 7)
+                    if (boot_drive == 0xff)
                         continue;
 

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

@@ -220 +220 @@
 
 #ifdef VBOX_WITH_SCSI
-#    define BX_MAX_SCSI_DEVICES 2
+/* Enough for now */
+#    define BX_MAX_SCSI_DEVICES 4
+
+/* A SCSI device starts always at BX_MAX_ATA_DEVICES. */
+#    define VBOX_IS_SCSI_DEVICE(device_id) (device_id >= BX_MAX_ATA_DEVICES)
+#    define VBOX_GET_SCSI_DEVICE(device_id) (device_id - BX_MAX_ATA_DEVICES)
 #endif