Changeset 6879 in vbox

Timestamp:

Feb 10, 2008 11:41:03 PM (17 years ago)

Author:

vboxsync

Message:

BIOS: fix booting from more than 4 drives

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• logo.c (modified) (2 diffs)
• rombios.c (modified) (2 diffs)

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

@@ -586 +586 @@
 {
     Bit16u ebda_seg=read_word(0x0040,0x000E);
-    Bit8u actual_device;
-    Bit8u detected_devices = 0;
+    Bit8u actual_device = 0;
     Bit8u first_ctrl_printed = 0;
     Bit8u second_ctrl_printed = 0;
-
-    for (actual_device = 0; actual_device < BX_MAX_ATA_DEVICES; actual_device++)
+    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;
-        Bit8u device = read_byte(ebda_seg, &EbdaData->ata.devices[actual_device].device);
-
-        if (device == 0xff) /* logo.c is included before ATA_DEVICE_HD is defined */
-        {
-            if ((actual_device < 4) && (first_ctrl_printed == 0))
-            {
-                printf("IDE controller:\n");
-                first_ctrl_printed = 1;
-            }
-            else if ((actual_device >= 4) && (second_ctrl_printed == 0))
-            {
-                printf("AHCI controller:\n");
-                second_ctrl_printed = 1;
-            }
-
-            detected_devices++;
-
-            printf("\n    %d) ", detected_devices);
-
-            /* If actual_device bigger than or equal 4
-             * this is the next controller and
-             * the positions start at the beginning.
-             */
-            device_position = actual_device;
-            if (actual_device >= 4)
-                device_position -= 4;
-
-            if (device_position / 2)
-                printf("Secondary ");
-            else
-                printf("Primary ");
-
-            if (device_position % 2)
-                printf("Slave");
-            else
-                printf("Master");
-        }
+
+        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("Primary ");
+        else
+            printf("Secondary ");
+
+        if (device_position % 2)
+            printf("Slave");
+        else
+            printf("Master");
+
+        actual_device++;
+        device = read_byte(ebda_seg, &EbdaData->ata.hdidmap[actual_device]);
     }
 
@@ -645 +646 @@
     for (actual_device = 0; actual_device < BX_MAX_ATA_DEVICES; actual_device++)
     {
-        Bit8u device = read_byte(ebda_seg, &EbdaData->ata.devices[actual_device].device);
-
-        if (device == 0xff) /* logo.c is included before ATA_DEVICE_HD is defined */
-            detected_devices++;
-    }
-
-    if ((scode-0x01) <= detected_devices)
-        return scode-0x02;
+        Bit8u device = read_byte(ebda_seg, &EbdaData->ata.hdidmap[actual_device]);
+
+        if (device < BX_MAX_ATA_DEVICES)
+        {
+            scode--;
+            if (scode == 0x01)
+                return actual_device;
+        }
+    }
 
     /* Scancode is higher than number of available devices */

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

@@ -2371 +2371 @@
       sc = inb(iobase1+ATA_CB_SC);
       sn = inb(iobase1+ATA_CB_SN);
+
       if ((sc==0x01) && (sn==0x01)) {
         cl = inb(iobase1+ATA_CB_CL);
@@ -2452 +2453 @@
       else
       {
+          Bit32u temp_sectors = sectors;
+
+          //FIXME: only valid for LBA translation
+          lspt = 63;
+          temp_sectors /= 63;
+          lheads = temp_sectors / 1024;
+          if (lheads>128) lheads = 255;
+          else if (lheads>64) lheads = 128;
+          else if (lheads>32) lheads = 64;
+          else if (lheads>16) lheads = 32;
+          else lheads=16;
+          lcylinders = temp_sectors / lheads;
+
+          // clip to 1024 cylinders
+          if (lcylinders > 1024) lcylinders=1024;
+
+#if 0
           lcylinders = 0;
           lheads = 0;
           lspt = 0;
+#endif
       }
       BX_INFO("ata%d-%d: PCHS=%u/%d/%d LCHS=%u/%u/%u\n", channel, slave, cylinders, heads, spt, lcylinders, lheads, lspt);