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

Timestamp:

May 7, 2021 6:22:22 PM (4 years ago)

Author:

vboxsync

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

144273

Message:

DevAC97: Made VBOX_WITH_AUDIO_AC97_ASYNC_IO non-optional. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (20 diffs)

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

@@ -325 +325 @@
 typedef AC97BMREGS *PAC97BMREGS;
 
-#ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
 /**
  * Asynchronous I/O state for an AC'97 stream.
@@ -347 +346 @@
 /** Pointer to the async I/O state for an AC'97 stream. */
 typedef AC97STREAMSTATEAIO *PAC97STREAMSTATEAIO;
-#endif
 
 
@@ -364 +362 @@
     /** The stream's current configuration. */
     PDMAUDIOSTREAMCFG       Cfg; //+108
-#ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
     /** Asynchronous I/O state members. */
     AC97STREAMSTATEAIO      AIO;
-#endif
     /** Timestamp of the last DMA data transfer. */
     uint64_t                tsTransferLast;
@@ -454 +450 @@
 
 
-#ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
 /**
  * Asynchronous I/O thread context (arguments).
@@ -471 +466 @@
 /** Pointer to the context for an async I/O thread. */
 typedef AC97STREAMTHREADCTX *PAC97STREAMTHREADCTX;
-#endif
 
 /**
@@ -699 +693 @@
                                                          PDMAUDIODIR enmDir, PDMAUDIODSTSRCUNION dstSrc);
 
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
 static int                ichac97R3StreamAsyncIOCreate(PAC97STATE pThis, PAC97STATER3 pThisCC, PAC97STREAM pStream, PAC97STREAMR3 pStreamCC);
 static int                ichac97R3StreamAsyncIODestroy(PAC97STATE pThis, PAC97STREAMR3 pStreamCC);
@@ -705 +698 @@
 static void               ichac97R3StreamAsyncIOUnlock(PAC97STREAMR3 pStreamCC);
 /*static void               ichac97R3StreamAsyncIOEnable(PAC97STREAM pStream, bool fEnable); Unused */
-# endif
 
 DECLINLINE(PDMAUDIODIR)   ichac97GetDirFromSD(uint8_t uSD);
@@ -984 +976 @@
 
     int rc = VINF_SUCCESS;
-
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
     if (fEnable)
         rc = ichac97R3StreamAsyncIOCreate(pThis, pThisCC, pStream, pStreamCC);
     if (RT_SUCCESS(rc))
+    {
         ichac97R3StreamAsyncIOLock(pStreamCC);
-# endif
-
-    if (fEnable)
-    {
-        if (pStreamCC->State.pCircBuf)
-            RTCircBufReset(pStreamCC->State.pCircBuf);
-
-        rc = ichac97R3StreamOpen(pDevIns, pThis, pThisCC, pStream, pStreamCC, false /* fForce */);
-
-        if (RT_LIKELY(!pStreamCC->Dbg.Runtime.fEnabled))
-        { /* likely */ }
+        if (fEnable)
+        {
+            if (pStreamCC->State.pCircBuf)
+                RTCircBufReset(pStreamCC->State.pCircBuf);
+
+            rc = ichac97R3StreamOpen(pDevIns, pThis, pThisCC, pStream, pStreamCC, false /* fForce */);
+
+            if (RT_LIKELY(!pStreamCC->Dbg.Runtime.fEnabled))
+            { /* likely */ }
+            else
+            {
+                if (!AudioHlpFileIsOpen(pStreamCC->Dbg.Runtime.pFileStream))
+                {
+                    int rc2 = AudioHlpFileOpen(pStreamCC->Dbg.Runtime.pFileStream, AUDIOHLPFILE_DEFAULT_OPEN_FLAGS,
+                                               &pStreamCC->State.Cfg.Props);
+                    AssertRC(rc2);
+                }
+
+                if (!AudioHlpFileIsOpen(pStreamCC->Dbg.Runtime.pFileDMA))
+                {
+                    int rc2 = AudioHlpFileOpen(pStreamCC->Dbg.Runtime.pFileDMA, AUDIOHLPFILE_DEFAULT_OPEN_FLAGS,
+                                               &pStreamCC->State.Cfg.Props);
+                    AssertRC(rc2);
+                }
+            }
+        }
         else
-        {
-            if (!AudioHlpFileIsOpen(pStreamCC->Dbg.Runtime.pFileStream))
-            {
-                int rc2 = AudioHlpFileOpen(pStreamCC->Dbg.Runtime.pFileStream, AUDIOHLPFILE_DEFAULT_OPEN_FLAGS,
-                                           &pStreamCC->State.Cfg.Props);
-                AssertRC(rc2);
-            }
-
-            if (!AudioHlpFileIsOpen(pStreamCC->Dbg.Runtime.pFileDMA))
-            {
-                int rc2 = AudioHlpFileOpen(pStreamCC->Dbg.Runtime.pFileDMA, AUDIOHLPFILE_DEFAULT_OPEN_FLAGS,
-                                           &pStreamCC->State.Cfg.Props);
-                AssertRC(rc2);
-            }
-        }
-    }
-    else
-        rc = ichac97R3StreamClose(pStream);
-
-    if (RT_SUCCESS(rc))
-    {
-        /* First, enable or disable the stream and the stream's sink, if any. */
-        rc = AudioMixerSinkEnable(ichac97R3IndexToSink(pThisCC, pStream->u8SD), fEnable);
-    }
-
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
-    ichac97R3StreamAsyncIOUnlock(pStreamCC);
-# endif
+            rc = ichac97R3StreamClose(pStream);
+
+        if (RT_SUCCESS(rc))
+        {
+            /* First, enable or disable the stream and the stream's sink, if any. */
+            rc = AudioMixerSinkEnable(ichac97R3IndexToSink(pThisCC, pStream->u8SD), fEnable);
+        }
+
+        ichac97R3StreamAsyncIOUnlock(pStreamCC);
+    }
 
     /* Make sure to leave the lock before (eventually) starting the timer. */
     ichac97R3StreamUnlock(pStreamCC);
