Changeset 34460 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Nov 29, 2010 12:47:39 PM (14 years ago)

Author:

vboxsync

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

68234

Message:

Audio/HDA: temporary disabled(FIFOW), hdaTransfer doesn't ignore fStop returned from Read/Write handlers, reorganization of hdaReset.

File:

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

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

@@ -651 +651 @@
 static uint32_t inline hdaFifoWToSz(INTELHDLinkState *pState, PHDASTREAMTRANSFERDESC pStreamDesc)
 {
+#if 0
     switch(HDA_STREAM_REG2(pState, FIFOW, pStreamDesc->u8Strm))
     {
@@ -659 +660 @@
             AssertMsgFailed(("hda: unsupported value (%x) in SDFIFOW(,%d)\n", HDA_REG_IND(pState, pStreamDesc->u8Strm), pStreamDesc->u8Strm));
     }
+#endif
     return 0;
 } 
@@ -1701 +1703 @@
         /* Process end of buffer condition. */
         hdaStreamCounterUpdate(pState, pBdle, &stStreamDesc, nBytes);
-        fStop = !hdaDoNextTransferCycle(pState, pBdle, &stStreamDesc);
+        fStop = !fStop ? !hdaDoNextTransferCycle(pState, pBdle, &stStreamDesc) : fStop;
     }
 }
@@ -1910 +1912 @@
  *          make sense to me so we'll do it.
  */
-static DECLCALLBACK(void)  hdaReset (PPDMDEVINS pDevIns)
+static DECLCALLBACK(void)  hdaReset(PPDMDEVINS pDevIns)
 {
     PCIINTELHDLinkState *pThis = PDMINS_2_DATA(pDevIns, PCIINTELHDLinkState *);
@@ -1938 +1940 @@
         pThis->hda.pu64RirbBuf = (uint64_t *)RTMemAllocZ(pThis->hda.cbRirbBuf);
 
+#if 0
     /* According to ICH6 datasheet, 0x40000 is default value for stream descriptor register 23:20
      * bits are reserved for stream number 18.2.33 */
@@ -1962 +1965 @@
     SDFIFOW(&pThis->hda, 0) = HDA_SDFIFOW_8B;
     SDFIFOW(&pThis->hda, 4) = HDA_SDFIFOW_32B;
+#endif
+    HDABDLEDESC stEmptyBdle;
+    for(uint8_t u8Strm = 0; u8Strm < 8; ++u8Strm)
+    {
+        HDASTREAMTRANSFERDESC stStreamDesc;
+        PHDABDLEDESC pBdle = NULL;
+        if (u8Strm == 0)
+            pBdle = &pThis->hda.stInBdle;
+        else if(u8Strm == 4)
+            pBdle = &pThis->hda.stOutBdle;
+        else
+        {
+            memset(&stEmptyBdle, 0, sizeof(HDABDLEDESC));
+            pBdle = &stEmptyBdle;
+        }
+        hdaInitTransferDescriptor(&pThis->hda, pBdle, u8Strm, &stStreamDesc);
+        /* hdaStreamReset prevents changing SRST bit, so we zerro it here forcely. */
+        HDA_STREAM_REG2(&pThis->hda, CTL, u8Strm) = 0; 
+        hdaStreamReset(&pThis->hda, pBdle, &stStreamDesc, u8Strm);
+    }
 
     /* emulateion of codec "wake up" HDA spec (5.5.1 and 6.5)*/