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

Timestamp:

May 26, 2015 4:39:58 PM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: Removed old audio architecture.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevIchAc97.cpp (modified) (42 diffs)
• DevIchHda.cpp (modified) (37 diffs)
• DevIchHdaCodec.cpp (modified) (13 diffs)
• DevIchHdaCodec.h (modified) (3 diffs)
• DevSB16.cpp (modified) (42 diffs)
• alsaaudio.c (deleted)
• audio.c (deleted)
• audio.h (deleted)
• audio_int.h (deleted)
• audio_template.h (deleted)
• audiosniffer.c (deleted)
• coreaudio.c (deleted)
• dsound_template.h (deleted)
• dsoundaudio.c (deleted)
• filteraudio.c (deleted)
• mixeng.c (deleted)
• mixeng.h (deleted)
• mixeng_template.h (deleted)
• noaudio.c (deleted)
• ossaudio.c (deleted)
• pulseaudio.c (deleted)
• rate_template.h (deleted)
• solaudio.c (deleted)
• testcase/Makefile.kmk (modified) (3 diffs)
• winaudio.c (deleted)

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

@@ -30 +30 @@
 
 #include "VBoxDD.h"
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-# include "AudioMixer.h"
-#else
- extern "C" {
-  #include "audio.h"
- }
-#endif
+#include "AudioMixer.h"
 
 #ifdef LOG_GROUP
@@ -60 +53 @@
 
 #ifdef VBOX
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-#  define SOFT_VOLUME /** @todo Get rid of this crap. */
-# else
-#  undef  SOFT_VOLUME
-# endif
+# define SOFT_VOLUME /** @todo Get rid of this crap. */
 #else
-# define  SOFT_VOLUME
+# define SOFT_VOLUME
 #endif
 
@@ -211 +200 @@
 typedef AC97BusMasterRegs *PAC97BMREG;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 typedef struct AC97INPUTSTREAM
 {
@@ -264 +252 @@
     AC97OUTPUTSTREAM                   Out;
 } AC97DRIVER, *PAC97DRIVER;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
 typedef struct AC97STATE
@@ -280 +267 @@
     AC97BusMasterRegs       bm_regs[3];
     uint8_t                 mixer_data[256];
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /** The emulation timer for handling the attached
      *  LUN drivers. */
@@ -286 +272 @@
     /** Timer ticks for handling the LUN drivers. */
     uint64_t                uTicks;
-# ifdef VBOX_WITH_STATISTICS
+#ifdef VBOX_WITH_STATISTICS
     STAMPROFILE             StatTimer;
     STAMCOUNTER             StatBytesRead;
     STAMCOUNTER             StatBytesWritten;
-# endif
+#endif
     /** List of associated LUN drivers. */
     RTLISTANCHOR            lstDrv;
@@ -301 +287 @@
     /** Audio sink for microphone input. */
     R3PTRTYPE(PAUDMIXSINK)  pSinkMicIn;
-#else
-    QEMUSoundCard           card;
-    /** PCM in */
-    SWVoiceIn              *voice_pi;
-    /** PCM out */
-    SWVoiceOut             *voice_po;
-    /** Mic in */
-    SWVoiceIn              *voice_mc;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
     uint8_t                 silence[128];
     int                     bup_flag;
@@ -370 +347 @@
 #define GET_BM(a_idx)   ( ((a_idx) >> 4) & 3 )
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 static DECLCALLBACK(void) ichac97Timer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser);
 static int ichac97TransferAudio(PAC97STATE pThis, int index, uint32_t cbElapsed);
-#else
-static void ichac97OutputCallback(void *pvContext, int cbFree);
-static void ichac97InputCallback(void *pvContext, int cbAvail);
-static void ichac97MicInCallback(void *pvContext, int cbAvail);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
 static void ichac97WarmReset(PAC97STATE pThis)
@@ -464 +435 @@
     LogFlowFunc(("index=%d, on=%d\n", bm_index, on));
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PAC97DRIVER pDrv;
     switch (bm_index)
@@ -490 +460 @@
             break;
     }
-#else
-    switch (bm_index)
-    {
-        case PI_INDEX: AUD_set_active_in( pThis->voice_pi, on); break;
-        case PO_INDEX: AUD_set_active_out(pThis->voice_po, on); break;
-        case MC_INDEX: AUD_set_active_in( pThis->voice_mc, on); break;
-        default:       AssertFailed (); break;
-    }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 }
 
@@ -550 +511 @@
     int rc;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PAC97DRIVER pDrv;
     uint8_t uLUN = 0;
@@ -714 +674 @@
 
     AudioMixerInvalidate(pThis->pMixer);
-#else
-    if (freq)
-    {
-        audsettings_t as;
-        as.freq       = freq;
-        as.nchannels  = 2;
-        as.fmt        = AUD_FMT_S16;
-        as.endianness = 0;
-
-        switch (index)
-        {
-            case PI_INDEX: /* PCM in */
-                pThis->voice_pi = AUD_open_in(&pThis->card, pThis->voice_pi, "ac97.pi", pThis, ichac97InputCallback, &as);
-#ifdef LOG_VOICES
-                LogRel(("AC97: open PI freq=%d (%s)\n", freq, pThis->voice_pi ? "ok" : "FAIL"));
-#endif
-                rc = pThis->voice_pi ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
-                break;
-
-            case PO_INDEX: /* PCM out */
-                pThis->voice_po = AUD_open_out(&pThis->card, pThis->voice_po, "ac97.po", pThis, ichac97OutputCallback, &as);
-#ifdef LOG_VOICES
-                LogRel(("AC97: open PO freq=%d (%s)\n", freq, pThis->voice_po ? "ok" : "FAIL"));
-#endif
-                rc = pThis->voice_po ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
-                break;
-
-            case MC_INDEX: /* Mic in */
-                pThis->voice_mc = AUD_open_in(&pThis->card, pThis->voice_mc, "ac97.mc", pThis, ichac97MicInCallback, &as);
-#ifdef LOG_VOICES
-                LogRel(("AC97: open MC freq=%d (%s)\n", freq, pThis->voice_mc ? "ok" : "FAIL"));
-#endif
-                rc = pThis->voice_mc ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
-                break;
-        }
-    }
-    else
-    {
-        switch (index)
-        {
-            case PI_INDEX:
-                AUD_close_in(&pThis->card, pThis->voice_pi);
-                pThis->voice_pi = NULL;
-#ifdef LOG_VOICES
-                LogRel(("AC97: Closing PCM IN\n"));
-#endif
-                break;
-
-            case PO_INDEX:
-                AUD_close_out(&pThis->card, pThis->voice_po);
-                pThis->voice_po = NULL;
-#ifdef LOG_VOICES
-                LogRel(("AC97: Closing PCM OUT\n"));
-#endif
-                break;
-
-            case MC_INDEX:
-                AUD_close_in(&pThis->card, pThis->voice_mc);
-                pThis->voice_mc = NULL;
-#ifdef LOG_VOICES
-                LogRel(("AC97: Closing MIC IN\n"));
-#endif
-                break;
-        }
-
-        rc = VINF_SUCCESS;
-    }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     LogFlowFuncLeaveRC(rc);
@@ -795 +687 @@
     ichac97OpenStream(pThis, PI_INDEX, uFreq);
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PAC97DRIVER pDrv;
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
         pDrv->pConnector->pfnEnableIn(pDrv->pConnector, pDrv->LineIn.pStrmIn, fEnable);
-#else
-    AUD_set_active_in(pThis->voice_pi, active[PI_INDEX]);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     uFreq = ichac97MixerLoad(pThis, AC97_PCM_Front_DAC_Rate);
@@ -809 +697 @@
     ichac97OpenStream(pThis, PO_INDEX, uFreq);
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
         pDrv->pConnector->pfnEnableOut(pDrv->pConnector, pDrv->Out.pStrmOut, fEnable);
-#else
-    AUD_set_active_out(pThis->voice_po, active[PO_INDEX]);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     uFreq = ichac97MixerLoad(pThis, AC97_MIC_ADC_Rate);
@@ -822 +706 @@
     ichac97OpenStream(pThis, MC_INDEX, uFreq);
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
         pDrv->pConnector->pfnEnableIn(pDrv->pConnector, pDrv->MicIn.pStrmIn, fEnable);
