Changeset 82252 in vbox for trunk/src/VBox/Devices/Audio/HDACodec.cpp

Timestamp:

Nov 27, 2019 9:31:53 PM (5 years ago)

Author:

vboxsync

Message:

vmm/pdmaudioifs.h: Style, docs and other nits. First, it's always _FLAGS_ never _FLAG_. Second, enums generally should start with _INVALID = 0 to ensure we don't mistake zero-initialized memory for valid data. Struct member names shall be indented on a tab (+4) boundrary. PDM is part of the VMM, so it follows the VMM coding guidelines strictly. Skip the 'Structure for keeping a ... around' fluff, the first sentence of a structure (or anything else for that matter) documentation shall be brief and to the point. It is automatically turned into a @brief. Furthermore, additional text should be a separate paragraph as it provides details the reader doesn't necessarily need to read. bugref:9218

File:

• trunk/src/VBox/Devices/Audio/HDACodec.cpp (modified) (3 diffs)

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

@@ -3127 +3127 @@
 int hdaCodecLoadState(PHDACODEC pThis, PSSMHANDLE pSSM, uint32_t uVersion)
 {
-    int rc = VINF_SUCCESS;
-
     PCSSMFIELD pFields = NULL;
     uint32_t   fFlags  = 0;
@@ -3154 +3152 @@
             int rc2 = SSMR3GetU32(pSSM, &cNodes);
             AssertRCReturn(rc2, rc2);
-            if (cNodes != 0x1c)
-                return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
+            AssertReturn(cNodes == 0x1c, VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
             AssertReturn(pThis->cTotalNodes == 0x1c, VERR_INTERNAL_ERROR);
 
@@ -3164 +3161 @@
 
         default:
-            rc = VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-            break;
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        for (unsigned idxNode = 0; idxNode < pThis->cTotalNodes; ++idxNode)
-        {
-            uint8_t idOld = pThis->paNodes[idxNode].SavedState.Core.uID;
-            int rc2 = SSMR3GetStructEx(pSSM, &pThis->paNodes[idxNode].SavedState,
-                                       sizeof(pThis->paNodes[idxNode].SavedState),
-                                       fFlags, pFields, NULL);
-            if (RT_SUCCESS(rc))
-                rc = rc2;
-
-            if (RT_FAILURE(rc))
-                break;
-
-            AssertLogRelMsgReturn(idOld == pThis->paNodes[idxNode].SavedState.Core.uID,
-                                  ("loaded %#x, expected %#x\n", pThis->paNodes[idxNode].SavedState.Core.uID, idOld),
-                                  VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
-        }
-
-        if (RT_SUCCESS(rc))
-        {
-            /*
-             * Update stuff after changing the state.
-             */
-            PCODECNODE pNode;
-            if (hdaCodecIsDacNode(pThis, pThis->u8DacLineOut))
-            {
-                pNode = &pThis->paNodes[pThis->u8DacLineOut];
-                hdaCodecToAudVolume(pThis, pNode, &pNode->dac.B_params, PDMAUDIOMIXERCTL_FRONT);
-            }
-            else if (hdaCodecIsSpdifOutNode(pThis, pThis->u8DacLineOut))
-            {
-                pNode = &pThis->paNodes[pThis->u8DacLineOut];
-                hdaCodecToAudVolume(pThis, pNode, &pNode->spdifout.B_params, PDMAUDIOMIXERCTL_FRONT);
-            }
-
-            pNode = &pThis->paNodes[pThis->u8AdcVolsLineIn];
-            hdaCodecToAudVolume(pThis, pNode, &pNode->adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
-        }
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+            AssertFailedReturn(VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
+    }
+
+    for (unsigned idxNode = 0; idxNode < pThis->cTotalNodes; ++idxNode)
+    {
+        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);
+        AssertRCReturn(rc, rc);
+        AssertLogRelMsgReturn(idOld == pThis->paNodes[idxNode].SavedState.Core.uID,
+                              ("loaded %#x, expected %#x\n", pThis->paNodes[idxNode].SavedState.Core.uID, idOld),
+                              VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
+    }
+
+    /*
+     * Update stuff after changing the state.
+     */
+    PCODECNODE pNode;
+    if (hdaCodecIsDacNode(pThis, pThis->u8DacLineOut))
+    {
+        pNode = &pThis->paNodes[pThis->u8DacLineOut];
+        hdaCodecToAudVolume(pThis, pNode, &pNode->dac.B_params, PDMAUDIOMIXERCTL_FRONT);
+    }
+    else if (hdaCodecIsSpdifOutNode(pThis, pThis->u8DacLineOut))
+    {
+        pNode = &pThis->paNodes[pThis->u8DacLineOut];
+        hdaCodecToAudVolume(pThis, pNode, &pNode->spdifout.B_params, PDMAUDIOMIXERCTL_FRONT);
+    }
+
+    pNode = &pThis->paNodes[pThis->u8AdcVolsLineIn];
+    hdaCodecToAudVolume(pThis, pNode, &pNode->adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
+
+    LogFlowFuncLeaveRC(VINF_SUCCESS);
+    return VINF_SUCCESS;
 }