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

Timestamp:

Aug 5, 2010 4:09:21 AM (15 years ago)

Author:

vboxsync

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

64435

Message:

Audio/HDA: switch BDLE on end of BDLE and send interrupt depending on IOC flag of BDLE.

File:

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

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

@@ -1135 +1135 @@
 {
     dump_bd(pState);
-    pState->u32Cvi;
     uint8_t  bdle[16];
     PDMDevHlpPhysRead(ICH6_HDASTATE_2_DEVINS(pState), SDBDPL(pState, 4) + pState->u32Cvi*16, bdle, 16);
@@ -1206 +1205 @@
                 PDMDevHlpPhysRead(ICH6_HDASTATE_2_DEVINS(pState), (pState->u64DPBase & ~0x1) + 4*8, &u32Counter, 4);
                 written = write_audio(pState, avail, &fStop);
-                if (fStop)
+                if (   fStop 
+                    && pState->u32CviLen != pState->u32CviPos)
                     break;
                 SDLPIB(pState, 4) += written; /* bytes ? */
@@ -1212 +1212 @@
                 u32Counter += written;
                 PDMDevHlpPhysWrite(ICH6_HDASTATE_2_DEVINS(pState), (pState->u64DPBase & ~0x1) + 4*8, &u32Counter, 4);
-                if (pState->u32CviPos == pState->u32CviLen
+                if (   pState->u32CviPos == pState->u32CviLen
                     || SDLPIB(pState, 4) == SDLCBL(pState, 4))
                 {
                     if (   SDCTL(pState, 4) & HDA_REG_FIELD_FLAG_MASK(SDCTL, ICE)
-                        && (   pState->u32CviPos == pState->u32CviLen
+                        && (   (   pState->u32CviPos == pState->u32CviLen
+                                && pState->fCviIoc)
                             || SDLPIB(pState, 4) == SDLCBL(pState, 4)))
                     {
@@ -1228 +1229 @@
                             PDMDevHlpPhysWrite(ICH6_HDASTATE_2_DEVINS(pState), (pState->u64DPBase & ~0x1)  + 4*8, &u32Counter, 4);
                         }
-                        if (pState->u32CviPos == pState->u32CviLen)
-                        {
-                            pState->u32CviPos = 0;
-                            pState->u32Cvi++;
-                            if (pState->u32Cvi == SDLVI(pState, 4) + 1)
-                                pState->u32Cvi = 0;
-                        }
                     }
+                    if (pState->u32CviPos == pState->u32CviLen)
+                    {
+                        pState->u32CviPos = 0;
+                        pState->u32Cvi++;
+                        if (pState->u32Cvi == SDLVI(pState, 4) + 1)
+                            pState->u32Cvi = 0;
+                    }
+                    fStop = false;
                 }
                 fetch_bd(pState);