-#else
-    AUD_set_active_in(pThis->voice_mc, active[MC_INDEX]);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-}
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+}
+
 static void ichac97SetVolume(PAC97STATE pThis, int index, PDMAUDIOMIXERCTL mt, uint32_t val)
-#else
-static void ichac97SetVolume(PAC97STATE pThis, int index, audmixerctl_t mt, uint32_t val)
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 {
     int mute = (val >> MUTE_SHIFT) & 1;
@@ -856 +732 @@
 
 #ifdef SOFT_VOLUME
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     if (pThis->pMixer) /* Device can be in reset state, so no mixer available. */
     {
@@ -882 +757 @@
         }
     }
-# else /* !VBOX_WITH_PDM_AUDIO_DRIVER */
-    if (index == AC97_Master_Volume_Mute)
-        AUD_set_volume_out(pThis->voice_po, mute, lvol, rvol);
-    else
-        AUD_set_volume(mt, &mute, &lvol, &rvol);
-# endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-
-#else /* !SOFT_VOLUME */
-    AUD_set_volume(mt, &mute, &lvol, &rvol);
 #endif /* SOFT_VOLUME */
 
@@ -966 +832 @@
     RT_ZERO(pThis->mixer_data);
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PAC97DRIVER pDrv;
-
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
     {
@@ -1012 +876 @@
         AssertRC(rc2);
     }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     ichac97MixerStore(pThis, AC97_Reset                   , 0x0000); /* 6940 */
@@ -1048 +911 @@
     }
     ichac97RecordSelect(pThis, 0);
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+
     ichac97SetVolume(pThis, AC97_Master_Volume_Mute,  PDMAUDIOMIXERCTL_VOLUME,  0x8000);
     ichac97SetVolume(pThis, AC97_PCM_Out_Volume_Mute, PDMAUDIOMIXERCTL_PCM,     0x8808);
     ichac97SetVolume(pThis, AC97_Line_In_Volume_Mute, PDMAUDIOMIXERCTL_LINE_IN, 0x8808);
-# else
-    ichac97SetVolume(pThis, AC97_Master_Volume_Mute,  AUD_MIXER_VOLUME,  0x8000);
-    ichac97SetVolume(pThis, AC97_PCM_Out_Volume_Mute, AUD_MIXER_PCM,     0x8808);
-    ichac97SetVolume(pThis, AC97_Line_In_Volume_Mute, AUD_MIXER_LINE_IN, 0x8808);
-# endif
 
     /* Reset all streams. */
@@ -1104 +962 @@
         PDMDevHlpPhysRead(pDevIns, addr, pThis->pvReadWriteBuf, cbToRead); /** @todo Check rc? */
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         uint32_t cbWritten;
 
@@ -1121 +978 @@
             LogFlowFunc(("\tLUN#%RU8: cbWritten=%RU32, cWrittenMin=%RU32\n", pDrv->uLUN, cbWritten, cbWrittenMin));
         }
-#else
-        cbWrittenMin = AUD_write(pThis->voice_po, pThis->pvReadWriteBuf, cbToRead);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+
         LogFlowFunc(("\tcbToRead=%RU32, cbWrittenMin=%RU32, cbToWrite=%RU32, cbLeft=%RU32\n",
                      cbToRead, cbWrittenMin, cbToWrite, cbToWrite - cbWrittenMin));
@@ -1186 +1041 @@
         while (cbToWrite)
         {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
             PAC97DRIVER pDrv;
             uint32_t cbWritten;
@@ -1198 +1052 @@
                 cbWrittenMin = RT_MIN(cbWrittenMin, cbWritten);
             }
-#else
-            cbWrittenMin = AUD_write(pThis->voice_po, pThis->silence, cbToWrite);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
             if (!cbWrittenMin)
@@ -1224 +1075 @@
     int rc;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /* Select audio sink to process. */
     PAUDMIXSINK pSink = (pReg - pThis->bm_regs) == MC_INDEX ? pThis->pSinkMicIn : pThis->pSinkLineIn;
@@ -1263 +1113 @@
 
     return rc;
-#else
-    rc = VINF_SUCCESS;
-
-    uint32_t    addr = pReg->bd.addr;
-    uint32_t    temp = pReg->picb << 1;
-    uint32_t    nread = 0;
-    int         to_copy = 0;
-
-    SWVoiceIn  *voice = (pReg - pThis->bm_regs) == MC_INDEX ? pThis->voice_mc : pThis->voice_pi;
-
-    temp = audio_MIN(temp, (uint32_t)cbMax);
-    if (!temp)
-    {
-        *pcbRead = 0;
-        return VINF_EOF;
-    }
-
-    uint8_t tmpbuf[4096];
-    while (temp)
-    {
-        int acquired;
-        to_copy = audio_MIN(temp, sizeof(tmpbuf));
-        acquired = AUD_read(voice, tmpbuf, to_copy);
-        if (!acquired)
-        {
-            rc = VERR_GENERAL_FAILURE; /* Not worth fixing anymore. */
-            break;
-        }
-        PDMDevHlpPCIPhysWrite(pDevIns, addr, tmpbuf, acquired);
-        temp  -= acquired;
-        addr  += acquired;
-        nread += acquired;
-    }
-
-    pReg->bd.addr = addr;
-
-    if (RT_SUCCESS(rc))
-        *pcbRead = nread;
-
-    return rc;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-}
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+}
+
 static DECLCALLBACK(void) ichac97Timer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
@@ -1382 +1190 @@
     STAM_PROFILE_STOP(&pThis->StatTimer, a);
 }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
 static int ichac97TransferAudio(PAC97STATE pThis, int index, uint32_t cbElapsed)
@@ -1517 +1324 @@
     return rc;
 }
-
-#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
-static void ichac97InputCallback(void *pvContext, int cbAvail)
-{
-    ichac97TransferAudio((AC97STATE *)pvContext, PI_INDEX, cbAvail);
-}
-
-static void ichac97MicInCallback(void *pvContext, int cbAvail)
-{
-    ichac97TransferAudio((AC97STATE *)pvContext, MC_INDEX, cbAvail);
-}
-
-static void ichac97OutputCallback(void *pvContext, int cbFree)
-{
-    ichac97TransferAudio((AC97STATE *)pvContext, PO_INDEX, cbFree);
-}
-#endif
 
 /**
@@ -1911 +1701 @@
                     break;
                 case AC97_Master_Volume_Mute:
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
                     ichac97SetVolume(pThis, index, PDMAUDIOMIXERCTL_VOLUME, u32);
-#else
-                    ichac97SetVolume(pThis, index, AUD_MIXER_VOLUME, u32);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
                     break;
                 case AC97_PCM_Out_Volume_Mute:
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
                     ichac97SetVolume(pThis, index, PDMAUDIOMIXERCTL_PCM, u32);
-#else
-                    ichac97SetVolume(pThis, index, AUD_MIXER_PCM, u32);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
                     break;
                 case AC97_Line_In_Volume_Mute:
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
                     ichac97SetVolume(pThis, index, PDMAUDIOMIXERCTL_LINE_IN, u32);
-#else
-                    ichac97SetVolume(pThis, index, AUD_MIXER_LINE_IN, u32);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
                     break;
                 case AC97_Record_Select:
@@ -2070 +1848 @@
     uint8_t active[LAST_INDEX];
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PAC97DRIVER pDrv;
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
@@ -2080 +1857 @@
         active[MC_INDEX] = pCon->pfnIsActiveIn (pCon, pDrv->MicIn.pStrmIn)  ? 1 : 0;
     }
-#else
-    active[PI_INDEX] = AUD_is_active_in( pThis->voice_pi) ? 1 : 0;
-    active[PO_INDEX] = AUD_is_active_out(pThis->voice_po) ? 1 : 0;
-    active[MC_INDEX] = AUD_is_active_in( pThis->voice_mc) ? 1 : 0;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     SSMR3PutMem(pSSM, active, sizeof(active));
@@ -2127 +1899 @@
     ichac97RecordSelect(pThis, ichac97MixerLoad(pThis, AC97_Record_Select));
 # define V_(a, b) ichac97SetVolume(pThis, a, b, ichac97MixerLoad(pThis, a))
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     V_(AC97_Master_Volume_Mute,  PDMAUDIOMIXERCTL_VOLUME);
     V_(AC97_PCM_Out_Volume_Mute, PDMAUDIOMIXERCTL_PCM);
     V_(AC97_Line_In_Volume_Mute, PDMAUDIOMIXERCTL_LINE_IN);
-# else
-    V_(AC97_Master_Volume_Mute,  AUD_MIXER_VOLUME);
-    V_(AC97_PCM_Out_Volume_Mute, AUD_MIXER_PCM);
-    V_(AC97_Line_In_Volume_Mute, AUD_MIXER_LINE_IN);
-# endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 # undef V_
     ichac97ResetStreams(pThis, active);
@@ -2194 +1960 @@
     LogFlowFuncEnter();
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PAC97DRIVER pDrv;
     while (!RTListIsEmpty(&pThis->lstDrv))
@@ -2209 +1974 @@
         pThis->pMixer = NULL;
     }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     if (pThis->pvReadWriteBuf)
@@ -2223 +1987 @@
 
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 /**
  * Attach command.
@@ -2295 +2058 @@
     return rc;
 }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
 
@@ -2305 +2067 @@
     PAC97STATE pThis = PDMINS_2_DATA(pDevIns, PAC97STATE);
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /* NB: This must be done *before* any possible failure (and running the destructor). */
     RTListInit(&pThis->lstDrv);
