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

Timestamp:

Aug 10, 2010 6:52:49 AM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: STAC9220 doesn't support EPSS, so "Double reset" detection isn't required. Old style reset should prevent reseting Default Configuration controls.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevCodec.cpp (modified) (11 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"));
-        if (pState->fFirstResetDetected)
+        for (i = 0; i < STAC9220_NODE_COUNT; ++i)
         {
-            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;
+            stac9220ResetNode(pState, i, &pState->pNodes[i]);
+        }
+        pState->fInReset = false;
         Log(("HDAcodec: exits reset\n"));
     }
@@ -980 +974 @@
             pNode->port.u32F08_param = 0;
             pNode->port.u32F09_param = RT_BIT(31)|0x9920; /* 39.2 kOm */
-            pNode->port.u32F1c_param = RT_MAKE_U32_FROM_U8(0x20, 0x40, 0x21, 0x02);
+            if (!pState->fInReset)
+                pNode->port.u32F1c_param = RT_MAKE_U32_FROM_U8(0x20, 0x40, 0x21, 0x02);
             goto port_init;
         case 0xB:
@@ -988 +983 @@
             pNode->port.u32F09_param = 0;
             pNode->port.u32F07_param = RT_BIT(5);
-            pNode->port.u32F1c_param = RT_MAKE_U32_FROM_U8(0x11, 0x60, 0x11, 0x01);
+            if (!pState->fInReset)
+                pNode->port.u32F1c_param = RT_MAKE_U32_FROM_U8(0x11, 0x60, 0x11, 0x01);
             goto port_init;
         case 0xC:
@@ -996 +992 @@
             pNode->port.u32F09_param = 0;
             pNode->port.u32F07_param = RT_BIT(5);
-            pNode->port.u32F1c_param = RT_MAKE_U32_FROM_U8(0x10, 0x40, 0x11, 0x01);
+            if (!pState->fInReset)
+                pNode->port.u32F1c_param = RT_MAKE_U32_FROM_U8(0x10, 0x40, 0x11, 0x01);
             goto port_init;
         case 0xD:
@@ -1015 +1012 @@
             pNode->port.u32F07_param = RT_BIT(5);
             pNode->port.u32F09_param = 0;
-            pNode->port.u32F1c_param = RT_MAKE_U32_FROM_U8(0x51, 0x30, 0x81, 0x01);
+            if (!pState->fInReset)
+                pNode->port.u32F1c_param = RT_MAKE_U32_FROM_U8(0x51, 0x30, 0x81, 0x01);
             break;
         case 0xF:
@@ -1024 +1022 @@
             pNode->port.u32F08_param = 0;
             pNode->port.u32F07_param = 0;
-            pNode->port.u32F1c_param = RT_MAKE_U32_FROM_U8(0x12, 0x60, 0x11, 0x01);
+            if (!pState->fInReset)
+                pNode->port.u32F1c_param = RT_MAKE_U32_FROM_U8(0x12, 0x60, 0x11, 0x01);
             pNode->node.au8F02_param[0] = 0x5;
             pNode->port.u32F09_param = 0;
@@ -1037 +1036 @@
             *(uint32_t *)pNode->node.au8F02_param = RT_MAKE_U32_FROM_U8(0x08, 0x17, 0x0, 0);
             pNode->digout.u32F07_param = 0;
-            pNode->digout.u32F1c_param = RT_MAKE_U32_FROM_U8(0x30, 0x10, 0x45, 0x01);
+            if (!pState->fInReset)
+                pNode->digout.u32F1c_param = RT_MAKE_U32_FROM_U8(0x30, 0x10, 0x45, 0x01);
         break;
         case 0x11:
@@ -1048 +1048 @@
             pNode->digin.u32F09_param = 0;
             pNode->digin.u32F0c_param = 0;
-            pNode->digin.u32F1c_param = (0x1 << 24) | (0xc5 << 16) | (0x10 << 8) | 0x60;
+            if (!pState->fInReset)
+                pNode->digin.u32F1c_param = (0x1 << 24) | (0xc5 << 16) | (0x10 << 8) | 0x60;
         break;
         case 0x12:
@@ -1078 +1079 @@
             pNode->node.au32F00_param[0xc] = RT_BIT(5);
             pNode->cdnode.u32F07_param = 0;
-            pNode->cdnode.u32F1c_param = RT_MAKE_U32_FROM_U8(0x52, 0x0, 0x33, 0x90);
+            if (!pState->fInReset)
+                pNode->cdnode.u32F1c_param = RT_MAKE_U32_FROM_U8(0x52, 0x0, 0x33, 0x90);
         break;
         case 0x16:
@@ -1180 +1182 @@
         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;
@@ -1230 +1228 @@
     pState->pfnLookup = codecLookup;
     pState->pNodes = (PCODECNODE)RTMemAllocZ(sizeof(CODECNODE) * STAC9220_NODE_COUNT);
-    pState->fFirstResetDetected = false;
+    pState->fInReset = false;
     uint8_t i;
     for (i = 0; i < STAC9220_NODE_COUNT; ++i)

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

@@ -223 +223 @@
     /** Mic in */
     SWVoiceIn               *voice_mc;
-    void *pHDAState;
-    bool fFirstResetDetected;
+    void                    *pHDAState;
+    bool                    fInReset;
     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;
-    pCodecState->fFirstResetDetected = true;
     return VINF_SUCCESS;
 }