Changeset 31502 in vbox

Timestamp:

Aug 10, 2010 4:21:33 AM (15 years ago)

Author:

vboxsync

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

64591

Message:

Audio/HDA: fixes WinXP hang and detection of "Double" reset.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevCodec.cpp (modified) (3 diffs)
• DevCodec.h (modified) (1 diff)
• DevIchIntelHDA.cpp (modified) (1 diff)

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

@@ -579 +579 @@
         uint8_t i;
         Log(("HDAcodec: enters reset\n"));
-        for (i = 0; i < STAC9220_NODE_COUNT; ++i)
+        if (pState->fFirstResetDetected)
         {
-            stac9220ResetNode(pState, i, &pState->pNodes[i]);
-        }
-        pState->pfnReset(pState);
+            LogRel(("HDAcodec: \"Double\" reset detected\n"));
+            pState->fFirstResetDetected = false;
+            for (i = 0; i < STAC9220_NODE_COUNT; ++i)
+            {
+                stac9220ResetNode(pState, i, &pState->pNodes[i]);
+            }
+        }   
+        else
+            pState->fFirstResetDetected = true;
         Log(("HDAcodec: exits reset\n"));
     }
@@ -1174 +1180 @@
         if ((CODEC_VERBDATA(cmd) & pState->pVerbs[i].mask) == pState->pVerbs[i].verb)
         {
+            if(    pState->fFirstResetDetected
+                && CODEC_VERBDATA(cmd) != 0x7FF00
+                && CODEC_VERBDATA(cmd) != 0)
+                pState->fFirstResetDetected = false;
             *pfn = pState->pVerbs[i].pfn;
             return VINF_SUCCESS;
@@ -1220 +1230 @@
     pState->pfnLookup = codecLookup;
     pState->pNodes = (PCODECNODE)RTMemAllocZ(sizeof(CODECNODE) * STAC9220_NODE_COUNT);
+    pState->fFirstResetDetected = false;
     uint8_t i;
     for (i = 0; i < STAC9220_NODE_COUNT; ++i)

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

@@ -224 +224 @@
     SWVoiceIn               *voice_mc;
     void *pHDAState;
+    bool fFirstResetDetected;
     DECLR3CALLBACKMEMBER(int, pfnProcess, (struct CODECState *));
     DECLR3CALLBACKMEMBER(int, pfnLookup, (struct CODECState *pState, uint32_t verb, PPFNCODECVERBPROCESSOR));

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

@@ -1201 +1201 @@
 {
     INTELHDLinkState *pState = (INTELHDLinkState *)pCodecState->pHDAState;
-    STATESTS(pState) |= 1 << (pCodecState->id);
+    pCodecState->fFirstResetDetected = true;
     return VINF_SUCCESS;
 }