-#endif
 
     Assert(iInstance == 0);
@@ -2404 +2164 @@
      * Attach driver.
      */
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     uint8_t uLUN;
     for (uLUN = 0; uLUN < UINT8_MAX; uLUN)
@@ -2421 +2180 @@
 
     LogFunc(("cLUNs=%RU8, rc=%Rrc\n", uLUN, rc));
-#else
-    rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThis->IBase, &pThis->pDrvBase, "Audio Driver Port");
-    if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
-        LogFunc(("ac97: No attached driver!\n"));
-    else if (RT_FAILURE(rc))
-    {
-        AssertMsgFailed(("Failed to attach AC97 LUN #0! rc=%Rrc\n", rc));
-        return rc;
-    }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-
-#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
-    AUD_register_card("ICH0", &pThis->card);
-#endif
+
     ac97Reset(pDevIns);
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PAC97DRIVER pDrv;
     uLUN = 0;
@@ -2509 +2254 @@
         }
     }
-#else
-    if (!AUD_is_host_voice_in_ok(pThis->voice_pi))
-        LogRel(("AC97: WARNING: Unable to open PCM IN!\n"));
-    if (!AUD_is_host_voice_in_ok(pThis->voice_mc))
-        LogRel(("AC97: WARNING: Unable to open PCM MC!\n"));
-    if (!AUD_is_host_voice_out_ok(pThis->voice_po))
-        LogRel(("AC97: WARNING: Unable to open PCM OUT!\n"));
-
-    if (   !AUD_is_host_voice_in_ok( pThis->voice_pi)
-        && !AUD_is_host_voice_out_ok(pThis->voice_po)
-        && !AUD_is_host_voice_in_ok( pThis->voice_mc))
-    {
-        AUD_close_in(&pThis->card, pThis->voice_pi);
-        AUD_close_out(&pThis->card, pThis->voice_po);
-        AUD_close_in(&pThis->card, pThis->voice_mc);
-
-        pThis->voice_po = NULL;
-        pThis->voice_pi = NULL;
-        pThis->voice_mc = NULL;
-        AUD_init_null();
-        ac97Reset(pDevIns);
-
-        PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
-            N_("No audio devices could be opened. Selecting the NULL audio backend "
-               "with the consequence that no sound is audible"));
-    }
-    else if (   !AUD_is_host_voice_in_ok( pThis->voice_pi)
-             || !AUD_is_host_voice_out_ok(pThis->voice_po)
-             || !AUD_is_host_voice_in_ok( pThis->voice_mc))
-    {
-        char   szMissingVoices[128];
-        size_t len = 0;
-        if (!AUD_is_host_voice_in_ok(pThis->voice_pi))
-            len = RTStrPrintf(szMissingVoices, sizeof(szMissingVoices), "PCM_in");
-        if (!AUD_is_host_voice_out_ok(pThis->voice_po))
-            len += RTStrPrintf(szMissingVoices + len, sizeof(szMissingVoices) - len, len ? ", PCM_out" : "PCM_out");
-        if (!AUD_is_host_voice_in_ok(pThis->voice_mc))
-            len += RTStrPrintf(szMissingVoices + len, sizeof(szMissingVoices) - len, len ? ", PCM_mic" : "PCM_mic");
-
-        PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
-            N_("Some audio devices (%s) could not be opened. Guest applications generating audio "
-               "output or depending on audio input may hang. Make sure your host audio device "
-               "is working properly. Check the logfile for error messages of the audio "
-               "subsystem"), szMissingVoices);
-    }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     if (RT_SUCCESS(rc))
@@ -2564 +2263 @@
     }
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     if (RT_SUCCESS(rc))
     {
@@ -2595 +2293 @@
     }
 # endif
-
-#endif
 
     return VINF_SUCCESS;

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

@@ -45 +45 @@
 #include "VBoxDD.h"
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-# include "AudioMixer.h"
-#else
- extern "C" {
-  #include "audio.h"
- }
-#endif
+#include "AudioMixer.h"
 #include "DevIchHdaCodec.h"
 
@@ -551 +545 @@
 } HDASTREAMTRANSFERDESC, *PHDASTREAMTRANSFERDESC;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 typedef struct HDAINPUTSTREAM
 {
@@ -608 +601 @@
     HDAOUTPUTSTREAM                    Out;
 } HDADRIVER, *PHDADRIVER;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
 /**
@@ -655 +647 @@
     /** Flag whether the RC part is enabled. */
     bool                               fRCEnabled;
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /** The emulation timer for handling the attached
      *  LUN drivers. */
@@ -686 +677 @@
     /** Audio mixer sink for microphone input. */
     R3PTRTYPE(PAUDMIXSINK)             pSinkMicIn;
-#else /* !VBOX_WITH_PDM_AUDIO_DRIVER */
-    /** The HDA codec to use. */
-    R3PTRTYPE(PHDACODEC)               pCodec;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
     uint64_t                           u64BaseTS;
     /** 1.2.3.4.5.6.7. - someone please tell me what I'm counting! - .8.9.10... */
     uint8_t                            u8Counter;
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     uint8_t                            au8Padding[7];
-#else
-    uint8_t                            au8Padding[7];
-#endif
 } HDASTATE;
 /** Pointer to the ICH Intel HD Audio Controller state. */
@@ -749 +732 @@
 static int hdaRegWriteU8(PHDASTATE pThis, uint32_t iReg, uint32_t pu32Value);
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 static DECLCALLBACK(void) hdaTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser);
 static int hdaTransfer(PHDASTATE pThis, ENMSOUNDSOURCE enmSrc, uint32_t cbAvail);
-#else
-static int hdaTransfer(PHDACODEC pCodec, ENMSOUNDSOURCE enmSource, int cbAvail);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
 #ifdef IN_RING3
@@ -1531 +1510 @@
                 pBdle = &pThis->StInBdle;
                 break;
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-# ifdef VBOX_WITH_HDA_MIC_IN
+#ifdef VBOX_WITH_HDA_MIC_IN
             case HDA_REG_SD2CTL:
                 u8Strm = 2;
                 pBdle = &pThis->StMicBdle;
                 break;
-# endif
 #endif
             case HDA_REG_SD4CTL:
@@ -1563 +1540 @@
             Assert((!fReset && !fInReset));
 
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
             PHDADRIVER pDrv;
