Changeset 47830 in vbox

Timestamp:

Aug 18, 2013 12:33:32 PM (11 years ago)

Author:

vboxsync

Message:

Devices/Storage: Missing changes

Location:

trunk

Files:

• include/VBox/vscsi.h (modified) (1 diff)
• src/VBox/Devices/Storage/DevATA.cpp (modified) (2 diffs)

trunk/include/VBox/vscsi.h

@@ -122 +122 @@
 
     /**
+     * Retrieve the sector size of the underlying medium.
+     *
+     * @returns VBox status status code.
+     * @param   hVScsiLun        Virtual SCSI LUN handle.
+     * @param   pvScsiLunUser    Opaque user data which may
+     *                           be used to identify the medium.
+     * @param   pcbSectorSize    Where to store the sector size of the
+     *                           medium.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnVScsiLunMediumGetSectorSize, (VSCSILUN hVScsiLun,
+                                                              void *pvScsiLunUser,
+                                                              uint32_t *pcbSectorSize));
+
+    /**
      * Set the lock state of the underlying medium.
      *

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

@@ -1256 +1256 @@
     p[67] = RT_H2LE_U16(120); /* minimum PIO cycle time without flow control */
     p[68] = RT_H2LE_U16(120); /* minimum PIO cycle time with IORDY flow control */
-    if (s->pDrvBlock->pfnDiscard)
+    if (   s->pDrvBlock->pfnDiscard
+        || s->cbSector != 512)
     {
         p[80] = RT_H2LE_U16(0x1f0); /* support everything up to ATA/ATAPI-8 ACS */
@@ -1287 +1288 @@
         p[103] = RT_H2LE_U16(s->cTotalSectors >> 48);
     }
+
+    if (s->cbSector != 512)
+    {
+        /* Enable reporting of logical sector size. */
+        p[106] |= RT_H2LE_U16(RT_BIT(12));
+        p[117] = RT_H2LE_U16(s->cbSector);
+        p[118] = RT_H2LE_U16(s->cbSector >> 16);
+    }
+
     if (s->pDrvBlock->pfnDiscard) /** @todo: Set bit 14 in word 69 too? (Deterministic read after TRIM). */
         p[169] = RT_H2LE_U16(1); /* DATA SET MANAGEMENT command supported. */