Changeset 76841 in vbox for trunk

Timestamp:

Jan 16, 2019 4:22:17 PM (6 years ago)

Author:

vboxsync

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

128200

Message:

Audio/SB16: Removed dead code (VBOX_WITH_AUDIO_SB16_CALLBACKS).

File:

• trunk/src/VBox/Devices/Audio/DevSB16.cpp (modified) (11 diffs)

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

@@ -193 +193 @@
     /** Number of active (running) SDn streams. */
     uint8_t                        cStreamsActive;
-#ifndef VBOX_WITH_AUDIO_SB16_CALLBACKS
     /** The timer for pumping data thru the attached LUN drivers. */
     PTMTIMERR3                     pTimerIO;
@@ -204 +203 @@
      * Used to calculate the time actually elapsed between two timer callbacks. */
     uint64_t                       uTimerTSIO;
-#endif
     PTMTIMER                       pTimerIRQ;
     /** The base interface for LUN\#0. */
@@ -223 +221 @@
 static int sb16OpenOut(PSB16STATE pThis, PPDMAUDIOSTREAMCFG pCfg);
 static void sb16CloseOut(PSB16STATE pThis);
-#ifndef VBOX_WITH_AUDIO_SB16_CALLBACKS
 static void sb16TimerMaybeStart(PSB16STATE pThis);
 static void sb16TimerMaybeStop(PSB16STATE pThis);
-#endif
 
 
@@ -313 +309 @@
     if (hold)
     {
-#ifndef VBOX_WITH_AUDIO_SB16_CALLBACKS
         pThis->cStreamsActive++;
         sb16TimerMaybeStart(pThis);
-#else
-# error "Implement me!"
-#endif
         PDMDevHlpDMASchedule(pThis->pDevInsR3);
     }
-#ifndef VBOX_WITH_AUDIO_SB16_CALLBACKS
     else
     {
@@ -328 +319 @@
         sb16TimerMaybeStop(pThis);
     }
-#else
-# error "Implement me!"
-#endif
 }
 
@@ -1648 +1636 @@
 }
 
-#ifndef VBOX_WITH_AUDIO_SB16_CALLBACKS
-
 static void sb16TimerMaybeStart(PSB16STATE pThis)
 {
@@ -1757 +1743 @@
     }
 }
-
-#endif /* !VBOX_WITH_AUDIO_SB16_CALLBACKS */
-
 
 /**
@@ -2483 +2466 @@
     pThis->verCfg  = u16Version;
 
-#ifndef VBOX_WITH_AUDIO_SB16_CALLBACKS
     uint16_t uTimerHz;
     rc = CFGMR3QueryU16Def(pCfg, "TimerHz", &uTimerHz, 100 /* Hz */);
@@ -2489 +2471 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("SB16 configuration error: failed to read Hertz (Hz) rate as unsigned integer"));
-#endif
-
     /*
      * Setup the mixer now that we've got the irq and dma channel numbers.
@@ -2591 +2571 @@
 #endif
 
-#ifndef VBOX_WITH_AUDIO_SB16_CALLBACKS
     if (RT_SUCCESS(rc))
     {
@@ -2605 +2584 @@
             AssertMsgFailedReturn(("Error creating I/O timer, rc=%Rrc\n", rc), rc);
     }
-#else /* !VBOX_WITH_AUDIO_SB16_CALLBACKS */
-    if (RT_SUCCESS(rc))
-    {
-        /** @todo Merge this callback registration with the validation block above once
-         *  this becomes the standard. */
-        PSB16DRIVER pDrv;
-        RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
-        {
-            /* Only register primary driver.
-             * The device emulation does the output multiplexing then. */
-            if (pDrv->fFlags != PDMAUDIODRVFLAGS_PRIMARY)
-                continue;
-
-            PDMAUDIOCBRECORD AudioCallbacks[2];
-
-            SB16CALLBACKCTX Ctx = { pThis, pDrv };
-
-            AudioCallbacks[0].enmType     = PDMAUDIOCALLBACKTYPE_INPUT;
-            AudioCallbacks[0].pfnCallback = sb16CallbackInput;
-            AudioCallbacks[0].pvCtx       = &Ctx;
-            AudioCallbacks[0].cbCtx       = sizeof(SB16CALLBACKCTX);
-
-            AudioCallbacks[1].enmType     = PDMAUDIOCALLBACKTYPE_OUTPUT;
-            AudioCallbacks[1].pfnCallback = sb16CallbackOutput;
-            AudioCallbacks[1].pvCtx       = &Ctx;
-            AudioCallbacks[1].cbCtx       = sizeof(SB16CALLBACKCTX);
-
-            rc = pDrv->pConnector->pfnRegisterCallbacks(pDrv->pConnector, AudioCallbacks, RT_ELEMENTS(AudioCallbacks));
-            if (RT_FAILURE(rc))
-                break;
-        }
-    }
-#endif /* VBOX_WITH_AUDIO_SB16_CALLBACKS */
 
 #ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA