Changeset 63365 in vbox for trunk/src/VBox/Devices/Audio/DevIchHda.cpp

Timestamp:

Aug 12, 2016 3:13:42 PM (9 years ago)

Author:

vboxsync

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

110006

Message:

Audio/DevIchHda.cpp: Resolved a @todo.

File:

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

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

@@ -2339 +2339 @@
 static int hdaRegWriteSDCTL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
 {
-#if defined(IN_RING3) || defined(LOG_ENABLED) || defined(VBOX_STRICT)
+#ifdef IN_RING3
     bool fRun      = RT_BOOL(u32Value & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
     bool fInRun    = RT_BOOL(HDA_REG_IND(pThis, iReg) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
-#endif
+
     bool fReset    = RT_BOOL(u32Value & HDA_REG_FIELD_FLAG_MASK(SDCTL, SRST));
     bool fInReset  = RT_BOOL(HDA_REG_IND(pThis, iReg) & HDA_REG_FIELD_FLAG_MASK(SDCTL, SRST));
 
     if (HDA_REG_IND(pThis, iReg) == u32Value) /* Value already set? */
-        return VINF_SUCCESS;
+        return VINF_SUCCESS; /* Always return success to the MMIO handler. */
 
     /* Get the stream descriptor. */
@@ -2366 +2366 @@
     }
 
-
-
-/** @todo r=bird: Andy, the spotty IN_RING3 in the rest of this function makes
- *        little sense.  If you need to request a lock in ring-3, why don't
- *        you need it in ring-0 / RC?  Or, reversely, why can you do the
- *        fInReset handling without locking and resolving pStream in R0+RC
- *        but not in ring-3?
- *
- *        What makes the least sense, is that you do fInReset +
- *        hdaProcessInterrupt in R0/RC and then unconditionally forces a trip to
- *        ring-3 and does the same again.
- *
- *        Please, do make up your mind what you want to do here ASAP!
- */
-
-
-#ifdef IN_RING3
     PHDATAG pTag = &pThis->aTags[uTag];
     AssertPtr(pTag);
@@ -2398 +2381 @@
     int rc2 = RTSemMutexRequest(pStream->State.hMtx, RT_INDEFINITE_WAIT);
     AssertRC(rc2);
-#endif /* IN_RING3 */
 
     LogFunc(("[SD%RU8]: fRun=%RTbool, fInRun=%RTbool, fReset=%RTbool, fInReset=%RTbool, %R[sdctl]\n",
@@ -2415 +2397 @@
     else if (fReset)
     {
-#ifdef IN_RING3
         /* ICH6 datasheet 18.2.33 says that RUN bit should be cleared before initiation of reset. */
         Assert(!fInRun && !fRun);
@@ -2421 +2402 @@
         LogFunc(("[SD%RU8]: Guest initiated enter to stream reset\n", pStream->u8SD));
         hdaStreamReset(pThis, pStream);
-#endif
     }
     else
     {
-#ifdef IN_RING3
         /*
          * We enter here to change DMA states only.
@@ -2446 +2425 @@
         if (!fInRun && !fRun)
             hdaStreamInit(pThis, pStream, pStream->u8SD);
-#endif /* IN_RING3 */
     }
 
@@ -2452 +2430 @@
     hdaProcessInterrupt(pThis);
 
-#ifdef IN_RING3
     rc2 = hdaRegWriteU24(pThis, iReg, u32Value);
     AssertRC(rc2);
@@ -2458 +2435 @@
     hdaRegWriteSDUnlock(pStream);
     return VINF_SUCCESS; /* Always return success to the MMIO handler. */
-#else
+#else  /* !IN_RING3 */
     return VINF_IOM_R3_MMIO_WRITE;
-#endif
+#endif /* IN_RING3 */
 }