Changeset 59250 in vbox

Timestamp:

Jan 4, 2016 2:24:32 PM (9 years ago)

Author:

vboxsync

Message:

Build fix

Location:

trunk/src/VBox/Devices/Storage

Files:

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

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

@@ -175 +175 @@
                 0, 0, 0, 0, 0
             };
-            rc = DRVHostBaseScsiCmd(pThis, abCmd, 12, PDMBLOCKTXDIR_FROM_DEVICE, pvBuf, &cbRead32, NULL, 0, 0);
+            rc = DRVHostBaseScsiCmd(pThis, abCmd, 12, PDMMEDIATXDIR_FROM_DEVICE, pvBuf, &cbRead32, NULL, 0, 0);
 
             off    += cbRead32;
@@ -700 +700 @@
                     0,0,0,0,0,0,0,0,0,0
                 };
-                DRVHostBaseScsiCmd(pThis, abCmd, 6, PDMBLOCKTXDIR_NONE, NULL, NULL, NULL, 0, 0);
+                DRVHostBaseScsiCmd(pThis, abCmd, 6, PDMMEDIATXDIR_NONE, NULL, NULL, NULL, 0, 0);
             }
             return VINF_SUCCESS;
@@ -1167 +1167 @@
         0,0,0,0,0,0,0,0,0
     };
-    int rc = DRVHostBaseScsiCmd(pThis, abCmd, 6, PDMBLOCKTXDIR_FROM_DEVICE, &Buf, &cbBuf, NULL, 0, 0);
+    int rc = DRVHostBaseScsiCmd(pThis, abCmd, 6, PDMMEDIATXDIR_FROM_DEVICE, &Buf, &cbBuf, NULL, 0, 0);
     if (RT_SUCCESS(rc))
     {
@@ -1238 +1238 @@
  * @param cbCmd             The size of the SCSI command.
  * @param enmTxDir          The transfer direction.
- * @param pvBuf             The buffer. Can be NULL if enmTxDir is PDMBLOCKTXDIR_NONE.
+ * @param pvBuf             The buffer. Can be NULL if enmTxDir is PDMMEDIATXDIR_NONE.
  * @param pcbBuf            Where to get the buffer size from and put the actual transfer size. Can be NULL.
  * @param pbSense           Where to put the sense data. Can be NULL.
@@ -1250 +1250 @@
  * @todo Fix VERR_UNRESOLVED_ERROR abuse.
  */
-DECLCALLBACK(int) DRVHostBaseScsiCmd(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMBLOCKTXDIR enmTxDir,
+DECLCALLBACK(int) DRVHostBaseScsiCmd(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMMEDIATXDIR enmTxDir,
                                      void *pvBuf, uint32_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies)
 {
@@ -1256 +1256 @@
      * Minimal input validation.
      */
-    Assert(enmTxDir == PDMBLOCKTXDIR_NONE || enmTxDir == PDMBLOCKTXDIR_FROM_DEVICE || enmTxDir == PDMBLOCKTXDIR_TO_DEVICE);
+    Assert(enmTxDir == PDMMEDIATXDIR_NONE || enmTxDir == PDMMEDIATXDIR_FROM_DEVICE || enmTxDir == PDMMEDIATXDIR_TO_DEVICE);
     Assert(!pvBuf || pcbBuf);
-    Assert(pvBuf || enmTxDir == PDMBLOCKTXDIR_NONE);
+    Assert(pvBuf || enmTxDir == PDMMEDIATXDIR_NONE);
     Assert(pbSense || !cbSense);
     AssertPtr(pbCmd);
@@ -1282 +1282 @@
 
         /* Setup the buffer. */
-        if (enmTxDir == PDMBLOCKTXDIR_NONE)
+        if (enmTxDir == PDMMEDIATXDIR_NONE)
             irc = (*ppScsiTaskI)->SetScatterGatherEntries(ppScsiTaskI, NULL, 0, 0, kSCSIDataTransfer_NoDataTransfer);
         else
@@ -1288 +1288 @@
             IOVirtualRange Range = { (IOVirtualAddress)pvBuf, cbBuf };
             irc = (*ppScsiTaskI)->SetScatterGatherEntries(ppScsiTaskI, &Range, 1, cbBuf,
-                                                          enmTxDir == PDMBLOCKTXDIR_FROM_DEVICE
+                                                          enmTxDir == PDMMEDIATXDIR_FROM_DEVICE
                                                           ? kSCSIDataTransfer_FromTargetToInitiator
                                                           : kSCSIDataTransfer_FromInitiatorToTarget);
@@ -1327 +1327 @@
         else
         {
-            rc = enmTxDir == PDMBLOCKTXDIR_NONE
+            rc = enmTxDir == PDMMEDIATXDIR_NONE
                ? VERR_DEV_IO_ERROR
-               : enmTxDir == PDMBLOCKTXDIR_FROM_DEVICE
+               : enmTxDir == PDMMEDIATXDIR_FROM_DEVICE
                ? VERR_READ_ERROR
                : VERR_WRITE_ERROR;
@@ -1379 +1379 @@
 
         /* Set direction. */
-        if (enmTxDir == PDMBLOCKTXDIR_NONE)
+        if (enmTxDir == PDMMEDIATXDIR_NONE)
             fFlags = CAM_DIR_NONE;
-        else if (enmTxDir == PDMBLOCKTXDIR_FROM_DEVICE)
+        else if (enmTxDir == PDMMEDIATXDIR_FROM_DEVICE)
             fFlags = CAM_DIR_IN;
         else

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

@@ -185 +185 @@
 DECLCALLBACK(void) DRVHostBaseDestruct(PPDMDRVINS pDrvIns);
 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
-DECLCALLBACK(int) DRVHostBaseScsiCmd(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMBLOCKTXDIR enmTxDir,
+DECLCALLBACK(int) DRVHostBaseScsiCmd(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMMEDIATXDIR enmTxDir,
                                      void *pvBuf, uint32_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies);
 #endif