-# endif
             switch (iReg)
             {
                 case HDA_REG_SD0CTL:
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                {
                     RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
                         pDrv->pConnector->pfnEnableIn(pDrv->pConnector,
                                                       pDrv->LineIn.pStrmIn, fRun);
-# else
-                    AUD_set_active_in(pThis->pCodec->SwVoiceIn, fRun);
-# endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
                     break;
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-#  ifdef VBOX_WITH_HDA_MIC_IN
+                }
+# ifdef VBOX_WITH_HDA_MIC_IN
                 case HDA_REG_SD2CTL:
+                {
                     RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
                         pDrv->pConnector->pfnEnableIn(pDrv->pConnector,
                                                       pDrv->MicIn.pStrmIn, fRun);
-#  endif
-# endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
                     break;
+                }
+# endif
                 case HDA_REG_SD4CTL:
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                {
                     RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
                         pDrv->pConnector->pfnEnableOut(pDrv->pConnector,
                                                        pDrv->Out.pStrmOut, fRun);
-# else
-                    AUD_set_active_out(pThis->pCodec->SwVoiceOut, fRun);
-# endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
                     break;
+                }
                 default:
                     AssertMsgFailed(("Changing RUN bit on non-attached stream, register %RU32\n", iReg));
@@ -1682 +1653 @@
 
 #ifdef IN_RING3
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 static int hdaSdFmtToAudSettings(uint32_t u32SdFmt, PPDMAUDIOSTREAMCFG pCfg)
-#else
-static int hdaSdFmtToAudSettings(uint32_t u32SdFmt, audsettings_t *pCfg)
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 {
     AssertPtrReturn(pCfg, VERR_INVALID_POINTER);
@@ -1727 +1694 @@
     }
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PDMAUDIOFMT enmFmt = AUD_FMT_S16; /* Default to 16-bit signed. */
-#else
-    audfmt_e enmFmt = AUD_FMT_S16; /* Default to 16-bit signed. */
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-
     switch (EXTRACT_VALUE(u32SdFmt, HDA_SDFMT_BITS_MASK, HDA_SDFMT_BITS_SHIFT))
     {
         case 0:
-            LogFunc(("%s requested 8-bit\n", __FUNCTION__));
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            LogFunc(("Requested 8-bit\n"));
             enmFmt = AUD_FMT_S8;
-#else
-            enmFmt = AUD_FMT_S8;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
             break;
         case 1:
-            LogFunc(("%s requested 16-bit\n", __FUNCTION__));
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            LogFunc(("Requested 16-bit\n"));
             enmFmt = AUD_FMT_S16;
-#else
-            enmFmt = AUD_FMT_S16;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
             break;
         case 2:
-            LogFunc(("%s requested 20-bit\n", __FUNCTION__));
+            LogFunc(("Requested 20-bit\n"));
             break;
         case 3:
-            LogFunc(("%s requested 24-bit\n", __FUNCTION__));
+            LogFunc(("Requested 24-bit\n"));
             break;
         case 4:
-            LogFunc(("%s requested 32-bit\n", __FUNCTION__));
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            LogFunc(("Requested 32-bit\n"));
             enmFmt = AUD_FMT_S32;
-#else
-            enmFmt = AUD_FMT_S32;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
             break;
         default:
@@ -1774 +1724 @@
     if (RT_SUCCESS(rc))
     {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         pCfg->uHz = u32Hz * u32HzMult / u32HzDiv;
         pCfg->cChannels = (u32SdFmt & 0xf) + 1;
         pCfg->enmFormat = enmFmt;
         pCfg->enmEndianness = PDMAUDIOHOSTENDIANNESS;
-#else
-        pCfg->nchannels = (u32SdFmt & 0xf) + 1;
-        pCfg->fmt = enmFmt;
-        pCfg->endianness = 0;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
     }
 
@@ -1812 +1756 @@
                 rc = hdaCodecOpenStream(pThis->pCodec, PI_INDEX, &as);
             break;
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-# ifdef VBOX_WITH_HDA_MIC_IN
+#  ifdef VBOX_WITH_HDA_MIC_IN
         case HDA_REG_SD2FMT:
             RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
                 rc = hdaCodecOpenStream(pThis->pCodec, MC_INDEX, &as);
             break;
-# endif
-#endif
+#  endif
         default:
             LogFunc(("Warning: Attempt to change format on register %d\n", iReg));
@@ -1827 +1769 @@
     /** @todo r=andy rc gets lost; needs fixing. */
     return hdaRegWriteU16(pThis, iReg, u32Value);
-# else
+# else /* !VBOX_WITH_HDA_CODEC_EMU */
     return hdaRegWriteU16(pThis, iReg, u32Value);
 # endif
-#else
+#else /* !IN_RING3 */
     return VINF_IOM_R3_MMIO_WRITE;
 #endif
@@ -2184 +2126 @@
 }
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 /**
  * hdaReadAudio - copies samples from audio backend to DMA.
@@ -2244 +2185 @@
     return rc;
 }
-#else
-static int hdaReadAudio(PHDASTATE pThis, PHDASTREAMTRANSFERDESC pStreamDesc,
-                        uint32_t u32CblLimit, uint32_t *pu32Avail, uint32_t *pcbRead)
-{
-    PHDABDLEDESC pBdle = &pThis->StInBdle;
-
-    uint32_t cbTransferred = 0;
-    uint32_t cb2Copy = 0;
-    uint32_t cbBackendCopy = 0;
-
-    int rc;
-
-    Log(("hda:ra: CVI(pos:%d, len:%d)\n", pBdle->u32BdleCviPos, pBdle->u32BdleCviLen));
-
-    cb2Copy = hdaCalculateTransferBufferLength(pBdle, pStreamDesc, *pu32Avail, u32CblLimit);
-    if (!cb2Copy)
-    {
-        /* if we enter here we can't report "unreported bits" */
-        rc = VINF_EOF;
-    }
-    else
-    {
-        /*
-         * read from backend input line to the last unreported position or at the begining.
-         */
-        cbBackendCopy = AUD_read(pThis->pCodec->SwVoiceIn, pBdle->au8HdaBuffer, cb2Copy);
-
-        /*
-         * write the HDA DMA buffer
-         */
-        PDMDevHlpPCIPhysWrite(pThis->CTX_SUFF(pDevIns), pBdle->u64BdleCviAddr + pBdle->u32BdleCviPos, pBdle->au8HdaBuffer,
-                              cbBackendCopy);
-
-        /* Don't see any reason why cb2Copy would differ from cbBackendCopy */
-        Assert((cbBackendCopy == cb2Copy && (*pu32Avail) >= cb2Copy)); /* sanity */
-
-        if (pBdle->cbUnderFifoW + cbBackendCopy > hdaFifoWToSz(pThis, 0))
-        {
-            hdaBackendReadTransferReported(pBdle, cb2Copy, cbBackendCopy, &cbTransferred, pu32Avail);
-            rc = VINF_SUCCESS;
-        }
-        else
-        {
-            hdaBackendTransferUnreported(pThis, pBdle, pStreamDesc, cbBackendCopy, pu32Avail);
-            rc = VINF_EOF;
-        }
-    }
-
-    Assert((cbTransferred <= (SDFIFOS(pThis, 0) + 1)));
-    Log(("hda:ra: CVI(pos:%d, len:%d) cbTransferred: %d\n", pBdle->u32BdleCviPos, pBdle->u32BdleCviLen, cbTransferred));
-
-    if (pcbRead)
-        *pcbRead = cbTransferred;
-
-    return rc;
-}
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
 static int hdaWriteAudio(PHDASTATE pThis, PHDASTREAMTRANSFERDESC pStreamDesc, uint32_t u32CblLimit,
@@ -2330 +2214 @@
                           pBdle->u64BdleCviAddr + pBdle->u32BdleCviPos,
                           pBdle->au8HdaBuffer + pBdle->cbUnderFifoW, cb2Copy);
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+
+#ifdef VBOX_WITH_STATISTICS
         STAM_COUNTER_ADD(&pThis->StatBytesRead, cb2Copy);
 #endif
