Changeset 65108 in vbox

Timestamp:

Jan 4, 2017 2:07:09 PM (8 years ago)

Author:

vboxsync

Message:

Storage/Devices/ATAPIPassthrough: Make use of the new SCSI inline helpers and remove the the local inlines

File:

• trunk/src/VBox/Devices/Storage/ATAPIPassthrough.cpp (modified) (8 diffs)

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

@@ -24 +24 @@
 #include <VBox/cdefs.h>
 #include <VBox/scsi.h>
+#include <VBox/scsiinline.h>
 
 #include "ATAPIPassthrough.h"
@@ -111 +112 @@
 } TRACKLIST, *PTRACKLIST;
 
-DECLINLINE(uint16_t) atapiBE2H_U16(const uint8_t *pbBuf)
-{
-    return (pbBuf[0] << 8) | pbBuf[1];
-}
-
-
-DECLINLINE(uint32_t) atapiBE2H_U24(const uint8_t *pbBuf)
-{
-    return (pbBuf[0] << 16) | (pbBuf[1] << 8) | pbBuf[2];
-}
-
-
-DECLINLINE(uint32_t) atapiBE2H_U32(const uint8_t *pbBuf)
-{
-    return (pbBuf[0] << 24) | (pbBuf[1] << 16) | (pbBuf[2] << 8) | pbBuf[3];
-}
-
-DECLINLINE(int64_t) atapiMSF2LBA(const uint8_t *pbBuf)
-{
-    return ((int64_t)(pbBuf[0] * 60 + pbBuf[1]) * 75 + pbBuf[2]) - 150; /* 2 second pregap */
-}
 
 /**
@@ -247 +227 @@
     pTrack->enmMainDataForm = enmTrackDataForm;
     pTrack->enmSubChnDataForm = enmSubChnDataForm;
-    pTrack->iLbaStart = atapiMSF2LBA(&pbCueSheetEntry[5]);
+    pTrack->iLbaStart = scsiMSF2LBA(&pbCueSheetEntry[5]);
     if (pbCueSheetEntry[1] != 0xaa)
     {
         /* Calculate number of sectors from the next entry. */
-        int64_t iLbaNext = atapiMSF2LBA(&pbCueSheetEntry[5+8]);
+        int64_t iLbaNext = scsiMSF2LBA(&pbCueSheetEntry[5+8]);
         pTrack->cSectors = iLbaNext - pTrack->iLbaStart;
     }
@@ -273 +253 @@
 {
     int rc = VINF_SUCCESS;
-    unsigned cbCueSheet = atapiBE2H_U24(pbCDB + 6);
+    unsigned cbCueSheet = scsiBE2H_U24(pbCDB + 6);
     unsigned cTracks = cbCueSheet / 8;
 
@@ -318 +298 @@
     RT_NOREF(iTrack, cbBuffer); /** @todo unused parameters */
     int rc = VINF_SUCCESS;
-    unsigned cbToc = atapiBE2H_U16(pbBuf);
+    unsigned cbToc = scsiBE2H_U16(pbBuf);
     uint8_t iTrackFirst = pbBuf[2];
     unsigned cTracks;
@@ -342 +322 @@
             pTrack->enmSubChnDataForm = SUBCHNDATAFORM_0;
             if (fMSF)
-                pTrack->iLbaStart = atapiMSF2LBA(&pbBuf[4]);
+                pTrack->iLbaStart = scsiMSF2LBA(&pbBuf[4]);
             else
-                pTrack->iLbaStart = atapiBE2H_U32(&pbBuf[4]);
+                pTrack->iLbaStart = scsiBE2H_U32(&pbBuf[4]);
 
             if (pbBuf[2] != 0xaa)
@@ -352 +332 @@
 
                 if (fMSF)
-                    iLbaNext = atapiMSF2LBA(&pbBuf[4+8]);
+                    iLbaNext = scsiMSF2LBA(&pbBuf[4+8]);
                 else
-                    iLbaNext = atapiBE2H_U32(&pbBuf[4+8]);
+                    iLbaNext = scsiBE2H_U32(&pbBuf[4+8]);
 
                 pTrack->cSectors = iLbaNext - pTrack->iLbaStart;
@@ -373 +353 @@
 {
     int rc = VINF_SUCCESS;
-    uint16_t cbBuffer = atapiBE2H_U16(&pbCDB[7]);
+    uint16_t cbBuffer = scsiBE2H_U16(&pbCDB[7]);
     bool fMSF = (pbCDB[1] & 0x2) != 0;
     uint8_t uFmt = pbCDB[2] & 0xf;