Changeset 88936 in vbox

Timestamp:

May 7, 2021 4:35:59 PM (4 years ago)

Author:

vboxsync

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

144271

Message:

DevSB16: Made VBOX_WITH_AUDIO_SB16_ASYNC_IO non-optional. bugref:9890

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevSB16.cpp (modified) (13 diffs)
• Config.kmk (modified) (1 diff)

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

@@ -96 +96 @@
 typedef struct SB16STATE *PSB16STATE;
 
-#ifdef VBOX_WITH_AUDIO_SB16_ASYNC_IO
 /**
  * Asynchronous I/O state for an SB16 stream.
@@ -117 +116 @@
 /** Pointer to the async I/O state for a SB16 stream. */
 typedef SB16STREAMSTATEAIO *PSB16STREAMSTATEAIO;
-#endif /* VBOX_WITH_AUDIO_SB16_ASYNC_IO */
 
 /**
@@ -126 +124 @@
     /** Flag indicating whether this stream is in enabled state or not. */
     bool                    fEnabled;
-#ifdef VBOX_WITH_AUDIO_SB16_ASYNC_IO
     /** Asynchronous I/O state members. */
     SB16STREAMSTATEAIO      AIO;
-#endif
     /** DMA cache to read data from / write data to. */
     PRTCIRCBUF              pCircBuf;
@@ -257 +253 @@
 typedef SB16STREAM *PSB16STREAM;
 
-#ifdef VBOX_WITH_AUDIO_SB16_ASYNC_IO
 /**
  * Asynchronous I/O thread context (arguments).
@@ -270 +265 @@
 /** Pointer to the context for an async I/O thread. */
 typedef SB16STREAMTHREADCTX *PSB16STREAMTHREADCTX;
-#endif /* VBOX_WITH_AUDIO_SB16_ASYNC_IO */
 
 /**
@@ -368 +362 @@
 DECLINLINE(void) sb16TimerSet(PPDMDEVINS pDevIns, PSB16STREAM pStream, uint64_t cTicksToDeadline);
 
-#ifdef VBOX_WITH_AUDIO_SB16_ASYNC_IO
 static int  sb16StreamAsyncIOCreate(PPDMDEVINS pDevIns, PSB16STATE pThis, PSB16STREAM pStream);
 static int  sb16StreamAsyncIODestroy(PPDMDEVINS pDevIns, PSB16STREAM pStream);
 static int  sb16StreamAsyncIONotify(PPDMDEVINS pDevIns, PSB16STREAM pStream);
-#endif /* VBOX_WITH_AUDIO_SB16_ASYNC_IO */
 
 static void sb16SpeakerControl(PSB16STATE pThis, bool fOn);
@@ -378 +370 @@
 
 
-#ifdef VBOX_WITH_AUDIO_SB16_ASYNC_IO
 /**
  * @callback_method_impl{FNPDMTHREADDEV}
@@ -532 +523 @@
     return rc;
 }
-#endif /* VBOX_WITH_AUDIO_SB16_ASYNC_IO */
 
 static void sb16SpeakerControl(PSB16STATE pThis, bool fOn)
@@ -1914 +1904 @@
     LogFlowFunc(("fSinkActive=%RTbool\n", fSinkActive));
 
-#ifdef VBOX_WITH_AUDIO_SB16_ASYNC_IO
     sb16StreamAsyncIONotify(pDevIns, pStream);
-#else
-    sb16StreamUpdate(pStream, pSink);
-#endif
 
     /* Schedule the next transfer. */
@@ -2283 +2269 @@
     pStream->Dbg.Runtime.fEnabled = pThis->Dbg.fEnabled;
 
-    int rc2;
-
-#ifdef VBOX_WITH_AUDIO_SB16_ASYNC_IO
-    rc2 = sb16StreamAsyncIOCreate(pThis->pDevInsR3, pThis, pStream);
+    int rc2 = sb16StreamAsyncIOCreate(pThis->pDevInsR3, pThis, pStream);
     AssertRCReturn(rc2, rc2);
-#endif
 
     if (RT_LIKELY(!pStream->Dbg.Runtime.fEnabled))
@@ -2331 +2313 @@
     sb16StreamClose(pDevIns, pThis, pStream);
 
-#ifdef VBOX_WITH_AUDIO_SB16_ASYNC_IO
     int rc = sb16StreamAsyncIODestroy(pDevIns, pStream);
     AssertRCReturn(rc, rc);
-#else
-    RT_NOREF(pDevIns);
-#endif
 
     if (pStream->State.pCircBuf)
@@ -2478 +2456 @@
 
     rc = sb16AddDrvStreams(pDevIns, pThis, pMixerSink, &pStream->Cfg);
-
     if (RT_SUCCESS(rc))
     {
@@ -3238 +3215 @@
     AssertRCReturn(rc, rc);
 
-# ifdef VBOX_WITH_AUDIO_SB16_ASYNC_IO
-    LogRel(("SB16: Asynchronous I/O enabled\n"));
-# endif
     LogRel2(("SB16: Using port %#x, DMA%RU8, IRQ%RU8\n",
              pStream->HwCfgRuntime.uPort, pStream->HwCfgRuntime.uDmaChanLow, pStream->HwCfgRuntime.uIrq));

trunk/src/VBox/Devices/Config.kmk

@@ -118 +118 @@
 # AC'97 needs testing:
 #VBOX_AUDIO_DEFS  += VBOX_WITH_AUDIO_AC97_ASYNC_IO
-VBOX_AUDIO_DEFS += VBOX_WITH_AUDIO_SB16_ASYNC_IO
 
 # Not yet enabled: Callbacks for the device emulation to let the backends