@@ -2339 +2224 @@
         if (cb2Copy + pBdle->cbUnderFifoW >= hdaFifoWToSz(pThis, pStreamDesc))
         {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
             uint32_t cbWritten;
             cbWrittenMin = UINT32_MAX;
@@ -2363 +2247 @@
             if (cbWrittenMin == UINT32_MAX)
                 cbWrittenMin = 0;
-#else
-            cbWrittenMin = AUD_write (pThis->pCodec->SwVoiceOut, pBdle->au8HdaBuffer, cb2Copy + pBdle->cbUnderFifoW);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
             hdaBackendWriteTransferReported(pBdle, cb2Copy, cbWrittenMin, &cbTransferred, pcbAvail);
@@ -2437 +2318 @@
 }
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 static DECLCALLBACK(int) hdaOpenIn(PHDASTATE pThis,
                                    const char *pszName, PDMAUDIORECSOURCE enmRecSource,
@@ -2548 +2428 @@
     return rc;
 }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+
 static DECLCALLBACK(void) hdaTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
@@ -2629 +2507 @@
 
     LogFlowFunc(("pThis=%p, cbAvail=%RU32\n", pThis, cbAvail));
-#else
-static DECLCALLBACK(int) hdaTransfer(PHDACODEC pCodec, ENMSOUNDSOURCE enmSrc, uint32_t cbAvail)
-{
-    AssertPtrReturn(pCodec, VERR_INVALID_POINTER);
-    PHDASTATE pThis = pCodec->pHDAState;
-    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     uint8_t      u8Strm;
@@ -2690 +2561 @@
         LogFunc(("CBL=%RU32, LPIB=%RU32\n", StreamDesc.u32Cbl, *StreamDesc.pu32Lpib));
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         PAUDMIXSINK pSink;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
         uint32_t cbWritten = 0;
         switch (enmSrc)
         {
             case PI_INDEX:
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
                 pSink = pThis->pSinkLineIn;
                 rc = hdaReadAudio(pThis, pSink, &StreamDesc, u32CblLimit, &cbAvail, &cbWritten);
-#else
-                rc = hdaReadAudio(pThis, &StreamDesc, u32CblLimit, (uint32_t *)&cbAvail, &cbWritten);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
                 break;
             case PO_INDEX:
                 rc = hdaWriteAudio(pThis, &StreamDesc, u32CblLimit, &cbAvail, &cbWritten);
                 break;
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-# ifdef VBOX_WITH_HDA_MIC_IN
+#ifdef VBOX_WITH_HDA_MIC_IN
             case MC_INDEX:
                 pSink = pThis->pSinkMicIn;
                 rc = hdaReadAudio(pThis, pSink, &StreamDesc, u32CblLimit, &cbAvail, &cbWritten);
                 break;
-# endif
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+#endif
             default:
                 AssertMsgFailed(("Unsupported source index %ld\n", enmSrc));
@@ -3247 +3110 @@
     bool fEnableOut   = RT_BOOL(SDCTL(pThis, 4) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PHDADRIVER pDrv;
     RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
@@ -3261 +3123 @@
             break;
     }
-#else
-    AUD_set_active_in(pThis->pCodec->SwVoiceIn, SDCTL(pThis, 0) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
-    AUD_set_active_out(pThis->pCodec->SwVoiceOut, SDCTL(pThis, 4) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     if (RT_SUCCESS(rc))
@@ -3508 +3366 @@
     LogFunc(("Resetting ...\n"));
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /* Stop any audio currently playing. */
     PHDADRIVER pDrv;
@@ -3520 +3377 @@
         /* Ditto. */
     }
-#else
-    AUD_set_active_in(pThis->pCodec->SwVoiceIn, false);
-    AUD_set_active_out(pThis->pCodec->SwVoiceOut, false);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     pThis->cbCorbBuf = 256 * sizeof(uint32_t);
@@ -3577 +3430 @@
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PHDADRIVER pDrv;
     while (!RTListIsEmpty(&pThis->lstDrv))
@@ -3592 +3444 @@
         pThis->pMixer = NULL;
     }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     if (pThis->pCodec)
@@ -3612 +3463 @@
 }
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 /**
  * Attach command.
@@ -3692 +3542 @@
     LogFlowFuncEnter();
 }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
 /**
@@ -3835 +3684 @@
         return rc;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     RTListInit(&pThis->lstDrv);
 
@@ -3892 +3740 @@
 
     LogFunc(("cLUNs=%RU8, rc=%Rrc\n", uLUN, rc));
-#else
-    /*
-     * Attach driver.
-     */
-    rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThis->IBase, &pThis->pDrvBase, "Audio Driver Port");
-    if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
-        Log(("hda: No attached driver!\n"));
-    else if (RT_FAILURE(rc))
-    {
-        AssertMsgFailed(("Failed to attach Intel HDA LUN #0! rc=%Rrc\n", rc));
-        return rc;
-    }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     if (RT_SUCCESS(rc))
@@ -3913 +3748 @@
             return PDMDEV_SET_ERROR(pDevIns, VERR_NO_MEMORY, N_("Out of memory allocating HDA codec state"));
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         /* Audio driver callbacks for multiplexing. */
         pThis->pCodec->pfnCloseIn   = hdaCloseIn;
@@ -3919 +3753 @@
         pThis->pCodec->pfnOpenIn    = hdaOpenIn;
         pThis->pCodec->pfnOpenOut   = hdaOpenOut;
+        pThis->pCodec->pfnReset     = hdaCodecReset;
         pThis->pCodec->pfnSetVolume = hdaSetVolume;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
         pThis->pCodec->pHDAState = pThis; /* Assign HDA controller state to codec. */
@@ -3935 +3769 @@
         PCIDevSetSubSystemVendorId(&pThis->PciDev, pThis->pCodec->u16VendorId); /* 2c ro - intel.) */
         PCIDevSetSubSystemId(      &pThis->PciDev, pThis->pCodec->u16DeviceId); /* 2e ro. */
-
-#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
-        pThis->pCodec->pfnTransfer = hdaTransfer;
-#endif
-        pThis->pCodec->pfnReset    = hdaCodecReset;
     }
 
@@ -4022 +3851 @@
     }
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     if (RT_SUCCESS(rc))
     {
@@ -4055 +3883 @@
     }
 # endif
-
-#endif
 
     LogFlowFuncLeaveRC(rc);

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

@@ -35 +35 @@
 
 #include "VBoxDD.h"
-#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
-extern "C" {
-#include "audio.h"
-}
-#endif
 #include "DevIchHdaCodec.h"
 
@@ -1167 +1162 @@
  * Misc helpers.
  */
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 static int hdaCodecToAudVolume(PHDACODEC pThis, AMPLIFIER *pAmp, PDMAUDIOMIXERCTL mt)
-#else
-static int hdaCodecToAudVolume(AMPLIFIER *pAmp, audmixerctl_t mt)
-#endif
 {
     uint32_t dir = AMPLIFIER_OUT;
@@ -1177 +1168 @@
     switch (mt)
     {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         case PDMAUDIOMIXERCTL_PCM:
             enmSrc = PO_INDEX;
-#else
-        case AUD_MIXER_VOLUME:
-        case AUD_MIXER_PCM:
-#endif
             dir = AMPLIFIER_OUT;
             break;
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         case PDMAUDIOMIXERCTL_LINE_IN:
             enmSrc = PI_INDEX;
-#else
-        case AUD_MIXER_LINE_IN:
-#endif
             dir = AMPLIFIER_IN;
             break;
@@ -1214 +1196 @@
     rVol = (rVol + 1) * (2 * 255) / 256;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    /** @todo In SetVolume no passing audmixerctl_in as its not used in DrvAudio.cpp. */
-    pThis->pfnSetVolume(pThis->pHDAState, enmSrc, RT_BOOL(mute), lVol, rVol);
-#else
-    AUD_set_volume(mt, &mute, &lVol, &rVol);
-#endif
-    return VINF_SUCCESS;
+    return pThis->pfnSetVolume(pThis->pHDAState, enmSrc, RT_BOOL(mute), lVol, rVol);
 }
 
@@ -1360 +1336 @@
 
         /** @todo Fix ID of u8AdcVolsLineIn! */
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         hdaCodecToAudVolume(pThis, pAmplifier, PDMAUDIOMIXERCTL_LINE_IN);
-#else
-        hdaCodecToAudVolume(pAmplifier, AUD_MIXER_LINE_IN);
-#endif
     }
     if (fIsOut)
