Changeset 59257 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jan 5, 2016 4:02:24 PM (9 years ago)

Author:

vboxsync

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

104890

Message:

HDA: Fixes/logging for SSM handling.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevIchHda.cpp (modified) (8 diffs)
• DevIchHdaCodec.cpp (modified) (1 diff)

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

@@ -1466 +1466 @@
     AssertPtrReturn(pStrmSt, VERR_INVALID_POINTER);
 
-#ifdef VBOX_STRICT
-    AssertReleaseMsg(!RT_BOOL(HDA_STREAM_REG(pThis, CTL, u8Strm) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN)),
-                     ("Cannot initialize stream %RU8 while in running state\n", u8Strm));
-#endif
-
     pStrmSt->u8Strm     = u8Strm;
     pStrmSt->u64BaseDMA = RT_MAKE_U64(HDA_STREAM_REG(pThis, BDPL, u8Strm),
@@ -3255 +3250 @@
         hdaStreamTransferUpdate(pThis, pStrmSt, cbProcessed);
 
-        cbToProcess      -= RT_MIN(cbToProcess,  cbProcessed);
+        cbToProcess      -= RT_MIN(cbToProcess, cbProcessed);
         cbProcessedTotal += cbProcessed;
 
@@ -3636 +3631 @@
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
-    LogFlowFunc(("uVersion=%RU32, uPass=%RU32\n", uVersion, uPass));
+    LogFlowFunc(("uVersion=%RU32, uPass=0x%x\n", uVersion, uPass));
 
     /*
@@ -3643 +3638 @@
     int rc = hdaCodecLoadState(pThis->pCodec, pSSM, uVersion);
     if (RT_FAILURE(rc))
+    {
+        LogRel(("HDA: Failed loading codec state (version %RU32, pass 0x%x), rc=%Rrc\n", uVersion, uPass, rc));
         return rc;
+    }
 
     /*
@@ -3682 +3680 @@
 
         default:
+            LogRel(("HDA: Unsupported / too new saved state version (%RU32)\n", uVersion));
             return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
     }
@@ -3829 +3828 @@
 
         default:
+            AssertReleaseFailed(); /* Never reached. */
             return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
     }
@@ -3839 +3839 @@
          * Update stuff after the state changes.
          */
-        bool fEnableIn    = RT_BOOL(HDA_SDCTL(pThis, 0) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
+        bool fEnableIn    = RT_BOOL(HDA_SDCTL(pThis, 0 /** @todo Use a define. */) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
 #ifdef VBOX_WITH_HDA_MIC_IN
-        bool fEnableMicIn = RT_BOOL(HDA_SDCTL(pThis, 2) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
+        bool fEnableMicIn = RT_BOOL(HDA_SDCTL(pThis, 2 /** @todo Use a define. */) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
 #else
         bool fEnableMicIn = fEnableIn; /* Mic In == Line In */
 #endif
-        bool fEnableOut   = RT_BOOL(HDA_SDCTL(pThis, 4) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
+        bool fEnableOut   = RT_BOOL(HDA_SDCTL(pThis, 4 /** @todo Use a define. */) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
 
         PHDADRIVER pDrv;
@@ -3868 +3868 @@
         pThis->u64DPBase   = RT_MAKE_U64(HDA_REG(pThis, DPLBASE), HDA_REG(pThis, DPUBASE));
     }
+    else
+        LogRel(("HDA: Failed loading device state (version %RU32, pass 0x%x), rc=%Rrc\n", uVersion, uPass, rc));
 
     LogFlowFuncLeaveRC(rc);

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

@@ -2664 +2664 @@
         /* Since version 4 a flexible node count is supported. */
         case HDA_SSM_VERSION_4:
+        case HDA_SSM_VERSION_5:
         case HDA_SSM_VERSION:
         {