Changeset 66192 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 22, 2017 12:45:37 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

114104

Message:

VD,pdmstorageifs.h: Move media descriptor related definitions to an extra header and include/use that for the PDMIMEDIA interface to avoid duplicating them in several places

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvHostBase.cpp (modified) (4 diffs)
• DrvVD.cpp (modified) (5 diffs)

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

@@ -358 +358 @@
 static DECLCALLBACK(int) drvHostBaseQueryRegionProperties(PPDMIMEDIA pInterface, uint32_t uRegion, uint64_t *pu64LbaStart,
                                                           uint64_t *pcBlocks, uint64_t *pcbBlock,
-                                                          PPDMMEDIAREGIONDATAFORM penmDataForm)
+                                                          PVDREGIONDATAFORM penmDataForm)
 {
     LogFlowFunc(("\n"));
@@ -384 +384 @@
                 *pcbBlock = cbBlock;
             if (penmDataForm)
-                *penmDataForm = PDMMEDIAREGIONDATAFORM_RAW;
+                *penmDataForm = VDREGIONDATAFORM_RAW;
         }
     }
@@ -397 +397 @@
 static DECLCALLBACK(int) drvHostBaseQueryRegionPropertiesForLba(PPDMIMEDIA pInterface, uint64_t u64LbaStart,
                                                                 uint64_t *pcBlocks, uint64_t *pcbBlock,
-                                                                PPDMMEDIAREGIONDATAFORM penmDataForm)
+                                                                PVDREGIONDATAFORM penmDataForm)
 {
     LogFlowFunc(("\n"));
@@ -421 +421 @@
             *pcbBlock = cbBlock;
         if (penmDataForm)
-            *penmDataForm = PDMMEDIAREGIONDATAFORM_RAW;
+            *penmDataForm = VDREGIONDATAFORM_RAW;
     }
     else

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

@@ -537 +537 @@
 }
 
-/**
- * Converts from VD region data form enum to the PDM variant.
- *
- * @returns PDM media region data form.
- * @param   enmDataForm         The VD region data form.
- */
-static PDMMEDIAREGIONDATAFORM drvvdVDRegionForm2PdmDataForm(VDREGIONDATAFORM enmDataForm)
-{
-    switch (enmDataForm)
-    {
-        #define VDDATAFORM2PDM(tag) case VDREGIONDATAFORM_##tag: return PDMMEDIAREGIONDATAFORM_##tag
-
-        VDDATAFORM2PDM(INVALID);
-        VDDATAFORM2PDM(RAW);
-        VDDATAFORM2PDM(CDDA);
-        VDDATAFORM2PDM(CDDA_PAUSE);
-        VDDATAFORM2PDM(MODE1_2048);
-        VDDATAFORM2PDM(MODE1_2352);
-        VDDATAFORM2PDM(MODE1_0);
-        VDDATAFORM2PDM(XA_2336);
-        VDDATAFORM2PDM(XA_2352);
-        VDDATAFORM2PDM(XA_0);
-        VDDATAFORM2PDM(MODE2_2336);
-        VDDATAFORM2PDM(MODE2_2352);
-        VDDATAFORM2PDM(MODE2_0);
-
-        #undef VDDATAFORM2PDM
-
-        default:
-        {
-            AssertMsgFailed(("Unknown data form %d! forgot to add it to the switch?\n", enmDataForm));
-            return PDMMEDIAREGIONDATAFORM_INVALID;
-        }
-    }
-}
-
 /*********************************************************************************************************************************
 *   Error reporting callback                                                                                                     *
@@ -2531 +2495 @@
 static DECLCALLBACK(int) drvvdQueryRegionProperties(PPDMIMEDIA pInterface, uint32_t uRegion, uint64_t *pu64LbaStart,
                                                     uint64_t *pcBlocks, uint64_t *pcbBlock,
-                                                    PPDMMEDIAREGIONDATAFORM penmDataForm)
+                                                    PVDREGIONDATAFORM penmDataForm)
 {
     LogFlowFunc(("\n"));
@@ -2549 +2513 @@
             *pcbBlock = pRegion->cbBlock;
         if (penmDataForm)
-            *penmDataForm = drvvdVDRegionForm2PdmDataForm(pRegion->enmDataForm);
+            *penmDataForm = pRegion->enmDataForm;
     }
     else
@@ -2561 +2525 @@
 static DECLCALLBACK(int) drvvdQueryRegionPropertiesForLba(PPDMIMEDIA pInterface, uint64_t u64LbaStart,
                                                           uint64_t *pcBlocks, uint64_t *pcbBlock,
-                                                          PPDMMEDIAREGIONDATAFORM penmDataForm)
+                                                          PVDREGIONDATAFORM penmDataForm)
 {
     LogFlowFunc(("\n"));
@@ -2588 +2552 @@
                     *pcbBlock = pRegion->cbBlock;
                 if (penmDataForm)
-                    *penmDataForm = drvvdVDRegionForm2PdmDataForm(pRegion->enmDataForm);
+                    *penmDataForm = pRegion->enmDataForm;
 
                 rc = VINF_SUCCESS;