Changeset 34227 in vbox

Timestamp:

Nov 22, 2010 4:31:49 AM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: backed r67971.

File:

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

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

@@ -1337 +1337 @@
 }
 
-static uint32_t hdaReadAudio(INTELHDLinkState *pState, uint32_t *pu32Avail, uint32_t u32CblLimit)
+static uint32_t hdaReadAudio(INTELHDLinkState *pState, uint32_t *pu32Avail, bool *fStop, uint32_t u32CblLimit)
 {
     PHDABDLEDESC pBdle = &pState->stInBdle;
@@ -1350 +1350 @@
             || (*pu32Avail < hdaFifoWToSz(pState, 0)))
         {
+            *fStop = true;
             return 0;
         }
@@ -1362 +1363 @@
             || cb2Copy < pBdle->cbUnderFifoW)
         {
+            *fStop = true;
             return 0;
         }
@@ -1389 +1391 @@
             pBdle->cbUnderFifoW += RT_MIN(cbBackendCopy, cb2Copy);
             Assert((pBdle->cbUnderFifoW <= hdaFifoWToSz(pState, 0)));
+            *fStop = true;
             break;
         }
@@ -1401 +1404 @@
 }
 
-static uint32_t hdaWriteAudio(INTELHDLinkState *pState, uint32_t *pu32Avail, uint32_t u32CblLimit)
+static uint32_t hdaWriteAudio(INTELHDLinkState *pState, uint32_t *pu32Avail, bool *fStop, uint32_t u32CblLimit)
 {
     PHDABDLEDESC pBdle = &pState->stOutBdle;
@@ -1424 +1427 @@
     {
         Log(("hda:wa: amount of unreported bytes is less than room may be transfered  (cbUnderFifoW:%d < %d)\n", pBdle->cbUnderFifoW, cb2Copy));
+        *fStop = true;
         goto done;
     }
@@ -1482 +1486 @@
 DECLCALLBACK(void) hdaTransfer(CODECState *pCodecState, ENMSOUNDSOURCE src, int avail)
 {
+    bool fStop = false;
     uint64_t u64BaseDMA = 0;
     PHDABDLEDESC pBdle = NULL;
@@ -1533 +1538 @@
     *pu32Sts |= HDA_REG_FIELD_FLAG_MASK(SDSTS, FIFORDY);
     fetch_bd(pState, pBdle, u64BaseDMA);
-    while(avail)
+    while( avail && !fStop)
     {
         Assert((avail >= 0 && (u32Cbl >= (*pu32Lpib)))); /* sanity */
@@ -1541 +1546 @@
         {
             case PO_INDEX:
-                nBytes = hdaWriteAudio(pState, (uint32_t *)&avail, u32CblLimit);
+                nBytes = hdaWriteAudio(pState, (uint32_t *)&avail, &fStop, u32CblLimit);
                 break;
             case PI_INDEX:
-                nBytes = hdaReadAudio(pState, (uint32_t *)&avail, u32CblLimit);
+                nBytes = hdaReadAudio(pState, (uint32_t *)&avail, &fStop, u32CblLimit);
                 break;
             default:
                 nBytes = 0;
+                fStop  = true;
                 AssertMsgFailed(("Unsupported"));
-                break;
         }
         /*
@@ -1592 +1597 @@
 
             }
-            break;
+            fStop = true;
         }
     }