Changeset 31062 in vbox

Timestamp:

Jul 23, 2010 1:34:08 PM (15 years ago)

Author:

vboxsync

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

63993

Message:

Audio/HDA: codecReset implementation.

Location:

trunk/src/VBox/Devices/Audio

Files:

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

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

@@ -89 +89 @@
        CODEC_NID(cmd) == 0x12           \
     || CODEC_NID(cmd) == 0x13)
+
+
+static int stac9220ResetNode(struct CODECState *pState, uint8_t nodenum, PCODECNODE pNode);
+
+
 static int codecUnimplemented(struct CODECState *pState, uint32_t cmd, uint64_t *pResp)
 {
@@ -182 +187 @@
         *pResp = pState->pNodes[CODEC_NID(cmd)].afg.u32F20_param;
     }
+    return VINF_SUCCESS;
+}
+
+static int codecReset(struct CODECState *pState, uint32_t cmd, uint64_t *pResp)
+{
+    Assert((CODEC_CAD(cmd) == 0));
+    Assert(STAC9220_IS_AFG_CMD(cmd));
+    if(STAC9220_IS_AFG_CMD(cmd))
+    {
+        uint8_t i;
+        Log(("HDAcodec: enters reset\n"));
+        for (i = 0; i < STAC9220_NODE_COUNT; ++i)
+        {
+            stac9220ResetNode(pState, i, &pState->pNodes[i]);
+        }
+        pState->pfnReset(pState);
+        Log(("HDAcodec: exits reset\n"));
+    }
+    *pResp = 0;
     return VINF_SUCCESS;
 }
@@ -263 +287 @@
             pNode->node.au32F00_param[0x12] = RT_BIT(31)|(0x2 << 16)|(0x7f << 8)|0x7f;
             pNode->afg.u32F05_param = (0x2) << 4 | 0x2; /* PS-Act: 0x2, D2 */
-            pNode->afg.u32F20_param = 0x106b0800; /* Old Intel Mac */
+            pNode->afg.u32F20_param = 0x83847626; /*STAC9271X */
             pNode->afg.u32F08_param = 0;
             break;
@@ -459 +483 @@
     {0x000F0200, CODEC_VERB_8BIT_CMD , codecGetF02       },
     {0x000F2000, CODEC_VERB_8BIT_CMD , codecGetSubId     },
+    {0x0007FF00, CODEC_VERB_8BIT_CMD , codecReset        },
 #if 0
     {0x000F0500, CODEC_VERB_8BIT_CMD , codecGetPowerState},

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

@@ -197 +197 @@
 typedef struct CODECState
 {
+    uint16_t                id;
     CODECVERB               *pVerbs;
     int                     cVerbs;

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

@@ -1159 +1159 @@
 }
 
+DECLCALLBACK(int) hdaCodecReset(CODECState *pCodecState)
+{
+    INTELHDLinkState *pState = (INTELHDLinkState *)pCodecState->pHDAState;
+    STATESTS(pState) |= 1 << (pCodecState->id);
+    INTSTS(pState) |= HDA_REG_FIELD_FLAG_MASK(INTSTS, CIS);
+    return VINF_SUCCESS;
+}
 DECLCALLBACK(void) hdaTransfer(CODECState *pCodecState, ENMSOUNDSOURCE src, int avail)
 {
@@ -1531 +1538 @@
         AssertRCReturn(rc, rc);
     hdaReset (pDevIns);
+    pThis->hda.Codec.id = 0;
     pThis->hda.Codec.pfnTransfer = hdaTransfer;
+    pThis->hda.Codec.pfnReset = hdaCodecReset;
     /* 
      * 18.2.6,7 defines that values of this registers might be cleared on power on/reset