@@ -1374 +1346 @@
 
         /** @todo Fix ID of u8DacLineOut! */
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         hdaCodecToAudVolume(pThis, pAmplifier, PDMAUDIOMIXERCTL_PCM);
-#else
-        hdaCodecToAudVolume(pAmplifier, AUD_MIXER_VOLUME);
-#endif
     }
 
@@ -2275 +2243 @@
 }
 
-#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
-static void pi_callback(void *opaque, int avail)
-{
-    PHDACODEC pThis = (PHDACODEC)opaque;
-    pThis->pfnTransfer(pThis, PI_INDEX, avail);
-}
-
-static void po_callback(void *opaque, int avail)
-{
-    PHDACODEC pThis = (PHDACODEC)opaque;
-    pThis->pfnTransfer(pThis, PO_INDEX, avail);
-}
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-
 /*
  * APIs exposed to DevHDA.
  */
-
 
 /**
@@ -2302 +2255 @@
  *       format) before enabling.
  */
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 int hdaCodecOpenStream(PHDACODEC pThis, ENMSOUNDSOURCE enmSoundSource, PPDMAUDIOSTREAMCFG pCfg)
-#else
-int hdaCodecOpenStream(PHDACODEC pThis, ENMSOUNDSOURCE enmSoundSource, audsettings_t *pAudioSettings)
+{
+    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+
+    int rc;
+
+    switch (enmSoundSource)
+    {
+        case PI_INDEX:
+            rc = pThis->pfnOpenIn(pThis->pHDAState, "hda.in", PDMAUDIORECSOURCE_LINE_IN, pCfg);
+            break;
+
+        case PO_INDEX:
+            rc = pThis->pfnOpenOut(pThis->pHDAState, "hda.out", pCfg);
+            break;
+
+#ifdef VBOX_WITH_HDA_MIC_IN
+        case MC_INDEX:
+            rc = pThis->pfnOpenIn(pThis->pHDAState, "hda.mc", PDMAUDIORECSOURCE_MIC, pCfg);
+            break;
 #endif
-{
-    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
-
-    int rc;
-
-    switch (enmSoundSource)
-    {
-        case PI_INDEX:
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-                rc = pThis->pfnOpenIn(pThis->pHDAState, "hda.in",
-                                      PDMAUDIORECSOURCE_LINE_IN, pCfg);
-#else
-                pThis->SwVoiceIn = AUD_open_in(&pThis->card, pThis->SwVoiceIn, "hda.in", pThis, pi_callback, pAudioSettings);
-                rc = pThis->SwVoiceIn ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
-#endif
-            break;
-
-        case PO_INDEX:
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-            rc = pThis->pfnOpenOut(pThis->pHDAState, "hda.out", pCfg);
-#else
-            pThis->SwVoiceOut = AUD_open_out(&pThis->card, pThis->SwVoiceOut, "hda.out", pThis, po_callback, pAudioSettings);
-            rc = pThis->SwVoiceOut ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
-#endif
-            break;
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-# ifdef VBOX_WITH_HDA_MIC_IN
-        case MC_INDEX:
-            rc = pThis->pfnOpenIn(pThis->pHDAState, "hda.mc",
-                                  PDMAUDIORECSOURCE_MIC, pCfg);
-            break;
-# endif
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-
         default:
             AssertMsgFailed(("Index %ld not implemented\n", enmSoundSource));
@@ -2416 +2350 @@
      */
     if (hdaCodecIsDacNode(pThis, pThis->u8DacLineOut))
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].dac.B_params, PDMAUDIOMIXERCTL_PCM);
-#else
-        hdaCodecToAudVolume(&pThis->paNodes[pThis->u8DacLineOut].dac.B_params, AUD_MIXER_VOLUME);
-#endif
     else if (hdaCodecIsSpdifOutNode(pThis, pThis->u8DacLineOut))
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].spdifout.B_params, PDMAUDIOMIXERCTL_PCM);
     hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8AdcVolsLineIn].adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
-#else
-        hdaCodecToAudVolume(&pThis->paNodes[pThis->u8DacLineOut].spdifout.B_params, AUD_MIXER_VOLUME);
-    hdaCodecToAudVolume(&pThis->paNodes[pThis->u8AdcVolsLineIn].adcvol.B_params, AUD_MIXER_LINE_IN);
-#endif
 
     return VINF_SUCCESS;
@@ -2468 +2393 @@
     pThis->paNodes[1].afg.u32F20_param = CODEC_MAKE_F20(pThis->u16VendorId, pThis->u8BSKU, pThis->u8AssemblyId);
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /* 44.1 kHz. */
     PDMAUDIOSTREAMCFG as;
@@ -2475 +2399 @@
     as.enmFormat     = AUD_FMT_S16;
     as.enmEndianness = PDMAUDIOHOSTENDIANNESS;
-#else
-    AUD_register_card("ICH0", &pThis->card);
-
-    /* 44.1 kHz */
-    audsettings_t as;
-    as.freq = 44100;
-    as.nchannels = 2;
-    as.fmt = AUD_FMT_S16;
-    as.endianness = 0;
-#endif
 
     pThis->paNodes[1].node.au32F00_param[0xA] = CODEC_F00_0A_16_BIT;
@@ -2490 +2404 @@
     hdaCodecOpenStream(pThis, PI_INDEX, &as);
     hdaCodecOpenStream(pThis, PO_INDEX, &as);
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-# ifdef VBOX_WITH_HDA_MIC_IN
+#ifdef VBOX_WITH_HDA_MIC_IN
     hdaCodecOpenStream(pThis, MC_INDEX, &as);
-# endif
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+#endif
 
     pThis->paNodes[1].node.au32F00_param[0xA] |= CODEC_F00_0A_44_1KHZ;
@@ -2505 +2417 @@
         pThis->pfnCodecNodeReset(pThis, i, &pThis->paNodes[i]);
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].dac.B_params, PDMAUDIOMIXERCTL_PCM);
     hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8AdcVolsLineIn].adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
 
-
-#else
-    hdaCodecToAudVolume(&pThis->paNodes[pThis->u8DacLineOut].dac.B_params, AUD_MIXER_VOLUME);
-    hdaCodecToAudVolume(&pThis->paNodes[pThis->u8AdcVolsLineIn].adcvol.B_params, AUD_MIXER_LINE_IN);
-
-    if (!AUD_is_host_voice_in_ok(pThis->SwVoiceIn))
-        LogRel (("HDA: WARNING: Unable to open PCM IN!\n"));
-    if (!AUD_is_host_voice_out_ok(pThis->SwVoiceOut))
-        LogRel (("HDA: WARNING: Unable to open PCM OUT!\n"));
-
-    if (   !AUD_is_host_voice_in_ok(pThis->SwVoiceIn)
-        && !AUD_is_host_voice_out_ok(pThis->SwVoiceOut))
-    {
-        AUD_close_in(&pThis->card, pThis->SwVoiceIn);
-        AUD_close_out(&pThis->card, pThis->SwVoiceOut);
-
-        pThis->SwVoiceOut = NULL;
-        pThis->SwVoiceIn = NULL;
-
-        AUD_init_null ();
-
-        PDMDevHlpVMSetRuntimeError (pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
-            N_ ("No audio devices could be opened. Selecting the NULL audio backend "
-                "with the consequence that no sound is audible"));
-    }
-    else if (   !AUD_is_host_voice_in_ok(pThis->SwVoiceIn)
-             || !AUD_is_host_voice_out_ok(pThis->SwVoiceOut))
-    {
-        char   szMissingVoices[128];
-        size_t len = 0;
-
-        if (!AUD_is_host_voice_in_ok(pThis->SwVoiceIn))
-            len = RTStrPrintf (szMissingVoices, sizeof(szMissingVoices), "PCM_in");
-        if (!AUD_is_host_voice_out_ok(pThis->SwVoiceOut))
-            len += RTStrPrintf (szMissingVoices + len, sizeof(szMissingVoices) - len, len ? ", PCM_out" : "PCM_out");
-
-        PDMDevHlpVMSetRuntimeError (pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
-            N_ ("Some audio devices (%s) could not be opened. Guest applications generating audio "
-                "output or depending on audio input may hang. Make sure your host audio device "
-                "is working properly. Check the logfile for error messages of the audio "
-                "subsystem"), szMissingVoices);
-    }
-#endif
-
-    return VINF_SUCCESS;
-}
-
+    return VINF_SUCCESS;
+}
+

