Changeset 32335 in vbox for trunk

Timestamp:

Sep 9, 2010 10:09:21 AM (14 years ago)

Author:

vboxsync

Message:

HDA: Fixed Vista playback.

File:

• trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp (modified) (5 diffs)

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

@@ -217 +217 @@
 #define ICH6_HDA_REG_DPUBASE  31 /* 0x74 */
 #define DPUBASE(pState) (HDA_REG((pState), DPUBASE))
+#define DPBASE_ENABLED          1
+#define DPBASE_ADDR_MASK        (~0x7f)
 
 #define HDA_STREAM_REG_DEF(name, num) (ICH6_HDA_REG_SD##num##name)
@@ -1164 +1166 @@
     for (i = 0; i < 8; ++i)
     {
-        PDMDevHlpPhysRead(ICH6_HDASTATE_2_DEVINS(pState), pState->u64DPBase + i*8, &counter, 4);
+        PDMDevHlpPhysRead(ICH6_HDASTATE_2_DEVINS(pState), (pState->u64DPBase & DPBASE_ADDR_MASK) + i*8, &counter, sizeof(&counter));
         Log(("hda: %s stream[%d] counter=%x\n", i == SDCTL_NUM(pState, 4) || i == SDCTL_NUM(pState, 0)? "[C]": "   ",
              i , counter));
@@ -1264 +1266 @@
     PHDABDLEDESC pBdle = NULL;
     INTELHDLinkState *pState = (INTELHDLinkState *)pCodecState->pHDAState;
-    uint32_t u32Counter;
     uint32_t nBytes;
     uint32_t u32Ctl;
@@ -1306 +1307 @@
         || !u64BaseDMA)
         return;
+    /* Fetch the Buffer Descriptor Entry (BDE). */
     fetch_bd(pState, pBdle, u64BaseDMA);
-    while(   avail
-          && !fStop)
-    {
-        PDMDevHlpPhysRead(ICH6_HDASTATE_2_DEVINS(pState), (pState->u64DPBase & ~0x1) + u8Strm*8, &u32Counter, 4);
+    while( avail && !fStop)
+    {
         switch (src)
         {
@@ -1321 +1321 @@
             default:
                 nBytes = 0;
+                fStop  = true;
                 AssertMsgFailed(("Unsupported"));
         }
-        if (   fStop 
-            && pBdle->u32BdleCviLen != pBdle->u32BdleCviPos)
-            break;
+        /* Update the buffer position and handle Cyclic Buffer Length (CBL) wraparound. */
         *pu32Lpib += nBytes;
         avail -= nBytes;
-        u32Counter += nBytes;
-        PDMDevHlpPhysWrite(ICH6_HDASTATE_2_DEVINS(pState), (pState->u64DPBase & ~0x1) + u8Strm*8, &u32Counter, 4);
-        if (   pBdle->u32BdleCviPos == pBdle->u32BdleCviLen
-            || *pu32Lpib == u32Lcbl)
+        if (*pu32Lpib >= u32Lcbl)
+            *pu32Lpib  -= u32Lcbl;
+
+        /* Optionally write back the current DMA position. */
+        if (pState->u64DPBase & DPBASE_ENABLED)
+            PDMDevHlpPhysWrite(ICH6_HDASTATE_2_DEVINS(pState), 
+                               (pState->u64DPBase & DPBASE_ADDR_MASK) + u8Strm*8, pu32Lpib, sizeof(*pu32Lpib));
+
+        /* Process end of buffer condition. */
+        if (pBdle->u32BdleCviPos == pBdle->u32BdleCviLen)
         {
-            if (   u32Ctl & HDA_REG_FIELD_FLAG_MASK(SDCTL, ICE)
-                && (   (   pBdle->u32BdleCviPos == pBdle->u32BdleCviLen
-                        && pBdle->fBdleCviIoc )
-                    || *pu32Lpib == u32Lcbl))
+            if (pBdle->fBdleCviIoc)
             {
                 *pu32Sts |= HDA_REG_FIELD_FLAG_MASK(SDSTS, BCIS);
                 hdaProcessInterrupt(pState);
-                if (*pu32Lpib == u32Lcbl)
-                {
-                    *pu32Lpib = 0;
-                    u32Counter = 0;
-                    PDMDevHlpPhysWrite(ICH6_HDASTATE_2_DEVINS(pState), (pState->u64DPBase & ~0x1)  + u8Strm*8, &u32Counter, 4);
-                }
             }
-            if (pBdle->u32BdleCviPos == pBdle->u32BdleCviLen)
-            {
-                pBdle->u32BdleCviPos = 0;
-                pBdle->u32BdleCvi++;
-                if (pBdle->u32BdleCvi == pBdle->u32BdleMaxCvi + 1)
-                    pBdle->u32BdleCvi = 0;
-                fStop = true;   /* Give the guest a chance to refill buffers. */
-            }
-            else
-                fStop = false;
-            fetch_bd(pState, pBdle, u64BaseDMA);
+            pBdle->u32BdleCviPos = 0;
+            pBdle->u32BdleCvi++;
+            if (pBdle->u32BdleCvi == pBdle->u32BdleMaxCvi + 1)
+                pBdle->u32BdleCvi = 0;
+            fStop = true;   /* Give the guest a chance to refill (or empty) buffers. */
+
+            /* Read the next BDE unless we're exiting. */
+            if (!fStop)
+                fetch_bd(pState, pBdle, u64BaseDMA);
         }
     }