Changeset 43483 in vbox for trunk/src/VBox/Devices/PC/BIOS/ahci.c

Timestamp:

Oct 1, 2012 10:13:16 AM (12 years ago)

Author:

vboxsync

Message:

BIOS: Build default logical geometry if none was provided in CMOS.

File:

• trunk/src/VBox/Devices/PC/BIOS/ahci.c (modified) (3 diffs)

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

@@ -608 +608 @@
 }
 
-static void ahci_port_detect_device(ahci_t __far *ahci, uint8_t u8Port)
+void ahci_port_detect_device(ahci_t __far *ahci, uint8_t u8Port)
 {
     uint32_t            val;
@@ -651 +651 @@
                 uint32_t    sectors;
                 uint16_t    cylinders, heads, spt;
-                uint16_t    lcylinders, lheads, lspt;
+                chs_t       lgeo;
                 uint8_t     idxCmosChsBase;
 
@@ -711 +711 @@
                 if (idxCmosChsBase && inb_cmos(idxCmosChsBase+7))
                 {
-                    lcylinders = inb_cmos(idxCmosChsBase + 0) + (inb_cmos(idxCmosChsBase + 1) << 8);
-                    lheads     = inb_cmos(idxCmosChsBase + 2);
-                    lspt       = inb_cmos(idxCmosChsBase + 7);
+                    lgeo.cylinders = inb_cmos(idxCmosChsBase + 0) + (inb_cmos(idxCmosChsBase + 1) << 8);
+                    lgeo.heads     = inb_cmos(idxCmosChsBase + 2);
+                    lgeo.spt       = inb_cmos(idxCmosChsBase + 7);
                 }
                 else
-                {
-                    //@todo: What should we really do if logical geometry isn't in the CMOS?
-                    lcylinders = cylinders;
-                    lheads     = heads;
-                    lspt       = spt;
-                }
+                    set_geom_lba(&lgeo, sectors);   /* Default EDD-style translated LBA geometry. */
+
                 BX_INFO("AHCI %d-P#%d: PCHS=%u/%d/%d LCHS=%u/%u/%u %ld sectors\n", devcount_ahci,
-                        u8Port, cylinders, heads, spt, lcylinders, lheads, lspt, sectors);
-
-                bios_dsk->devices[hd_index].lchs.heads     = lheads;
-                bios_dsk->devices[hd_index].lchs.cylinders = lcylinders;
-                bios_dsk->devices[hd_index].lchs.spt       = lspt;
+                        u8Port, cylinders, heads, spt, lgeo.cylinders, lgeo.heads, lgeo.spt, sectors);
+
+                bios_dsk->devices[hd_index].lchs = lgeo;
 
                 /* Store the ID of the disk in the BIOS hdidmap. */