trunk/src/VBox/Devices/Audio/DevIchHdaCodec.h

@@ -110 +110 @@
     const uint8_t           u8DacLineOut;
 #endif
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /* Callbacks to the HDA controller, mostly used for multiplexing to the various host backends. */
     DECLR3CALLBACKMEMBER(void, pfnCloseIn, (PHDASTATE pThis, PDMAUDIORECSOURCE enmRecSource));
@@ -117 +116 @@
     DECLR3CALLBACKMEMBER(int, pfnOpenOut, (PHDASTATE pThis, const char *pszName, PPDMAUDIOSTREAMCFG pCfg));
     DECLR3CALLBACKMEMBER(int, pfnSetVolume, (PHDASTATE pThis, ENMSOUNDSOURCE enmSource, bool fMute, uint8_t uVolLeft, uint8_t uVolRight));
-#else
-    QEMUSoundCard           card;
-    /** PCM in */
-    SWVoiceIn              *SwVoiceIn;
-    /** PCM out */
-    SWVoiceOut             *SwVoiceOut;
-    /* Callbacks for host driver backends. */
-    DECLR3CALLBACKMEMBER(int, pfnTransfer, (PHDACODEC pCodec, ENMSOUNDSOURCE enmSource, uint32_t cbAvail));
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
     /* Callbacks by codec implementation. */
     DECLR3CALLBACKMEMBER(int, pfnLookup, (PHDACODEC pThis, uint32_t verb, PPFNHDACODECVERBPROCESSOR));
@@ -139 +129 @@
 int hdaCodecSaveState(PHDACODEC pThis, PSSMHANDLE pSSM);
 int hdaCodecLoadState(PHDACODEC pThis, PSSMHANDLE pSSM, uint32_t uVersion);
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 int hdaCodecOpenStream(PHDACODEC pThis, PDMAUDIORECSOURCE enmRecSource, PDMAUDIOSTREAMCFG *pAudioSettings);
-#else
-int hdaCodecOpenVoice(PHDACODEC pThis, ENMSOUNDSOURCE enmSoundSource, audsettings_t *pAudioSettings);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
 #define HDA_SSM_VERSION   4

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

@@ -60 +60 @@
 #include <VBox/log.h>
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-# include "AudioMixer.h"
-#else
- extern "C" {
-  #include "audio.h"
- }
-#endif
+#include "AudioMixer.h"
 
 /** Current saved state version. */
@@ -83 +77 @@
 static const char e3[] = "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1992.";
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 typedef struct SB16OUTPUTSTREAM
 {
@@ -124 +117 @@
     SB16OUTPUTSTREAM                   Out;
 } SB16DRIVER, *PSB16DRIVER;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
 typedef struct SB16STATE
@@ -150 +142 @@
     int fmt_signed;
     int fmt_bits;
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PDMAUDIOFMT fmt;
-#else
-    audfmt_e fmt;
-    QEMUSoundCard card;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
     int dma_auto;
     int block_size;
@@ -191 +178 @@
     int align;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     RTLISTANCHOR                   lstDrv;
     /** The device' software mixer. */
@@ -201 +187 @@
     /** Timer ticks for handling the LUN drivers. */
     uint64_t                       uTicksIO;
-#else
-    uint32_t audio_free;
-    SWVoiceOut *voice;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     PTMTIMER  pTimerIRQ;
@@ -216 +198 @@
 } SB16STATE, *PSB16STATE;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 static int sb16OpenOut(PSB16STATE pThis, PPDMAUDIOSTREAMCFG pCfg);
-#endif
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+
 /**
  * Attach command.
@@ -292 +271 @@
     return rc;
 }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+
 static void sb16AudioCallback(void *pvContext, uint32_t cbFree);
-#else
-static void sb16AudioCallback(void *pvContext, int cbFree);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
 static int magic_of_irq(int irq)
@@ -368 +342 @@
     LogFlowFunc(("hold %d high %d dma %d\n", hold, pThis->use_hdma, dma));
 
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PSB16DRIVER pDrv;
-# endif
     if (hold)
     {
         PDMDevHlpDMASetDREQ (pThis->pDevIns, dma, 1);
         PDMDevHlpDMASchedule (pThis->pDevIns);
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
             pDrv->pConnector->pfnEnableOut(pDrv->pConnector,
                                            pDrv->Out.pStrmOut, true /* fEnable */);
-# else
-        AUD_set_active_out (pThis->voice, 1);
-# endif
     }
     else
     {
         PDMDevHlpDMASetDREQ (pThis->pDevIns, dma, 0);
-# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
             pDrv->pConnector->pfnEnableOut(pDrv->pConnector,
                                            pDrv->Out.pStrmOut, false /* fEnable */);
-# else
-        AUD_set_active_out (pThis->voice, 0);
-# endif
     }
 }
@@ -410 +374 @@
     if (pThis->freq > 0)
     {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         PDMAUDIOSTREAMCFG streamCfg;
         streamCfg.uHz           = pThis->freq;
@@ -419 +382 @@
         int rc = sb16OpenOut(pThis, &streamCfg);
         AssertRC(rc);
-#else
-        pThis->audio_free = 0;
-
-        audsettings_t streamCfg;
-        streamCfg.freq = pThis->freq;
-        streamCfg.nchannels = 1 << pThis->fmt_stereo;
-        streamCfg.fmt = pThis->fmt;
-        streamCfg.endianness = 0;
-        pThis->voice = AUD_open_out (
-            &pThis->card,
-            pThis->voice,
-            "sb16",
-            pThis,
-            sb16AudioCallback,
-            &streamCfg
-            );
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
     }
 
@@ -563 +509 @@
     if (pThis->freq)
     {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         PDMAUDIOSTREAMCFG streamCfg;
         streamCfg.uHz           = pThis->freq;
@@ -572 +517 @@
         int rc = sb16OpenOut(pThis, &streamCfg);
         AssertRC(rc);
-#else
-        pThis->audio_free = 0;
-
-        audsettings_t streamCfg;
-        streamCfg.freq = pThis->freq;
-        streamCfg.nchannels = 1 << pThis->fmt_stereo;
-        streamCfg.fmt = pThis->fmt;
-        streamCfg.endianness = 0;
-        pThis->voice = AUD_open_out (
-            &pThis->card,
-            pThis->voice,
-            "sb16",
-            pThis,
-            sb16AudioCallback,
-            &streamCfg
-            );
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
     }
 
@@ -1070 +998 @@
 static void sb16SetMasterVolume(PSB16STATE pThis)
 {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /* There's no mute switch, only volume controls. */
     uint8_t lvol = sb16MixRegToVol(pThis, 0x30);
@@ -1076 +1003 @@
     PDMAUDIOVOLUME vol = { false, lvol, rvol };
     AudioMixerSetMasterVolume(pThis->pMixer, &vol);
-#else
-    int     mute = 0;
-    uint8_t lvol = pThis->mixer_regs[0x30];
-    uint8_t rvol = pThis->mixer_regs[0x31];
-
-    AUD_set_volume(AUD_MIXER_VOLUME, &mute, &lvol, &rvol);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 }
 
 static void sb16SetPcmOutVolume(PSB16STATE pThis)
 {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /* There's no mute switch, only volume controls. */
     uint8_t lvol = sb16MixRegToVol(pThis, 0x32);
@@ -1093 +1012 @@
     PDMAUDIOVOLUME vol = { false, lvol, rvol };
     AudioMixerSetSinkVolume(pThis->pSinkOutput, &vol);
-#else
-    int     mute = 0;
-    uint8_t lvol = pThis->mixer_regs[0x32];
-    uint8_t rvol = pThis->mixer_regs[0x33];
-
-    AUD_set_volume(AUD_MIXER_PCM, &mute, &lvol, &rvol);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 }
 
@@ -1109 +1021 @@
     pThis->fmt_stereo = 0;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PDMAUDIOSTREAMCFG streamCfg;
     streamCfg.uHz           = pThis->freq;
@@ -1116 +1027 @@
     streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS;
 
