Changeset 34154 in vbox

Timestamp:

Nov 18, 2010 8:09:08 AM (14 years ago)

Author:

vboxsync

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

67874

Message:

Audio/HDA: update pos buf routine. force underFifow reservation.

File:

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

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

@@ -626 +626 @@
 };
 
+static void inline hdaUpdatePosBuf(INTELHDLinkState *pState, uint8_t u8Strm, uint32_t u32Value)
+{
+    if (pState->u64DPBase & DPBASE_ENABLED)
+        PDMDevHlpPhysWrite(ICH6_HDASTATE_2_DEVINS(pState),
+                       (pState->u64DPBase & DPBASE_ADDR_MASK) + u8Strm*8, &u32Value, sizeof(uint32_t));
+}
 static uint32_t inline hdaFifoWToSz(INTELHDLinkState *pState, int iNum)
 {
@@ -1036 +1042 @@
         PHDABDLEDESC pBdle = NULL;
         uint32_t *pu32Lpib = NULL;
+        uint8_t u8Strm = 0;
         Log(("hda: guest has initiated exit of stream reset\n"));
         pState->u8StreamsInReset &= ~HDA_STREAM_BITMASK(offset);
@@ -1045 +1052 @@
                 pu32Lpib = &SDLPIB(pState, 0);
                 AUD_set_active_in(ISD0FMT_TO_AUDIO_SELECTOR(pState), 0);
+                u8Strm = 0;
                 break;
             case ICH6_HDA_REG_SD4CTL:
@@ -1052 +1060 @@
                 pBdle = &pState->stOutBdle;
                 pu32Lpib = &SDLPIB(pState, 4);
+                u8Strm = 4;
                 break;
             default:
@@ -1061 +1070 @@
             memset(pBdle, 0, sizeof(HDABDLEDESC));
             *pu32Lpib = 0;
+            hdaUpdatePosBuf(pState, u8Strm, 0);
         }
     }
@@ -1437 +1447 @@
             Assert((pBdle->u32BdleCviLen >= pBdle->u32BdleCviPos)); /* sanity */
             cb2Copy = pBdle->u32BdleCviLen - pBdle->u32BdleCviPos; /* align copy buffer to size of trailing space in BDLE buffer */
-            cb2Copy = RT_MIN(cb2Copy, SDFIFOS(pState, 4) + 1 - pBdle->cbUnderFifoW); /* we may increase the counter in range of [0, FIFOS(pState, 4) + 1] */
+            cb2Copy = RT_MIN(cb2Copy, SDFIFOS(pState, 4) + 1); /* we may increase the counter in range of [0, FIFOS(pState, 4) + 1] */
             cb2Copy = RT_MIN(cb2Copy, *pu32Avail); /* align copying buffer size up to size of back end buffer */
             cb2Copy = RT_MIN(cb2Copy, u32CblLimit); /* avoid LCBL overrun */
         }
-        if (   cb2Copy == 0
-            && pBdle->cbUnderFifoW < hdaFifoWToSz(pState, 4))
+        if (   (   cb2Copy == 0
+               && pBdle->cbUnderFifoW < hdaFifoWToSz(pState, 4))
+            || cb2Copy < pBdle->cbUnderFifoW)
         {
             Log(("hda:wa: amount of bytes to copy is zero and (cbUnderFifoW:%d < %d)\n", pBdle->cbUnderFifoW, hdaFifoWToSz(pState, 4)));
@@ -1448 +1459 @@
             return 0;
         } 
+        cb2Copy -= pBdle->cbUnderFifoW; /* force reserve "Unreported bits" */
         
         /*
@@ -1593 +1605 @@
     
             /* 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));
+            hdaUpdatePosBuf(pState, u8Strm, *pu32Lpib);
     
         }
@@ -1611 +1621 @@
             if (*pu32Lpib == u32Cbl)
                 *pu32Lpib -= u32Cbl;
+            hdaUpdatePosBuf(pState, u8Strm, *pu32Lpib);
 
             if (pBdle->u32BdleCviPos == pBdle->u32BdleCviLen)