Changeset 2334 in vbox for trunk

Timestamp:

Apr 25, 2007 9:19:53 AM (18 years ago)

Author:

vboxsync

Message:

Do the 16383 cylinder clipping earlier (again). Needed for the new
virtual disk support which needs the clipped geometry everywhere.

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -1055 +1055 @@
     memset(p, 0, 512);
     p[0] = RT_H2LE_U16(0x0040);
-    p[1] = RT_H2LE_U16(RT_MIN(s->cCHSCylinders, 16383));
+    p[1] = RT_H2LE_U16(s->cCHSCylinders);
     p[3] = RT_H2LE_U16(s->cCHSHeads);
     /* Block size; obsolete, but required for the BIOS. */
@@ -1075 +1075 @@
     p[52] = RT_H2LE_U16(240); /* DMA transfer cycle */
     p[53] = RT_H2LE_U16(1 | 1 << 1 | 1 << 2); /* words 54-58,64-70,88 valid */
-    p[54] = RT_H2LE_U16(RT_MIN(s->cCHSCylinders, 16383));
+    p[54] = RT_H2LE_U16(s->cCHSCylinders);
     p[55] = RT_H2LE_U16(s->cCHSHeads);
     p[56] = RT_H2LE_U16(s->cCHSSectors);
-    p[57] = RT_H2LE_U16(RT_MIN(s->cCHSCylinders, 16383) * s->cCHSHeads * s->cCHSSectors);
-    p[58] = RT_H2LE_U16(RT_MIN(s->cCHSCylinders, 16383) * s->cCHSHeads * s->cCHSSectors >> 16);
+    p[57] = RT_H2LE_U16(s->cCHSCylinders * s->cCHSHeads * s->cCHSSectors);
+    p[58] = RT_H2LE_U16(s->cCHSCylinders * s->cCHSHeads * s->cCHSSectors >> 16);
     if (s->cMultSectors)
         p[59] = RT_H2LE_U16(0x100 | s->cMultSectors);
@@ -3691 +3691 @@
             cCHSHeads = iEndHead + 1;
             cCHSSectors = iEndSector;
-            cCHSCylinders = s->cTotalSectors / (cCHSHeads * cCHSSectors);
+            cCHSCylinders = RT_MIN(s->cTotalSectors / (cCHSHeads * cCHSSectors), 16383);
             if (cCHSCylinders >= 1)
             {
@@ -3697 +3697 @@
                 *pcSectors = cCHSSectors;
                 *pcCylinders = cCHSCylinders;
-                Log(("%s: LCHS=%d %d %d\n", __FUNCTION__, cCHSCylinders, cCHSHeads, cCHSSectors));
+                Log(("%s: probed LCHS=%d %d %d\n", __FUNCTION__, cCHSCylinders, cCHSHeads, cCHSSectors));
                 return VINF_SUCCESS;
             }
@@ -5277 +5277 @@
                     if (pIf->cCHSSectors == 63 && (pIf->cCHSHeads != 16 || pIf->cCHSCylinders >= 1024))
                     {
-                        pIf->cCHSCylinders = pIf->cTotalSectors / 63 / 16;
+                        pIf->cCHSCylinders = RT_MIN(pIf->cTotalSectors / 63 / 16, 16383);
                         pIf->cCHSHeads = 16;
                         pIf->cCHSSectors = 63;
@@ -5303 +5303 @@
             {
                 uint64_t cCHSCylinders = pIf->cTotalSectors / (16 * 63);
-                pIf->cCHSCylinders = (uint32_t)RT_MAX(cCHSCylinders, 1);
+                pIf->cCHSCylinders = (uint32_t)RT_MIN(RT_MAX(cCHSCylinders, 1), 16383);
                 pIf->cCHSHeads = 16;
                 pIf->cCHSSectors = 63;