Changeset 18436 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Mar 28, 2009 2:32:20 AM (16 years ago)

Author:

vboxsync

Message:

DrvHostBase.cpp/h: Grumble. forgot about this bugger.

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvHostBase.cpp (modified) (6 diffs)
• DrvHostBase.h (modified) (1 diff)

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

@@ -148 +148 @@
          * Issue a READ(12) request.
          */
-        const uint32_t LBA = off / pThis->cbBlock;
+        const uint32_t  LBA       = off / pThis->cbBlock;
         AssertReturn(!(off % pThis->cbBlock), VERR_INVALID_PARAMETER);
-        const uint32_t cBlocks = cbRead / pThis->cbBlock;
+        const uint32_t  cbRead32  = (uint32_t)cbRead32;
+        const uint32_t  cBlocks   = cbRead32 / pThis->cbBlock;
         AssertReturn(!(cbRead % pThis->cbBlock), VERR_INVALID_PARAMETER);
-        uint8_t abCmd[16] =
+        uint8_t         abCmd[16] =
         {
             SCSI_READ_12, 0,
@@ -159 +160 @@
             0, 0, 0, 0, 0
         };
-        rc = DRVHostBaseScsiCmd(pThis, abCmd, 12, PDMBLOCKTXDIR_FROM_DEVICE, pvBuf, &cbRead, NULL, 0, 0);
+        rc = DRVHostBaseScsiCmd(pThis, abCmd, 12, PDMBLOCKTXDIR_FROM_DEVICE, pvBuf, &cbRead32, NULL, 0, 0);
 
 #else
@@ -1044 +1045 @@
         uint32_t cBlocks;
         uint32_t cbBlock;
-    } Buf = {0, 0};
-    size_t cbBuf = sizeof(Buf);
-    uint8_t abCmd[16] =
+    }           Buf = {0, 0};
+    uint32_t    cbBuf = sizeof(Buf);
+    uint8_t     abCmd[16] =
     {
         SCSI_READ_CAPACITY, 0, 0, 0, 0, 0, 0,
@@ -1135 +1136 @@
  */
 DECLCALLBACK(int) DRVHostBaseScsiCmd(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMBLOCKTXDIR enmTxDir,
-                                     void *pvBuf, size_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies)
+                                     void *pvBuf, uint32_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies)
 {
     /*
@@ -1146 +1147 @@
     AssertPtr(pbCmd);
     Assert(cbCmd <= 16 && cbCmd >= 1);
-    const size_t cbBuf = pcbBuf ? *pcbBuf : 0;
+    const uint32_t cbBuf = pcbBuf ? *pcbBuf : 0;
     if (pcbBuf)
         *pcbBuf = 0;
@@ -1190 +1191 @@
         AssertBreak(irc == kIOReturnSuccess);
         if (pcbBuf)
-            *pcbBuf = cbReturned;
+            *pcbBuf = (int32_t)cbReturned;
 
         irc = (*ppScsiTaskI)->GetSCSIServiceResponse(ppScsiTaskI, &ServiceResponse);

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

@@ -178 +178 @@
 #ifdef RT_OS_DARWIN
 DECLCALLBACK(int) DRVHostBaseScsiCmd(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMBLOCKTXDIR enmTxDir,
-                                     void *pvBuf, size_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies);
+                                     void *pvBuf, uint32_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies);
 #endif