-
     LogFunc(("[SD%RU8] fEnable=%RTbool, rc=%Rrc\n", pStream->u8SD, fEnable, rc));
     return rc;
@@ -1147 +1134 @@
     AssertRC(rc2);
 
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
     rc2 = ichac97R3StreamAsyncIODestroy(pThis, pStreamCC);
     AssertRC(rc2);
-# else
-    RT_NOREF(pThis);
-# endif
 
     if (RT_LIKELY(!pStreamCC->Dbg.Runtime.fEnabled))
@@ -1331 +1314 @@
 }
 
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
 
 /**
@@ -1554 +1536 @@
 }
 #endif
-# endif /* VBOX_WITH_AUDIO_AC97_ASYNC_IO */
 
 # ifdef LOG_ENABLED
@@ -1594 +1575 @@
  *
  * This routine is called by both, the synchronous and the asynchronous
- * (VBOX_WITH_AUDIO_AC97_ASYNC_IO), implementations.
+ * implementations.
  *
  * When running synchronously, the device DMA transfers *and* the mixer sink
@@ -1627 +1608 @@
     if (pStreamCC->State.Cfg.enmDir == PDMAUDIODIR_OUT) /* Output (SDO). */
     {
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
         if (fInTimer)
-# endif
         {
             const uint32_t cbStreamFree = ichac97R3StreamGetFree(pStreamCC);
@@ -1651 +1630 @@
         Log3Func(("[SD%RU8] fInTimer=%RTbool\n", pStream->u8SD, fInTimer));
 
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
         rc2 = ichac97R3StreamAsyncIONotify(pStreamCC);
         AssertRC(rc2);
-# endif
-
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
+
         if (!fInTimer) /* In async I/O thread */
         {
-# endif
             const uint32_t cbSinkWritable     = AudioMixerSinkGetWritable(pSink);
             const uint32_t cbStreamReadable   = ichac97R3StreamGetUsed(pStreamCC);
@@ -1672 +1647 @@
                 AssertRC(rc2);
             }
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
-        }
-#endif
+        }
         /* When running synchronously, update the associated sink here.
          * Otherwise this will be done in the async I/O thread. */
@@ -1682 +1655 @@
     else /* Input (SDI). */
     {
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
         if (!fInTimer)
         {
-# endif
             rc2 = AudioMixerSinkUpdate(pSink);
             AssertRC(rc2);
@@ -1708 +1679 @@
                 AssertRC(rc2);
             }
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
         }
         else /* fInTimer */
         {
-# endif
-
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
+
             const uint64_t tsNowNs = RTTimeNanoTS();
             if (tsNowNs - pStreamCC->State.tsLastUpdateNs >= pStreamCC->State.Cfg.Device.cMsSchedulingHint * RT_NS_1MS)
@@ -1723 +1691 @@
                 pStreamCC->State.tsLastUpdateNs = tsNowNs;
             }
-# endif
 
             const uint32_t cbStreamUsed = ichac97R3StreamGetUsed(pStreamCC);
@@ -1733 +1700 @@
                 AssertRC(rc2);
             }
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
-        }
-# endif
+        }
     }
 }
@@ -4247 +4212 @@
         return rc;
 
-# ifdef VBOX_WITH_AUDIO_AC97_ASYNC_IO
-    LogRel(("AC97: Asynchronous I/O enabled\n"));
-# endif
-
     /*
      * Attach drivers.  We ASSUME they are configured consecutively without any