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

Timestamp:

Dec 1, 2019 1:25:09 AM (5 years ago)

Author:

vboxsync

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

135133

Message:

DevHDA: Missed some SSMR3 -> devhlp conversions. bugref:9218

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (2 diffs)
• HDACodec.cpp (modified) (3 diffs)
• HDACodec.h (modified) (1 diff)

trunk/src/VBox/Devices/Audio/DevHDA.cpp

@@ -3610 +3610 @@
 
     /* Save Codec nodes states. */
-    hdaCodecSaveState(pThis->pCodec, pSSM);
+    hdaCodecSaveState(pDevIns, pThis->pCodec, pSSM);
 
     /* Save MMIO registers. */
@@ -3938 +3938 @@
      * Load Codec nodes states.
      */
-    int rc = hdaCodecLoadState(pThis->pCodec, pSSM, uVersion);
+    int rc = hdaCodecLoadState(pDevIns, pThis->pCodec, pSSM, uVersion);
     if (RT_FAILURE(rc))
     {

trunk/src/VBox/Devices/Audio/HDACodec.cpp

@@ -3114 +3114 @@
 }
 
-int hdaCodecSaveState(PHDACODEC pThis, PSSMHANDLE pSSM)
-{
+int hdaCodecSaveState(PPDMDEVINS pDevIns, PHDACODEC pThis, PSSMHANDLE pSSM)
+{
+    PCPDMDEVHLPR3 pHlp = pDevIns->pHlpR3;
     AssertLogRelMsgReturn(pThis->cTotalNodes == STAC9221_NUM_NODES, ("cTotalNodes=%#x, should be 0x1c", pThis->cTotalNodes),
                           VERR_INTERNAL_ERROR);
-    SSMR3PutU32(pSSM, pThis->cTotalNodes);
+    pHlp->pfnSSMPutU32(pSSM, pThis->cTotalNodes);
     for (unsigned idxNode = 0; idxNode < pThis->cTotalNodes; ++idxNode)
-        SSMR3PutStructEx(pSSM, &pThis->paNodes[idxNode].SavedState, sizeof(pThis->paNodes[idxNode].SavedState),
-                         0 /*fFlags*/, g_aCodecNodeFields, NULL /*pvUser*/);
-    return VINF_SUCCESS;
-}
-
-int hdaCodecLoadState(PHDACODEC pThis, PSSMHANDLE pSSM, uint32_t uVersion)
-{
+        pHlp->pfnSSMPutStructEx(pSSM, &pThis->paNodes[idxNode].SavedState, sizeof(pThis->paNodes[idxNode].SavedState),
+                                0 /*fFlags*/, g_aCodecNodeFields, NULL /*pvUser*/);
+    return VINF_SUCCESS;
+}
+
+int hdaCodecLoadState(PPDMDEVINS pDevIns, PHDACODEC pThis, PSSMHANDLE pSSM, uint32_t uVersion)
+{
+    PCPDMDEVHLPR3 pHlp = pDevIns->pHlpR3;
     PCSSMFIELD pFields = NULL;
     uint32_t   fFlags  = 0;
@@ -3133 +3135 @@
         /* Since version 4 a flexible node count is supported. */
         uint32_t cNodes;
-        int rc2 = SSMR3GetU32(pSSM, &cNodes);
+        int rc2 = pHlp->pfnSSMGetU32(pSSM, &cNodes);
         AssertRCReturn(rc2, rc2);
         AssertReturn(cNodes == 0x1c, VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
@@ -3159 +3161 @@
     {
         uint8_t idOld = pThis->paNodes[idxNode].SavedState.Core.uID;
-        int rc = SSMR3GetStructEx(pSSM, &pThis->paNodes[idxNode].SavedState,
-                                  sizeof(pThis->paNodes[idxNode].SavedState),
-                                  fFlags, pFields, NULL);
+        int rc = pHlp->pfnSSMGetStructEx(pSSM, &pThis->paNodes[idxNode].SavedState, sizeof(pThis->paNodes[idxNode].SavedState),
+                                         fFlags, pFields, NULL);
         AssertRCReturn(rc, rc);
         AssertLogRelMsgReturn(idOld == pThis->paNodes[idxNode].SavedState.Core.uID,

trunk/src/VBox/Devices/Audio/HDACodec.h

@@ -127 +127 @@
 void hdaCodecDestruct(PHDACODEC pThis);
 void hdaCodecPowerOff(PHDACODEC pThis);
-int hdaCodecSaveState(PHDACODEC pThis, PSSMHANDLE pSSM);
-int hdaCodecLoadState(PHDACODEC pThis, PSSMHANDLE pSSM, uint32_t uVersion);
+int hdaCodecSaveState(PPDMDEVINS pDevIns, PHDACODEC pThis, PSSMHANDLE pSSM);
+int hdaCodecLoadState(PPDMDEVINS pDevIns, PHDACODEC pThis, PSSMHANDLE pSSM, uint32_t uVersion);
 int hdaCodecAddStream(PHDACODEC pThis, PDMAUDIOMIXERCTL enmMixerCtl, PPDMAUDIOSTREAMCFG pCfg);
 int hdaCodecRemoveStream(PHDACODEC pThis, PDMAUDIOMIXERCTL enmMixerCtl);