Changeset 2334

Timestamp:

04/25/07 11:19:53 (2 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.

Files:

• 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);
-RT_MIN(s->cCHSCylinders, 16383)
+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 */
-RT_MIN(s->cCHSCylinders, 16383)
+s->cCHSCylinders
-    p[55] = RT_H2LE_U16(s->cCHSHeads);
-    p[56] = RT_H2LE_U16(s->cCHSSectors);
-RT_MIN(s->cCHSCylinders, 16383)
-RT_MIN(s->cCHSCylinders, 16383)
+s->cCHSCylinders
+s->cCHSCylinders
-    if (s->cMultSectors)
-        p[59] = RT_H2LE_U16(0x100 | s->cMultSectors);
@@ -3691 +3691 @@
-            cCHSHeads = iEndHead + 1;
-            cCHSSectors = iEndSector;
-s->cTotalSectors / (cCHSHeads * cCHSSectors
+RT_MIN(s->cTotalSectors / (cCHSHeads * cCHSSectors), 16383
-            if (cCHSCylinders >= 1)
-            {
@@ -3697 +3697 @@
-                *pcSectors = cCHSSectors;
-                *pcCylinders = cCHSCylinders;
-
+probed 
-                return VINF_SUCCESS;
-            }
@@ -5277 +5277 @@
-                    if (pIf->cCHSSectors == 63 && (pIf->cCHSHeads != 16 || pIf->cCHSCylinders >= 1024))
-                    {
-pIf->cTotalSectors / 63 / 16
+RT_MIN(pIf->cTotalSectors / 63 / 16, 16383)
-                        pIf->cCHSHeads = 16;
-                        pIf->cCHSSectors = 63;
@@ -5303 +5303 @@
-            {
-                uint64_t cCHSCylinders = pIf->cTotalSectors / (16 * 63);
-AX(cCHSCylinders, 1
+IN(RT_MAX(cCHSCylinders, 1), 16383
-                pIf->cCHSHeads = 16;
-                pIf->cCHSSectors = 63;