Changeset 33880 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 9, 2010 6:24:35 AM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: hda{Read,Write}Audio respects SDnFIFOS value.

File:

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

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

@@ -1183 +1183 @@
 static uint32_t hdaReadAudio(INTELHDLinkState *pState, int avail, bool *fStop)
 {
-    uint8_t tmpbuf[4096];
+    uint8_t tmpbuf[512];
     uint32_t temp;
     uint32_t u32Rest = 0;
@@ -1201 +1201 @@
     {
         int copied;
-        to_copy = audio_MIN(temp, 4096U);
+        to_copy = audio_MIN(temp, SDFIFOS(pState, 4) & ~((1<<4) - 1));
         copied = AUD_read (voice, tmpbuf, to_copy);
         Log (("hda: read_audio max=%x to_copy=%x copied=%x\n",
@@ -1219 +1219 @@
 static uint32_t hdaWriteAudio(INTELHDLinkState *pState, int avail, bool *fStop)
 {
-    uint8_t tmpbuf[4096];
+    uint8_t tmpbuf[512];
     uint32_t temp;
     uint32_t u32Rest;
@@ -1232 +1232 @@
         return written;
     }
+    temp = audio_MIN(SDFIFOS(pState, 4) & ~((1<<4) - 1), temp);
     while (temp)
     {
@@ -1240 +1241 @@
         Log (("hda: write_audio max=%x to_copy=%x copied=%x\n",
               avail, to_copy, copied));
-        Assert((copied));
         if (!copied)
         {
@@ -1271 +1271 @@
     uint32_t *pu32Lpib;
     uint32_t u32Lcbl;
+    uint32_t u32Fifos;
     switch (src)
     {
@@ -1307 +1308 @@
         return;
     /* Fetch the Buffer Descriptor Entry (BDE). */
+    *pu32Sts |= HDA_REG_FIELD_FLAG_MASK(SDSTS, FIFORDY);
     fetch_bd(pState, pBdle, u64BaseDMA);
     while( avail && !fStop)
@@ -1351 +1353 @@
         }
     }
+    *pu32Sts &= ~HDA_REG_FIELD_FLAG_MASK(SDSTS, FIFORDY);
 }