-    int rc = sb16OpenOut(pThis, &streamCfg);
-    AssertRC(rc);
-#else
-    audsettings_t streamCfg;
-    streamCfg.freq = pThis->freq;
-    streamCfg.nchannels = 1;
-    streamCfg.fmt = AUD_FMT_U8;
-    streamCfg.endianness = 0;
-    pThis->voice = AUD_open_out (
-        &pThis->card,
-        pThis->voice,
-        "sb16",
-        pThis,
-        sb16AudioCallback,
-        &streamCfg
-        );
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-
-    /* Not sure about that... */
-    /* AUD_set_active_out (pThis->voice, 1); */
+    int rc2 = sb16OpenOut(pThis, &streamCfg);
+    AssertRC(rc2);
 }
 
@@ -1338 +1231 @@
 static void sb16MixerReset(PSB16STATE pThis)
 {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PSB16DRIVER pDrv;
 
@@ -1351 +1243 @@
         pThis->pMixer = NULL;
     }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-
-    memset (pThis->mixer_regs, 0xff, 0x7f);
-    memset (pThis->mixer_regs + 0x83, 0xff, sizeof (pThis->mixer_regs) - 0x83);
+
+    memset(pThis->mixer_regs, 0xff, 0x7f);
+    memset(pThis->mixer_regs + 0x83, 0xff, sizeof (pThis->mixer_regs) - 0x83);
 
     pThis->mixer_regs[0x02] = 4;    /* master volume 3bits */
@@ -1382 +1273 @@
         pThis->mixer_regs[i] = 0x80;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     int rc2 = AudioMixerCreate("SB16 Mixer", 0 /* uFlags */, &pThis->pMixer);
     if (RT_SUCCESS(rc2))
@@ -1401 +1291 @@
         AssertRC(rc2);
     }
-#endif
 
     /* Update the master (mixer) and PCM out volumes. */
@@ -1417 +1306 @@
 }
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-uint32_t popcount (uint32_t u) /** @todo r=andy WTF? */
+uint32_t popcount(uint32_t u) /** @todo r=andy WTF? */
 {
     u = ((u&0x55555555) + ((u>>1)&0x55555555));
@@ -1428 +1316 @@
 }
 
-uint32_t lsbindex (uint32_t u)
-{
-    return popcount ((u & -(int32_t)u) - 1);
-}
-#endif
+uint32_t lsbindex(uint32_t u)
+{
+    return popcount((u & -(int32_t)u) - 1);
+}
 
 /* Convert SB16 to SB Pro mixer volume (left). */
@@ -1656 +1543 @@
         AssertMsgRC(rc, ("DMAReadMemory -> %Rrc\n", rc));
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         uint32_t cbWritten;
 
@@ -1673 +1559 @@
             LogFlowFunc(("\tLUN#%RU8: cbWritten=%RU32, cWrittenMin=%RU32\n", pDrv->uLUN, cbWritten, cbWrittenMin));
         }
-#else
-        cbWrittenMin = AUD_write (pThis->voice, tmpbuf, cbToRead);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
         Assert(cbToWrite >= cbWrittenMin);
@@ -1704 +1587 @@
         pThis->left_till_irq = pThis->block_size;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PSB16DRIVER pDrv;
 
@@ -1728 +1610 @@
             return dma_pos;
     }
-#else
-    if (pThis->voice)
-    {
-        free = pThis->audio_free & ~pThis->align;
-        if ((free <= 0) || !dma_len)
-            return dma_pos;
-    }
-    else
-        free = dma_len;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     copy = free;
@@ -1786 +1658 @@
 }
 
-#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
-static void sb16AudioCallback(void *pvContext, int cbFree)
-{
-    PSB16STATE pState = (PSB16STATE)pvContext;
-    AssertPtrReturnVoid(pState);
-    pState->audio_free = cbFree;
-    /* New space available, see if we can transfer more. There is no cyclic DMA timer in VBox. */
-    PDMDevHlpDMASchedule(pState->pDevIns);
-}
-#else
 static DECLCALLBACK(void) sb16TimerIO(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
@@ -1862 +1724 @@
     TMTimerSet(pThis->pTimerIO, TMTimerGet(pThis->pTimerIO) + pThis->uTicksIO);
 }
-#endif /* !VBOX_WITH_PDM_AUDIO_DRIVER */
 
 static void sb16Save(PSSMHANDLE pSSM, PSB16STATE pThis)
@@ -1970 +1831 @@
     SSMR3GetMem(pSSM, pThis->mixer_regs, 256);
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 #if 0
     PSB16DRIVER pDrv;
@@ -1982 +1842 @@
     }
 #endif
-#else
-    AUD_close_out (&pThis->card, pThis->voice);
-    pThis->voice = NULL;
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     if (pThis->dma_running)
@@ -1991 +1847 @@
         if (pThis->freq)
         {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
             PDMAUDIOSTREAMCFG streamCfg;
             streamCfg.uHz           = pThis->freq;
@@ -2000 +1855 @@
             int rc = sb16OpenOut(pThis, &streamCfg);
             AssertRC(rc);
-#else
-            pThis->audio_free = 0;
-
-            audsettings_t as;
-            as.freq = pThis->freq;
-            as.nchannels = 1 << pThis->fmt_stereo;
-            as.fmt = pThis->fmt;
-            as.endianness = 0;
-            pThis->voice = AUD_open_out (
-                &pThis->card,
-                pThis->voice,
-                "sb16",
-                pThis,
-                sb16AudioCallback,
-                &as
-                );
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
         }
 
@@ -2096 +1934 @@
 }
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 static int sb16OpenOut(PSB16STATE pThis, PPDMAUDIOSTREAMCFG pCfg)
 {
@@ -2142 +1979 @@
     return rc;
 }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
 /**
@@ -2196 +2032 @@
     PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     PSB16DRIVER pDrv;
 
@@ -2209 +2044 @@
         pThis->pMixer = NULL;
     }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     return VINF_SUCCESS;
@@ -2284 +2118 @@
     pThis->csp_regs[9]             = 0xf8;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     RTListInit(&pThis->lstDrv);
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     sb16MixerReset(pThis);
@@ -2323 +2155 @@
      * Attach driver.
      */
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     uint8_t uLUN;
     for (uLUN = 0; uLUN < UINT8_MAX; uLUN)
@@ -2340 +2171 @@
 
     LogFunc(("cLUNs=%RU8, rc=%Rrc\n", uLUN, rc));
-#else
-    rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThis->IBase, &pThis->pDrvBase, "Audio Driver Port");
-    if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
-        LogFunc(("SB16: No attached driver!\n"));
-    else if (RT_FAILURE(rc))
-    {
-        AssertMsgFailed(("Failed to attach SB16 LUN #0! rc=%Rrc\n", rc));
-        return rc;
-    }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+
     sb16ResetLegacy(pThis);
 
@@ -2409 +2229 @@
         }
     }
-#else
-    AUD_register_card("sb16", &pThis->card);
-    sb16ResetLegacy(pThis);
-
-    if (!AUD_is_host_voice_out_ok(pThis->voice))
-    {
-        LogRel (("SB16: WARNING: Unable to open PCM OUT!\n"));
-        AUD_close_out (&pThis->card, pThis->voice);
-        pThis->voice = NULL;
-
-        AUD_init_null();
-
-        PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
-            N_("No audio devices could be opened. Selecting the NULL audio backend "
-               "with the consequence that no sound is audible"));
-    }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     return VINF_SUCCESS;

trunk/src/VBox/Devices/Audio/testcase/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2014 Oracle Corporation
+# Copyright (C) 2014-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK) && defined(VBOX_WITH_PDM_AUDIO_DRIVER)
+if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
 
  PROGRAMS += tstAudioMixBuffer
@@ -25 +25 @@
 
  tstAudioMixBuffer_TEMPLATE = VBOXR3TSTEXE
- tstAudioMixBuffer_DEFS    += TESTCASE VBOX_WITH_PDM_AUDIO_DRIVER
+ tstAudioMixBuffer_DEFS    += TESTCASE
  tstAudioMixBuffer_SOURCES  = \
         tstAudioMixBuffer.cpp \