Changeset 59280 in vbox for trunk/src/VBox/Devices/Audio/DevIchHda.cpp

Timestamp:

Jan 7, 2016 6:02:33 PM (9 years ago)

Author:

vboxsync

Message:

Audio/HDA: Yet another fix for SSM handling.

File:

• trunk/src/VBox/Devices/Audio/DevIchHda.cpp (modified) (9 diffs)

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

@@ -55 +55 @@
 #define VBOX_WITH_INTEL_HDA
 
-#if (defined(DEBUG) && defined(DEBUG_andy))
+#ifdef DEBUG_andy
 /* Enables experimental support for separate mic-in handling.
    Do not enable this yet for regular builds, as this needs more testing first! */
-# define VBOX_WITH_HDA_MIC_IN
+//# define VBOX_WITH_HDA_MIC_IN
 #endif
 
@@ -3630 +3630 @@
 
     /* Save number of streams. */
+#ifdef VBOX_WITH_HDA_MIC_IN
     SSMR3PutU32(pSSM, 3);
+#else
+    SSMR3PutU32(pSSM, 2);
+#endif
 
     /* Save stream states. */
     int rc = hdaSaveStream(pDevIns, pSSM, &pThis->StrmStOut);
     AssertRCReturn(rc, rc);
+#ifdef VBOX_WITH_HDA_MIC_IN
     rc = hdaSaveStream(pDevIns, pSSM, &pThis->StrmStMicIn);
     AssertRCReturn(rc, rc);
+#endif
     rc = hdaSaveStream(pDevIns, pSSM, &pThis->StrmStLineIn);
     AssertRCReturn(rc, rc);
@@ -3808 +3814 @@
                 switch (uStreamID)
                 {
-                    case 0: /** @todo Use a define. */
+                    case 0: /** @todo Implement dynamic stream IDs. */
                         pStrm = &pThis->StrmStLineIn;
                         break;
-
-                    case 2: /** @todo Use a define. */
+#ifdef VBOX_WITH_HDA_MIC_IN
+                    case 2: /** @todo Implement dynamic stream IDs. */
                         pStrm = &pThis->StrmStMicIn;
                         break;
-
-                    case 4: /** @todo Use a define. */
+#endif
+                    case 4: /** @todo Implement dynamic stream IDs. */
                         pStrm = &pThis->StrmStOut;
                         break;
@@ -3829 +3835 @@
                 if (RT_FAILURE(rc))
                     break;
-
+#ifdef DEBUG
+                uint32_t cBDLE = pStrm->State.cBDLE;
+                LogFlowFunc(("Stream #%RU32: ID=%RU8, cBDLE=%RU32\n", i, uStreamID, cBDLE));
+#endif
                 rc = hdaStreamInit(pThis, pStrm, uStreamID);
                 if (RT_FAILURE(rc))
@@ -3836 +3845 @@
                     break;
                 }
-
+#ifdef DEBUG
+                AssertMsg(cBDLE == pStrm->State.cBDLE, ("Loaded BDLE states (%RU32) vs. emulated ones (%RU32) don't match\n",
+                                                        cBDLE, pStrm->State.cBDLE));
+#endif
                 /* Load BDLE states. */
                 for (uint32_t a = 0; a < pStrm->State.cBDLE; a++)
@@ -4168 +4180 @@
     pThis->u64BaseTS = PDMDevHlpTMTimeVirtGetNano(pDevIns);
 
+# ifndef VBOX_WITH_AUDIO_CALLBACKS
     /*
      * Stop the timer, if any.
@@ -4177 +4190 @@
         AssertRC(rc2);
     }
+# endif
 
     for (uint8_t u8Strm = 0; u8Strm < 8; u8Strm++) /** @todo Use a define here. */
     {
         PHDASTREAM pStrmSt = NULL;
-        if (u8Strm == 0)
-            pStrmSt = &pThis->StrmStOut;
+        if (u8Strm == 0)      /** @todo Implement dynamic stream IDs. */
+            pStrmSt = &pThis->StrmStLineIn;
 # ifdef VBOX_WITH_HDA_MIC_IN
-        else if (u8Strm == 2)
+        else if (u8Strm == 2) /** @todo Implement dynamic stream IDs. */
             pStrmSt = &pThis->StrmStMicIn;
 # endif
-        else if (u8Strm == 4)
-            pStrmSt = &pThis->StrmStLineIn;
+        else if (u8Strm == 4) /** @todo Implement dynamic stream IDs. */
+            pStrmSt = &pThis->StrmStOut;
 
         if (pStrmSt)
@@ -4202 +4216 @@
     HDA_REG(pThis, STATESTS) = 0x1;
 
+# ifndef VBOX_WITH_AUDIO_CALLBACKS
     /*
      * Start timer again, if any.
@@ -4210 +4225 @@
         AssertRC(rc2);
     }
+# endif
 
     LogRel(("HDA: Reset\n"));