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

Timestamp:

Nov 30, 2015 10:11:22 PM (9 years ago)

Author:

vboxsync

Message:

HDA: Handle the DMA buffer position bit, comments.

File:

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

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

@@ -277 +277 @@
 #define HDA_RMX_DPUBASE             31
 #define DPUBASE(pThis)              (HDA_REG((pThis), DPUBASE))
-/** DMA Position Buffer Enable (3.3.32). */
-#define DPBASE_ENABLED              RT_BIT(0)
+
 #define DPBASE_ADDR_MASK            (~(uint64_t)0x7f)
 
@@ -704 +703 @@
      *  Made out of DPLBASE + DPUBASE (3.3.32 + 3.3.33). */
     uint64_t                           u64DPBase;
+    /** DMA position buffer enable bit. */
+    bool                               fDMAPosition;
     /** Pointer to CORB buffer. */
     R3PTRTYPE(uint32_t *)              pu32CorbBuf;
@@ -769 +770 @@
 } HDACALLBACKCTX, *PHDACALLBACKCTX;
 #endif
-
-#define ISD0FMT_TO_AUDIO_SELECTOR(pThis) \
-    ( AUDIO_FORMAT_SELECTOR((pThis)->pCodec, In, SDFMT_BASE_RATE(pThis, 0), SDFMT_MULT(pThis, 0), SDFMT_DIV(pThis, 0)) )
-#define OSD0FMT_TO_AUDIO_SELECTOR(pThis) \
-    ( AUDIO_FORMAT_SELECTOR((pThis)->pCodec, Out, SDFMT_BASE_RATE(pThis, 4), SDFMT_MULT(pThis, 4), SDFMT_DIV(pThis, 4)) )
-
 
 /*********************************************************************************************************************************
@@ -949 +944 @@
     { 0x00064, 0x00004, 0x00000000, 0xFFFFFFFF, hdaRegReadU32          , hdaRegWriteUnimpl     , HDA_REG_IDX(IR)           }, /* Immediate Response */
     { 0x00068, 0x00002, 0x00000002, 0x00000002, hdaRegReadIRS          , hdaRegWriteIRS        , HDA_REG_IDX(IRS)          }, /* Immediate Command Status */
-    { 0x00070, 0x00004, 0xFFFFFFFF, 0xFFFFFF81, hdaRegReadU32          , hdaRegWriteBase       , HDA_REG_IDX(DPLBASE)      }, /* MA Position Lower Base */
+    { 0x00070, 0x00004, 0xFFFFFFFF, 0xFFFFFF81, hdaRegReadU32          , hdaRegWriteBase       , HDA_REG_IDX(DPLBASE)      }, /* DMA Position Lower Base */
     { 0x00074, 0x00004, 0xFFFFFFFF, 0xFFFFFFFF, hdaRegReadU32          , hdaRegWriteBase       , HDA_REG_IDX(DPUBASE)      }, /* DMA Position Upper Base */
     /* 4 Input Stream Descriptors (ISD). */
@@ -1022 +1017 @@
     Assert(u32LPIB <= pStrmSt->u32CBL);
 
-    LogFlowFunc(("uStrm=%RU8, LPIB=%RU32 (DMA Position: %RTbool)\n",
-                 pStrmSt->u8Strm, u32LPIB, RT_BOOL(pThis->u64DPBase & DPBASE_ENABLED)));
+    LogFlowFunc(("uStrm=%RU8, LPIB=%RU32 (DMA Position Buffer Enabled: %RTbool)\n",
+                 pStrmSt->u8Strm, u32LPIB, pThis->fDMAPosition));
 
     /* Update LPIB in any case. */
@@ -1029 +1024 @@
 
     /* Do we need to tell the current DMA position? */
-    if (pThis->u64DPBase & DPBASE_ENABLED)
+    if (pThis->fDMAPosition)
     {
         int rc2 = PDMDevHlpPCIPhysWrite(pThis->CTX_SUFF(pDevIns),
@@ -1130 +1125 @@
 #endif
 
+    /*
+     * Switch to the next BDLE entry and do a wrap around
+     * if we reached the end of the Buffer Descriptor List (BDL).
+     */
     pStrmSt->State.uCurBDLE++;
     if (pStrmSt->State.uCurBDLE == pStrmSt->State.cBDLE)
@@ -1146 +1145 @@
 
 #ifdef DEBUG
-    LogFlowFunc(("uOldBDLE=%RU16, uCurBDLE=%RU16 %R[bdle]\n", uOldBDLE, pStrmSt->State.uCurBDLE, pBDLE));
+    LogFlowFunc(("uOldBDLE=%RU16, uCurBDLE=%RU16, cBDLE=%RU32, %R[bdle]\n",
+                 uOldBDLE, pStrmSt->State.uCurBDLE, pStrmSt->State.cBDLE, pBDLE));
 #endif
     return pBDLE;
@@ -2240 +2240 @@
             break;
         case HDA_REG_DPLBASE:
-            /** @todo: first bit has special meaning */
+        {
             pThis->u64DPBase &= UINT64_C(0xFFFFFFFF00000000);
             pThis->u64DPBase |= pThis->au32Regs[iRegMem];
+
+            /* Also make sure to handle the DMA position enable bit. */
+            bool fEnabled = pThis->au32Regs[iRegMem] & RT_BIT_32(0);
+            if (pThis->fDMAPosition != fEnabled)
+            {
+                LogRel(("HDA: %s DMA position buffer\n", fEnabled ? "Enabled" : "Disabled"));
+                pThis->fDMAPosition = fEnabled;
+
+                if (pThis->fDMAPosition)
+                {
+                    /* Immediately tell the position. */
+                    hdaStreamUpdateLPIB(pThis, &pThis->StrmStLineIn, HDA_STREAM_REG(pThis, LPIB, pThis->StrmStLineIn.u8Strm));
+                    hdaStreamUpdateLPIB(pThis, &pThis->StrmStMicIn,  HDA_STREAM_REG(pThis, LPIB, pThis->StrmStMicIn.u8Strm));
+                    hdaStreamUpdateLPIB(pThis, &pThis->StrmStOut,    HDA_STREAM_REG(pThis, LPIB, pThis->StrmStOut.u8Strm));
+                }
+            }
             break;
+        }
         case HDA_REG_DPUBASE:
             pThis->u64DPBase &= UINT64_C(0x00000000FFFFFFFF);
@@ -2249 +2266 @@
             break;
         default:
-            AssertMsgFailed(("Invalid index"));
+            AssertMsgFailed(("Invalid index\n"));
             break;
     }