Changeset 19974 in vbox

Timestamp:

May 24, 2009 5:57:46 PM (16 years ago)

Author:

vboxsync

Message:

HostDVD/FreeBSD: Take the 64kb limit into account when reading from the disc in non SCSI passthrough mode

File:

• trunk/src/VBox/Devices/Storage/DrvHostBase.cpp (modified) (1 diff)

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

@@ -162 +162 @@
          * Issue a READ(12) request.
          */
-        const uint32_t  LBA       = off / pThis->cbBlock;
-        AssertReturn(!(off % pThis->cbBlock), VERR_INVALID_PARAMETER);
-        uint32_t        cbRead32  = (uint32_t)cbRead;
-        const uint32_t  cBlocks   = cbRead32 / pThis->cbBlock;
-        AssertReturn(!(cbRead % pThis->cbBlock), VERR_INVALID_PARAMETER);
-        uint8_t         abCmd[16] =
-        {
-            SCSI_READ_12, 0,
-            RT_BYTE4(LBA),     RT_BYTE3(LBA),     RT_BYTE2(LBA),     RT_BYTE1(LBA),
-            RT_BYTE4(cBlocks), RT_BYTE3(cBlocks), RT_BYTE2(cBlocks), RT_BYTE1(cBlocks),
-            0, 0, 0, 0, 0
-        };
-        rc = DRVHostBaseScsiCmd(pThis, abCmd, 12, PDMBLOCKTXDIR_FROM_DEVICE, pvBuf, &cbRead32, NULL, 0, 0);
+        do
+        {
+            const uint32_t  LBA       = off / pThis->cbBlock;
+            AssertReturn(!(off % pThis->cbBlock), VERR_INVALID_PARAMETER);
+            uint32_t        cbRead32  =   cbRead > SCSI_MAX_BUFFER_SIZE
+                                        ? SCSI_MAX_BUFFER_SIZE
+                                        : (uint32_t)cbRead;
+            const uint32_t  cBlocks   = cbRead32 / pThis->cbBlock;
+            AssertReturn(!(cbRead % pThis->cbBlock), VERR_INVALID_PARAMETER);
+            uint8_t         abCmd[16] =
+            {
+                SCSI_READ_12, 0,
+                RT_BYTE4(LBA),     RT_BYTE3(LBA),     RT_BYTE2(LBA),     RT_BYTE1(LBA),
+                RT_BYTE4(cBlocks), RT_BYTE3(cBlocks), RT_BYTE2(cBlocks), RT_BYTE1(cBlocks),
+                0, 0, 0, 0, 0
+            };
+            rc = DRVHostBaseScsiCmd(pThis, abCmd, 12, PDMBLOCKTXDIR_FROM_DEVICE, pvBuf, &cbRead32, NULL, 0, 0);
+
+            off    += cbRead32;
+            cbRead -= cbRead32;
+            pvBuf   = (uint8_t *)pvBuf + cbRead32;
+        } while ((cbRead > 0) && RT_SUCCESS(rc)); 
 
 #else