Changeset 31032 in vbox

Timestamp:

Jul 23, 2010 5:06:16 AM (15 years ago)

Author:

vboxsync

Message:

Audio/HDA: start ptocess CORB only when CORBCTL:DMA != 0 (on CORBCTL or CORBWP write). similar RIRB check is asserted for now.

File:

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

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

@@ -140 +140 @@
 
 #define ICH6_HDA_REG_CORBCTL  17 /* 0x4C */
-#define ICH6_HDA_COBCTL_RUN_SHIFT (1)
-#define ICH6_HDA_COBCTL_CMEIE_SHIFT (0)
+#define ICH6_HDA_CORBCTL_DMA_SHIFT (1)
+#define ICH6_HDA_CORBCTL_CMEIE_SHIFT (0)
+
+#define CORBCTL(pState) (HDA_REG(pState, CORBCTL))
+
 
 #define ICH6_HDA_REG_CORBSTS  18 /* 0x4D */
@@ -397 +400 @@
 DECLCALLBACK(int)hdaRegWriteCORBWP(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t pu32Value);
 DECLCALLBACK(int)hdaRegWriteCORBRP(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t u32Value);
+DECLCALLBACK(int)hdaRegWriteCORBCTL(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t u32Value);
 DECLCALLBACK(int)hdaRegWriteCORBSTS(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t u32Value);
 DECLCALLBACK(int)hdaRegWriteRIRBWP(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t pu32Value);
@@ -461 +465 @@
     { 0x00048, 0x00002, 0x000000FF, 0x000000FF, hdaRegReadU16          , hdaRegWriteCORBWP       , "CORBWP"    , "CORB Write Pointer" },
     { 0x0004A, 0x00002, 0x000000FF, 0x000080FF, hdaRegReadU8           , hdaRegWriteCORBRP       , "CORBRP"    , "CORB Read Pointer" },
-    { 0x0004C, 0x00001, 0x00000003, 0x00000003, hdaRegReadU8           , hdaRegWriteU8           , "CORBCTL"   , "CORB Control" },
+    { 0x0004C, 0x00001, 0x00000003, 0x00000003, hdaRegReadU8           , hdaRegWriteCORBCTL      , "CORBCTL"   , "CORB Control" },
     { 0x0004D, 0x00001, 0x00000001, 0x00000001, hdaRegReadU8           , hdaRegWriteCORBSTS      , "CORBSTS"   , "CORB Status" },
     { 0x0004E, 0x00001, 0x000000F3, 0x00000000, hdaRegReadU8           , hdaRegWriteUnimplemented, "CORBSIZE"  , "CORB Size" },
@@ -611 +615 @@
     if (fLocal)
     {
+        Assert((HDA_REG_FLAG_VALUE(pState, CORBCTL, DMA)));
         rc = PDMDevHlpPhysRead(ICH6_HDASTATE_2_DEVINS(pState), pState->u64CORBBase, pState->pu32CorbBuf, pState->cbCorbBuf);
         if (RT_FAILURE(rc))
@@ -637 +642 @@
     else
     {
+        Assert((HDA_REG_FLAG_VALUE(pState, RIRBCTL, DMA)));
         rc = PDMDevHlpPhysWrite(ICH6_HDASTATE_2_DEVINS(pState), pState->u64RIRBBase, pState->pu64RirbBuf, pState->cbRirbBuf);
         if (RT_FAILURE(rc))
@@ -841 +847 @@
 }
 
+DECLCALLBACK(int)hdaRegWriteCORBCTL(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t u32Value)
+{
+    int rc = hdaRegWriteU8(pState, offset, index, u32Value);
+    AssertRC(rc);
+    if (   CORBWP(pState) != CORBRP(pState)
+        && HDA_REG_FLAG_VALUE(pState, CORBCTL, DMA) != 0)
+        return hdaCORBCmdProcess(pState);
+    return rc;
+}
+
 DECLCALLBACK(int)hdaRegWriteCORBSTS(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t u32Value)
 {
@@ -856 +872 @@
         AssertRCReturn(rc, rc);
     if (CORBWP(pState) == CORBRP(pState))
+        return VINF_SUCCESS;
+    if (!HDA_REG_FLAG_VALUE(pState, CORBCTL, DMA))
         return VINF_SUCCESS;
     rc = hdaCORBCmdProcess(pState);