Changeset 50686 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 4, 2014 7:21:18 PM (11 years ago)

Author:

vboxsync

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

92630

Message:

src/VBox/Devices/Audio, src/VBox/Main/src-client, include/VBox/vmm:

src/VBox/Devices/Audio: part of restructuring of audio code. Devices files correspondin to Hda, AC97 and SB16 audio. The structure of files have been modifed as per PDM specs. The modified code is under #ifdef VBOX_WITH_PDM_AUDIO_DRIVER

src/VBox/Main/src-client: Driver for the VRDE that interacts with DrvAudio. Enhancement of the CFGM tree for audio.

Config.kmk : addition of one configuration parameter that will control whether new audio code is disabled or enabled. "VBOX_WITH_PDM_AUDIO_DRIVER"

pdmaudioifs.h: common header file between Device , Intermediate audio driver and Backends specific to audio.

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevIchAc97.cpp (modified) (31 diffs)
• Audio/DevIchHda.cpp (modified) (25 diffs)
• Audio/DevIchHdaCodec.cpp (modified) (16 diffs)
• Audio/DevIchHdaCodec.h (modified) (4 diffs)
• Audio/DevSB16.cpp (modified) (70 diffs)
• Audio/mixeng.c (modified) (4 diffs)
• Audio/mixeng.h (modified) (3 diffs)
• Audio/mixeng_template.h (modified) (4 diffs)
• Makefile.kmk (modified) (5 diffs)
• build/VBoxDD.cpp (modified) (2 diffs)
• build/VBoxDD.h (modified) (2 diffs)

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

@@ -21 +21 @@
 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
 #include <VBox/vmm/pdmdev.h>
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+#include <VBox/vmm/pdmaudioifs.h>
+#endif
 #include <iprt/assert.h>
 #include <iprt/uuid.h>
@@ -26 +29 @@
 
 #include "VBoxDD.h"
-
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
 extern "C" {
 #include "audio.h"
 }
+#endif
 
 
@@ -194 +198 @@
 
     /** Audio stuff.  */
-    QEMUSoundCard           card;
-
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
+    QEMUSoundCard card;
+#endif
     /** Global Control (Bus Master Control Register) */
     uint32_t                glob_cnt;
@@ -206 +211 @@
     AC97BusMasterRegs       bm_regs[3];
     uint8_t                 mixer_data[256];
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    /** PCM in */
+    PPDMGSTVOICEIN          voice_pi[2];
+    /** PCM out */
+    PPDMGSTVOICEOUT         voice_po[2];
+    /** Mic in */
+    PPDMGSTVOICEIN          voice_mc[2];
+#else
     /** PCM in */
     SWVoiceIn              *voice_pi;
@@ -212 +225 @@
     /** Mic in */
     SWVoiceIn              *voice_mc;
+#endif
     uint8_t                 silence[128];
     int                     bup_flag;
@@ -217 +231 @@
     PPDMDEVINSR3            pDevIns;
     /** Pointer to the connector of the attached audio driver. */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    PPDMIAUDIOCONNECTOR     pDrv[2];
+#else
     PPDMIAUDIOCONNECTOR     pDrv;
+#endif
     /** Pointer to the attached audio driver. */
     PPDMIBASE               pDrvBase;
@@ -355 +373 @@
     switch (bm_index)
     {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        uint32_t lun;
+        case PI_INDEX:
+            for (lun = 0; lun < 2; lun++)
+                pThis->pDrv[lun]->pfnEnableIn(pThis->pDrv[lun], pThis->voice_pi[lun], on);
+            break;
+        case PO_INDEX:
+            for (lun = 0; lun < 2; lun++)
+                pThis->pDrv[lun]->pfnEnableOut(pThis->pDrv[lun], pThis->voice_po[lun], on);
+        break;
+        case MC_INDEX:
+            for (lun = 0; lun < 2; lun++)
+                pThis->pDrv[lun]->pfnEnableIn(pThis->pDrv[lun], pThis->voice_mc[lun], on);
+            break;
+#else
         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;
+#endif
         default:       AssertFailed (); break;
     }
@@ -374 +408 @@
     pReg->cr       = pReg->cr & CR_DONT_CLEAR_MASK;
     pReg->bd_valid = 0;
-
     voice_set_active(pThis, pReg - pThis->bm_regs, 0);
     memset(pThis->silence, 0, sizeof(pThis->silence));
@@ -408 +441 @@
 static void open_voice(PAC97STATE pThis, int index, int freq)
 {
-    audsettings_t as;
-
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    int rc;
+#endif
+    LogFlow(("DevIchAC97: open_voice freq = %d\n", freq));
     if (freq)
     {
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
+        audsettings_t as;
         as.freq       = freq;
         as.nchannels  = 2;
         as.fmt        = AUD_FMT_S16;
         as.endianness = 0;
-
+        uint32_t lun;
+#endif
         switch (index)
         {
             case PI_INDEX: /* PCM in */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                for (uint32_t lun = 0; lun < 2; lun++)
+                    rc = pThis->pDrv[lun]->pfnOpenIn(pThis->pDrv[lun], &pThis->voice_pi[lun], "ac97.pi",
+                                                     pThis, pi_callback, freq, 2, AUD_FMT_S16, 0);
+#else
                 pThis->voice_pi = AUD_open_in(&pThis->card, pThis->voice_pi, "ac97.pi", pThis, pi_callback, &as);
+#endif
 #ifdef LOG_VOICES
                 LogRel(("AC97: open PI freq=%d (%s)\n", freq, pThis->voice_pi ? "ok" : "FAIL"));
@@ -427 +471 @@
 
             case PO_INDEX: /* PCM out */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                for (int lun = 0; lun < 2; lun++)
+                {
+                    LogFlow(("LUN###%d\n", lun));
+                    rc = pThis->pDrv[lun]->pfnOpenOut(pThis->pDrv[lun], &pThis->voice_po[lun], "ac97.po",
+                                                      pThis, po_callback, freq, 2, AUD_FMT_S16, 0);
+                }
+#else
                 pThis->voice_po = AUD_open_out(&pThis->card, pThis->voice_po, "ac97.po", pThis, po_callback, &as);
+#endif
 #ifdef LOG_VOICES
                 LogRel(("AC97: open PO freq=%d (%s)\n", freq, pThis->voice_po ? "ok" : "FAIL"));
@@ -434 +487 @@
 
             case MC_INDEX: /* Mic in */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                for (uint32_t lun = 0; lun < 2; lun++)
+                    rc = pThis->pDrv[lun]->pfnOpenIn(pThis->pDrv[lun], &pThis->voice_mc[lun], "ac97.mc",
+                                                     pThis, mc_callback, freq, 2, AUD_FMT_S16, 0);
+#else
                 pThis->voice_mc = AUD_open_in(&pThis->card, pThis->voice_mc, "ac97.mc", pThis, mc_callback, &as);
+#endif
 #ifdef LOG_VOICES
                 LogRel(("AC97: open MC freq=%d (%s)\n", freq, pThis->voice_mc ? "ok" : "FAIL"));
@@ -446 +505 @@
         {
             case PI_INDEX:
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                for (uint32_t lun = 0; lun < 2; lun++)
+                {
+                    pThis->pDrv[lun]->pfnCloseIn(pThis->pDrv[lun], pThis->voice_pi[lun]);
+                    pThis->voice_pi[lun] = NULL;
+                }
+#else
                 AUD_close_in(&pThis->card, pThis->voice_pi);
+                pThis->voice_pi = NULL;
+#endif
 #ifdef LOG_VOICES
                 LogRel(("AC97: Closing PCM IN\n"));
 #endif
-                pThis->voice_pi = NULL;
                 break;
 
             case PO_INDEX:
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                for (uint32_t lun = 0; lun < 2; lun++)
+                {
+                    pThis->pDrv[lun]->pfnCloseOut(pThis->pDrv[lun], pThis->voice_po[lun]);
+                    pThis->voice_po[lun] = NULL;
+                }
+#else
                 AUD_close_out(&pThis->card, pThis->voice_po);
+                pThis->voice_po = NULL;
+#endif
 #ifdef LOG_VOICES
                 LogRel(("AC97: Closing PCM OUT\n"));
 #endif
-                pThis->voice_po = NULL;
                 break;
 
             case MC_INDEX:
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                for (uint32_t lun = 0; lun < 2; lun++)
+                {
+                    pThis->pDrv[lun]->pfnCloseIn(pThis->pDrv[lun], pThis->voice_mc[lun]);
+                    pThis->voice_mc[lun] = NULL;
+                }
+#else
                 AUD_close_in(&pThis->card, pThis->voice_mc);
+                pThis->voice_mc = NULL;
+#endif
 #ifdef LOG_VOICES
                 LogRel(("AC97: Closing MIC IN\n"));
 #endif
-                pThis->voice_mc = NULL;
                 break;
         }
@@ -478 +561 @@
     freq = mixer_load(pThis, AC97_PCM_LR_ADC_Rate);
     open_voice(pThis, PI_INDEX, freq);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    for (uint32_t lun = 0; lun < 2; lun++)
+        pThis->pDrv[lun]->pfnEnableIn(pThis->pDrv[lun], pThis->voice_pi[lun], active[PI_INDEX]);
+#else
     AUD_set_active_in(pThis->voice_pi, active[PI_INDEX]);
-
+#endif
     freq = mixer_load(pThis, AC97_PCM_Front_DAC_Rate);
+    LogFlow(("DevIchAC97: reset_voices calling open_voice freq = %d\n", freq));
     open_voice(pThis, PO_INDEX, freq);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    for (uint32_t lun = 0; lun < 2; lun++)
+        pThis->pDrv[lun]->pfnEnableOut(pThis->pDrv[lun], pThis->voice_po[lun], active[PO_INDEX]);
+#else
     AUD_set_active_out(pThis->voice_po, active[PO_INDEX]);
+#endif
 
     freq = mixer_load(pThis, AC97_MIC_ADC_Rate);
     open_voice(pThis, MC_INDEX, freq);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    for (uint32_t lun = 0; lun < 2; lun++)
+        pThis->pDrv[lun]->pfnEnableIn(pThis->pDrv[lun], pThis->voice_mc[lun], active[MC_INDEX]);
+#else
     AUD_set_active_in(pThis->voice_mc, active[MC_INDEX]);
+#endif
 }
 
@@ -501 +599 @@
 # ifdef SOFT_VOLUME
     if (index == AC97_Master_Volume_Mute)
+    {
+#  ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    for (uint32_t lun = 0; lun < 1; lun++)
+        pThis->pDrv[lun]->pfnIsSetOutVolume(pThis->pDrv[lun], pThis->voice_po[lun], mute, lvol, rvol);
+#  else
         AUD_set_volume_out(pThis->voice_po, mute, lvol, rvol);
+#  endif
+    }
     else
+    {
+#  ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        for (uint32_t lun = 0; lun < 1; lun++)
+            /* @tod0 in SetVolume no passing audmixerctl_in as its not used in DrvAudio.c */
+            pThis->pDrv[lun]->pfnSetVolume(pThis->pDrv[lun], &mute, &lvol, &rvol);
+#  else
         AUD_set_volume(mt, &mute, &lvol, &rvol);
+#  endif
+    }
 # else
+#  ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    for (uint32_t lun = 0; lun < 1; lun++)
+        pThis->pDrv[lun]->pfnSetVolume(pThis->pDrv[lun], &mute, &lvol, &rvol);
+#  else
     AUD_set_volume(mt, &mute, &lvol, &rvol);
+#  endif
 # endif
 
@@ -565 +683 @@
     audrecsource_t ars = ac97_to_aud_record_source(rs);
     audrecsource_t als = ac97_to_aud_record_source(ls);
-    AUD_set_record_source(&als, &ars);
+    //AUD_set_record_source(&als, &ars);
     rs = aud_to_ac97_record_source(ars);
     ls = aud_to_ac97_record_source(als);
@@ -607 +725 @@
     mixer_store(pThis, AC97_MIC_ADC_Rate            , 0xbb80);
 
+
+
 #ifdef USE_MIXER
     record_select(pThis, 0);
@@ -630 +750 @@
     uint32_t    written = 0;
     int         to_copy = 0;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    /* count of bytes left in buf to read = samples left in buffer (each of 16 bit) to read denoted by picb * 2) */
+    uint32_t    cbToRead = pReg->picb << 1;
+    uint32_t    cbMinToRead;
+    uint8_t     tmpbufCopy[4096];
+    int    lun = 0;
+    uint32_t    slowestLun;
+    uint32_t    cSamplesLeft;
+#endif
 
     temp = audio_MIN(temp, (uint32_t)max);
@@ -643 +772 @@
         to_copy = audio_MIN(temp, sizeof(tmpbuf));
         PDMDevHlpPhysRead(pDevIns, addr, tmpbuf, to_copy);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        /* save a copy of the audio samples read */
+        memcpy(tmpbufCopy, tmpbuf, to_copy);
+        uint32_t slowlun = 0;
+        for (lun = 0; lun < 2; lun++)
+        {
+            LogFlow(("DevIchAC97: write_audio to_copy = %d LUN##%d\n", to_copy, lun));
+            copied = pThis->pDrv[lun]->pfnWrite(pThis->pDrv[lun], pThis->voice_po[lun], tmpbuf, to_copy);
+            /* call pfnwrite with the same data that has been read from the guest physical memory */
+            LogFlow(("DevIchAC97: write_audio copied = %d\n", copied));
+        }
+#else
         copied = AUD_write(pThis->voice_po, tmpbuf, to_copy);
-        Log(("ac97: write_audio max=%x to_copy=%x copied=%x\n", max, to_copy, copied));
+#endif
         if (!copied)
         {
@@ -673 +814 @@
 {
     int written = 0;
-
     Log(("ac97: write_bup\n"));
     if (!(pThis->bup_flag & BUP_SET))
@@ -693 +833 @@
     {
         unsigned int temp = audio_MIN((unsigned int)elapsed, sizeof(pThis->silence));
+        int copied;
         while (temp)
         {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            for (int lun = 0; lun < 2; lun++)
+            {
+                LogFlow(("DevIchAC97: write_silence LUN##%d , to_copy=%d\n", lun, temp));
+                copied = pThis->pDrv[lun]->pfnWrite(pThis->pDrv[lun], pThis->voice_po[lun], pThis->silence, temp);
+                LogFlow(("DevIchAC97: write_silence LUN##%d , copied=%d\n", lun, copied));
+            }
+#else
             int copied = AUD_write(pThis->voice_po, pThis->silence, temp);
+#endif
             if (!copied)
                 return;
@@ -708 +858 @@
 {
     PPDMDEVINS  pDevIns = ICHAC97STATE_2_DEVINS(pThis);
-    uint8_t     tmpbuf[4096];
+
     uint32_t    addr = pReg->bd.addr;
     uint32_t    temp = pReg->picb << 1;
     uint32_t    nread = 0;
     int         to_copy = 0;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    uint8_t     u8DupBuf[4096];
+    PDMHOSTSTEREOSAMPLE     tmpbuf[4096];
+    PDMHOSTSTEREOSAMPLE MixBuf[2000];
+    PDMHOSTSTEREOSAMPLE InputBuf[2000];
+    PPDMHOSTSTEREOSAMPLE SrcBuf;
+    uint32_t    cSamplesMixed = 0;
+    uint32_t    cTotalSamplesMixed = 0;
+    uint32_t    cSamplesRead = 0;
+    uint32_t    offRead = 0;
+    uint32_t    offWrite = 0;
+    uint32_t    cTotalSamplesRead = 0;
+    uint32_t isamp = 0, osamp = 0;
+    uint32_t lun =0;
+    PPDMGSTVOICEIN voice[2];
+    memset(MixBuf, 0, sizeof(MixBuf));
+    memset(InputBuf, 0, sizeof(InputBuf));
+    memset(u8DupBuf, 0, sizeof(u8DupBuf));
+    void * rate[2];
+
+    for (lun = 0; lun < 2; lun++)
+        voice[lun] = (pReg - pThis->bm_regs) == MC_INDEX ? pThis->voice_mc[lun] : pThis->voice_pi[lun];
+#else
     SWVoiceIn  *voice = (pReg - pThis->bm_regs) == MC_INDEX ? pThis->voice_mc : pThis->voice_pi;
+#endif
 
     temp = audio_MIN(temp, (uint32_t)max);
@@ -722 +896 @@
     }
 
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    rate[0] = pThis->pDrv[0]->pfnPrepareAudioConversion(pThis->pDrv[0], 48000, 48000);
+    //rate[1] = pThis->pDrv[1]->pfnPrepareAudioConversion(pThis->pDrv[1], 22100, 22100);
+    rate[1] = pThis->pDrv[1]->pfnPrepareAudioConversion(pThis->pDrv[1], 48000, 48000);
+    for (lun = 0; lun < 2; lun++)
+    {
+        temp = pReg->picb << 1;
+        temp = audio_MIN(temp, (uint32_t)max);
+        LogFlow(("DevIchAC97: temp = %d and max = %d\n", temp, max));
+        if (!temp)
+        {
+            *stop = 1;
+            return 0;
+        }
+        memset(tmpbuf, 0, sizeof(tmpbuf));
+        offRead = 0;
+        offWrite = 0;
+        cSamplesMixed = 0;
+        nread = 0;
+        while (temp)
+        {
+            int acquired;
+            to_copy = audio_MIN(temp, sizeof(tmpbuf));
+            acquired = pThis->pDrv[lun]->pfnRead(pThis->pDrv[lun], voice[lun], tmpbuf, to_copy);
+            cSamplesRead = acquired >> voice[lun]->Props.cShift;
+            while (cSamplesRead)
+            {
+                SrcBuf = tmpbuf + offRead;
+                isamp = cSamplesRead;
+                if (!isamp)
+                {
+                    LogFlow(("DevichAC97: No Input samples \n"));
+                    break;
+                }
+                osamp = cSamplesRead - cSamplesMixed; /*sizeof(MixBuf)*/;
+                pThis->pDrv[lun]->pfnDoRateConvAndMix(pThis->pDrv[lun], rate[lun], SrcBuf,
+                                                    MixBuf, &isamp, &osamp);
+                cSamplesRead -= isamp;
+                offRead += isamp;
+                offWrite += osamp;
+                cSamplesMixed += isamp;
+            }
+            if (!acquired)
+            {
+                *stop = 1;
+                break;
+            }
+            pThis->pDrv[lun]->pfnConvStSampleToDevFmt(pThis->pDrv[lun], u8DupBuf, MixBuf, cSamplesMixed);
+            temp  -= acquired;
+            //addr  += acquired;
+            //addr  += (ctotalSamplexMixed << voice->Props.cShift);
+            //nread += (cSamplesMixed << voice->Props.cShift);
+            nread += acquired;
+            LogFlow(("DevIchAC97: looping temp = %d\n", temp));
+            cTotalSamplesRead = audio_MAX(cTotalSamplesRead, nread);
+            cTotalSamplesMixed = audio_MAX(cTotalSamplesMixed, cSamplesMixed);
+        }
+    }
+    if (cTotalSamplesMixed)
+        PDMDevHlpPCIPhysWrite(pDevIns, addr, u8DupBuf, (cTotalSamplesMixed << voice[0]->Props.cShift));
+    addr  += (cTotalSamplesMixed << voice[0]->Props.cShift);
+    nread = cTotalSamplesRead;
+#else
+    uint8_t tmpbuf[4096];
     while (temp)
     {
@@ -737 +975 @@
         nread += acquired;
     }
-
+#endif
     pReg->bd.addr = addr;
     return nread;
@@ -806 +1044 @@
                 break;
         }
-
         Log(("pReg->picb = %d\n", pReg->picb));
 
@@ -814 +1051 @@
 
             if (pReg->bd.ctl_len & BD_IOC)
+            {
                 new_sr |= SR_BCIS;
+            }
 
             if (pReg->civ == pReg->lvi)
@@ -1262 +1501 @@
                     {
                         mixer_store(pThis, AC97_MIC_ADC_Rate, 0xbb80);
-                        open_voice(pThis, MC_INDEX, 48000);
+                         open_voice(pThis, MC_INDEX, 48000);
                     }
                     Log(("ac97: Setting extended audio control to %#x\n", u32));
@@ -1378 +1617 @@
 
     uint8_t active[LAST_INDEX];
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    /* writing only host backend values here and ignoring for webm and VRDE */
+    active[PI_INDEX] = pThis->pDrv[0]->pfnIsActiveIn(pThis->pDrv[0],  pThis->voice_pi[0]) ? 1 : 0;
+    active[PO_INDEX] = pThis->pDrv[0]->pfnIsActiveOut(pThis->pDrv[0], pThis->voice_po[0]) ? 1 : 0;
+    active[MC_INDEX] = pThis->pDrv[0]->pfnIsActiveIn(pThis->pDrv[0],  pThis->voice_mc[0]) ? 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
     SSMR3PutMem(pSSM, active, sizeof(active));
 
@@ -1543 +1789 @@
      * Attach driver.
      */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    for (uint32_t lun = 0; lun < 2; lun++)
+    {
+        rc = PDMDevHlpDriverAttach(pDevIns, lun, &pThis->IBase, &pThis->pDrvBase, "Audio Driver Port");
+        if (RT_SUCCESS(rc))
+        {
+            pThis->pDrv[lun] = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIAUDIOCONNECTOR);
+            AssertMsgReturn(pThis->pDrv[lun],
+                            ("Configuration error: instance %d has no host audio interface!\n", iInstance),
+                            VERR_PDM_MISSING_INTERFACE);
+        }
+        else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+            Log(("ac97: No attached driver!\n"));
+        else if (RT_FAILURE(rc))
+        {
+            AssertMsgFailed(("Failed to attach AC97 LUN #%d! rc=%Rrc\n", lun, rc));
+            return rc;
+        }
+    }
+#else
     rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThis->IBase, &pThis->pDrvBase, "Audio Driver Port");
     if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
@@ -1551 +1817 @@
         return rc;
     }
-
+#endif
+
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    pThis->pDrv[0]->pfnRegisterCard(pThis->pDrv[0], "ICH0" );
+#else
     AUD_register_card("ICH0", &pThis->card);
-
+#endif
     ac97Reset(pDevIns);
 
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    for (uint32_t lun =0; lun < 2; lun++)
+    {
+        if (!pThis->pDrv[lun]->pfnIsHostVoiceInOK(pThis->pDrv[lun], pThis->voice_pi[lun]))
+            LogRel(("AC97: WARNING: Unable to open PCM IN!\n"));
+        if (!pThis->pDrv[lun]->pfnIsHostVoiceInOK(pThis->pDrv[lun], pThis->voice_mc[lun]))
+            LogRel(("AC97: WARNING: Unable to open PCM MC!\n"));
+        if (!pThis->pDrv[lun]->pfnIsHostVoiceOutOK(pThis->pDrv[lun], pThis->voice_po[lun]))
+            LogRel(("AC97: WARNING: Unable to open PCM OUT!\n"));
+    }
+#else
     if (!AUD_is_host_voice_in_ok(pThis->voice_pi))
         LogRel(("AC97: WARNING: Unable to open PCM IN!\n"));
@@ -1563 +1845 @@
         LogRel(("AC97: WARNING: Unable to open PCM OUT!\n"));
 
+#endif
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    for (uint32_t lun = 0; lun < 2; lun++)
+    {
+        if (   !pThis->pDrv[lun]->pfnIsHostVoiceInOK(pThis->pDrv[lun], pThis->voice_pi[lun])
+            && !pThis->pDrv[lun]->pfnIsHostVoiceOutOK(pThis->pDrv[lun], pThis->voice_po[lun])
+            && !pThis->pDrv[lun]->pfnIsHostVoiceInOK(pThis->pDrv[lun], pThis->voice_mc[lun]))
+        {
+        /* Was not able initialize *any* voice. Select the NULL audio driver instead */
+            pThis->pDrv[lun]->pfnCloseIn(pThis->pDrv[lun], pThis->voice_pi[lun]);
+            pThis->pDrv[lun]->pfnCloseOut(pThis->pDrv[lun], pThis->voice_po[lun]);
+            pThis->pDrv[lun]->pfnCloseIn(pThis->pDrv[lun], pThis->voice_mc[lun]);
+
+            pThis->voice_po[lun] = NULL;
+            pThis->voice_pi[lun] = NULL;
+            pThis->voice_mc[lun] = NULL;
+
+            pThis->pDrv[lun]->pfnInitNull(pThis->pDrv[lun]);
+            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 (   !pThis->pDrv[lun]->pfnIsHostVoiceInOK(pThis->pDrv[lun], pThis->voice_pi[lun])
+                 || !pThis->pDrv[lun]->pfnIsHostVoiceOutOK(pThis->pDrv[lun], pThis->voice_po[lun])
+                 || !pThis->pDrv[lun]->pfnIsHostVoiceInOK(pThis->pDrv[lun], pThis->voice_mc[lun]))
+        {
+            char   szMissingVoices[128];
+            size_t len = 0;
+            if (!pThis->pDrv[lun]->pfnIsHostVoiceInOK(pThis->pDrv[lun], pThis->voice_pi[lun]))
+                len = RTStrPrintf(szMissingVoices, sizeof(szMissingVoices), "PCM_in");
+            if (!pThis->pDrv[lun]->pfnIsHostVoiceOutOK(pThis->pDrv[lun], pThis->voice_po[lun]))
+                len += RTStrPrintf(szMissingVoices + len, sizeof(szMissingVoices) - len, len ? ", PCM_out" : "PCM_out");
+            if (!pThis->pDrv[lun]->pfnIsHostVoiceInOK(pThis->pDrv[lun], pThis->voice_mc[lun]))
+                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);
+        }
+    }
+#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))
     {
-        /* Was not able initialize *any* voice. Select the NULL audio driver instead */
-        AUD_close_in( &pThis->card, pThis->voice_pi);
+        AUD_close_in(&pThis->card, pThis->voice_pi);
         AUD_close_out(&pThis->card, pThis->voice_po);
-        AUD_close_in( &pThis->card, pThis->voice_mc);
+        AUD_close_in(&pThis->card, pThis->voice_mc);
+
         pThis->voice_po = NULL;
         pThis->voice_pi = NULL;
@@ -1600 +1928 @@
                "subsystem"), szMissingVoices);
     }
-
+#endif
     return VINF_SUCCESS;
 }

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

@@ -25 +25 @@
 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
 #include <VBox/vmm/pdmdev.h>
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+#include <VBox/vmm/pdmaudioifs.h>
+#endif
 #include <VBox/version.h>
 
@@ -38 +41 @@
 #include "VBoxDD.h"
 
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
 extern "C" {
 #include "audio.h"
 }
+#endif
 #include "DevIchHdaCodec.h"
 
@@ -547 +552 @@
 
     /** Pointer to the connector of the attached audio driver. */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    R3PTRTYPE(PPDMIAUDIOCONNECTOR)     pDrv[2];
+#else
     R3PTRTYPE(PPDMIAUDIOCONNECTOR)     pDrv;
+#endif
     /** Pointer to the attached audio driver. */
     R3PTRTYPE(PPDMIBASE)               pDrvBase;
@@ -577 +586 @@
     /** Flag whether the RC part is enabled. */
     bool                               fRCEnabled;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /** The HDA codec state. */
+    R3PTRTYPE(PHDACODEC)               pCodec[2];
+#else
     R3PTRTYPE(PHDACODEC)               pCodec;
+#endif
     uint64_t                           u64BaseTS;
     /** 1.2.3.4.5.6.7. - someone please tell me what I'm counting! - .8.9.10... */
@@ -1108 +1121 @@
         corbRp++;
         cmd = pThis->pu32CorbBuf[corbRp];
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        for (uint32_t lun = 0; lun < 1; lun++)
+            rc = pThis->pCodec[lun]->pfnLookup(pThis->pCodec[lun], cmd, &pfn);
+#else
         rc = pThis->pCodec->pfnLookup(pThis->pCodec, cmd, &pfn);
+#endif
         if (RT_FAILURE(rc))
             AssertRCReturn(rc, rc);
@@ -1115 +1133 @@
 
         if (RT_LIKELY(pfn))
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        {
+            for (uint32_t lun = 0; lun < 1; lun++)
+                rc = pfn(pThis->pCodec[lun], cmd, &resp);
+        }
+#else
             rc = pfn(pThis->pCodec, cmd, &resp);
+#endif
         else
             rc = VERR_INVALID_FUNCTION;
@@ -1433 +1458 @@
             {
                 case HDA_REG_SD0CTL:
+ #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                    for (uint32_t lun = 0; lun < 1; lun++)
+                        pThis->pDrv[lun]->pfnEnableIn(pThis->pDrv[lun], pThis->pCodec[lun]->SwVoiceIn, fRun);
+ #else
                     AUD_set_active_in(pThis->pCodec->SwVoiceIn, fRun);
+ #endif
                     break;
                 case HDA_REG_SD4CTL:
+ #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+                    for (uint32_t lun = 0; lun < 1; lun++)
+                        pThis->pDrv[lun]->pfnEnableOut(pThis->pDrv[lun], pThis->pCodec[lun]->SwVoiceOut, fRun);
+ #else
                     AUD_set_active_out(pThis->pCodec->SwVoiceOut, fRun);
+ #endif
                     break;
                 default:
@@ -1524 +1559 @@
 
 #ifdef IN_RING3
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+static void hdaSdFmtToAudSettings(uint32_t u32SdFmt, uint32_t * pFrequency, uint32_t * pChannels, audfmt_e *pFormat, uint32_t *pEndian)
+# else
 static void hdaSdFmtToAudSettings(uint32_t u32SdFmt, audsettings_t *pAudSetting)
-{
+# endif
+{
+# ifndef VBOX_WITH_PDM_AUDIO_DRIVER
     Assert((pAudSetting));
-#define EXTRACT_VALUE(v, mask, shift) ((v & ((mask) << (shift))) >> (shift))
+# endif
+# define EXTRACT_VALUE(v, mask, shift) ((v & ((mask) << (shift))) >> (shift))
     uint32_t u32Hz = (u32SdFmt & HDA_SDFMT_BASE_RATE_SHIFT) ? 44100 : 48000;
     uint32_t u32HzMult = 1;
@@ -1551 +1592 @@
         case 7: u32HzDiv = 8; break;
     }
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    *pFrequency = u32Hz * u32HzMult / u32HzDiv;
+# else
     pAudSetting->freq = u32Hz * u32HzMult / u32HzDiv;
+# endif
 
     switch (EXTRACT_VALUE(u32SdFmt, HDA_SDFMT_BITS_MASK, HDA_SDFMT_BITS_SHIFT))
@@ -1557 +1602 @@
         case 0:
             Log(("hda: %s requested 8-bit\n", __FUNCTION__));
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            *pFormat = AUD_FMT_S8;
+# else
             pAudSetting->fmt = AUD_FMT_S8;
+# endif
             break;
         case 1:
             Log(("hda: %s requested 16-bit\n", __FUNCTION__));
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            *pFormat = AUD_FMT_S16;
+# else
             pAudSetting->fmt = AUD_FMT_S16;
+# endif
             break;
         case 2:
@@ -1571 +1624 @@
         case 4:
             Log(("hda: %s requested 32-bit\n", __FUNCTION__));
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            *pFormat = AUD_FMT_S32;
+# else
             pAudSetting->fmt = AUD_FMT_S32;
+# endif
             break;
         default:
             AssertMsgFailed(("Unsupported"));
     }
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    *pChannels = (u32SdFmt & 0xf) + 1;
+    *pFormat = AUD_FMT_S16;
+    *pEndian = 0;
+# else
     pAudSetting->nchannels = (u32SdFmt & 0xf) + 1;
     pAudSetting->fmt = AUD_FMT_S16;
     pAudSetting->endianness = 0;
-#undef EXTRACT_VALUE
+# endif
+# undef EXTRACT_VALUE
 }
 #endif
@@ -1589 +1652 @@
     /** @todo a bit more investigation is required here. */
     int rc = 0;
-    audsettings_t as;
     /* no reason to reopen voice with same settings */
     if (u32Value == HDA_REG_IND(pThis, iReg))
         return VINF_SUCCESS;
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    uint32_t uFrequency;
+    uint32_t cChannels;
+    audfmt_e Format;
+    uint32_t Endian;
+    hdaSdFmtToAudSettings(u32Value, &uFrequency, &cChannels, &Format, &Endian);
+# else
+    audsettings_t as;
     hdaSdFmtToAudSettings(u32Value, &as);
+# endif
     switch (iReg)
     {
         case HDA_REG_SD0FMT:
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            for (uint32_t lun = 0; lun < 1; lun++)
+                rc = hdaCodecOpenVoice(pThis->pCodec[lun], PI_INDEX, uFrequency, cChannels, Format, Endian);
+# else
             rc = hdaCodecOpenVoice(pThis->pCodec, PI_INDEX, &as);
+# endif
             break;
         case HDA_REG_SD4FMT:
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            for (uint32_t lun = 0; lun < 1; lun++)
+                rc = hdaCodecOpenVoice(pThis->pCodec[lun], PO_INDEX, uFrequency, cChannels, Format, Endian);
+# else
             rc = hdaCodecOpenVoice(pThis->pCodec, PO_INDEX, &as);
+# endif
             break;
         default:
@@ -1668 +1749 @@
         HDA_REG(pThis, IRS) = HDA_REG_FIELD_FLAG_MASK(IRS, ICB);  /* busy */
         Log(("hda: IC:%x\n", cmd));
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        for (uint32_t lun = 0; lun < 1; lun++)
+            rc = pThis->pCodec[lun]->pfnLookup(pThis->pCodec[lun], cmd, &pfn);
+# else
         rc = pThis->pCodec->pfnLookup(pThis->pCodec, cmd, &pfn);
+# endif
         if (RT_FAILURE(rc))
             AssertRCReturn(rc, rc);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        for (uint32_t lun = 0; lun < 1; lun++)
+            rc = pfn(pThis->pCodec[lun], cmd, &resp);
+#else
         rc = pfn(pThis->pCodec, cmd, &resp);
+#endif
         if (RT_FAILURE(rc))
             AssertRCReturn(rc, rc);
@@ -1974 +2065 @@
          * read from backend input line to the last unreported position or at the begining.
          */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        //cbBackendCopy = pThis->pDrv[0]->pfnRead(pThis->pDrv[0], pThis->pCodec[0]->SwVoiceIn, pBdle->au8HdaBuffer, cb2Copy);
+        //cbBackendCopy = pThis->pDrv[0]->pfnRead(pThis->pDrv[0], pThis->pCodec[1]->SwVoiceIn, pBdle->au8HdaBuffer, cb2Copy);
+#else
         cbBackendCopy = AUD_read(pThis->pCodec->SwVoiceIn, pBdle->au8HdaBuffer, cb2Copy);
+#endif
         /*
          * write the HDA DMA buffer
@@ -2025 +2121 @@
              * Feed the newly fetched samples, including unreported ones, to the backend.
              */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            for (uint32_t lun = 0; lun < 1; lun++)
+                cbBackendCopy = pThis->pDrv[lun]->pfnWrite(pThis->pDrv[lun], pThis->pCodec[lun]->SwVoiceOut, pBdle->au8HdaBuffer, cb2Copy + pBdle->cbUnderFifoW);
+            LogFlow(("cbBackendCopy write %d bytes \n", cbBackendCopy));
+#else
             cbBackendCopy = AUD_write (pThis->pCodec->SwVoiceOut, pBdle->au8HdaBuffer, cb2Copy + pBdle->cbUnderFifoW);
+#endif
             hdaBackendWriteTransferReported(pBdle, cb2Copy, cbBackendCopy, &cbTransferred, pu32Avail);
         }
@@ -2548 +2650 @@
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
     /* Save Codec nodes states */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    hdaCodecSaveState(pThis->pCodec[0], pSSM);
+#else
     hdaCodecSaveState(pThis->pCodec, pSSM);
+#endif
 
     /* Save MMIO registers */
@@ -2575 +2681 @@
      * Load Codec nodes states.
      */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    int rc = hdaCodecLoadState(pThis->pCodec[0], pSSM, uVersion);
+#else
     int rc = hdaCodecLoadState(pThis->pCodec, pSSM, uVersion);
+#endif
     if (RT_FAILURE(rc))
         return rc;
@@ -2637 +2747 @@
      * Update stuff after the state changes.
      */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    for (uint32_t lun = 0; lun < 1; lun++)
+    {
+        pThis->pDrv[lun]->pfnEnableIn(pThis->pDrv[lun], pThis->pCodec[lun]->SwVoiceIn, SDCTL(pThis, 0) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
+        pThis->pDrv[lun]->pfnEnableOut(pThis->pDrv[lun], pThis->pCodec[lun]->SwVoiceOut, SDCTL(pThis, 4) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
+    }
+#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
 
     pThis->u64CORBBase = RT_MAKE_U64(HDA_REG(pThis, CORBLBASE), HDA_REG(pThis, CORBUBASE));
@@ -2813 +2931 @@
 {
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    for (uint32_t lun = 0; lun < 1; lun++)
+        if (pThis->pCodec[lun]->pfnCodecDbgListNodes)
+            pThis->pCodec[lun]->pfnCodecDbgListNodes(pThis->pCodec[lun], pHlp, pszArgs);
+        else
+            pHlp->pfnPrintf(pHlp, "Codec implementation doesn't provide corresponding callback.\n");
+#else
     if (pThis->pCodec->pfnCodecDbgListNodes)
         pThis->pCodec->pfnCodecDbgListNodes(pThis->pCodec, pHlp, pszArgs);
     else
         pHlp->pfnPrintf(pHlp, "Codec implementation doesn't provide corresponding callback.\n");
+#endif
 }
 
@@ -2826 +2952 @@
 {
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    for (uint32_t lun = 0; lun < 1; lun++)
+        if (pThis->pCodec[lun]->pfnCodecDbgSelector)
+            pThis->pCodec[lun]->pfnCodecDbgSelector(pThis->pCodec[lun], pHlp, pszArgs);
+        else
+            pHlp->pfnPrintf(pHlp, "Codec implementation doesn't provide corresponding callback.\n");
+#else
     if (pThis->pCodec->pfnCodecDbgSelector)
         pThis->pCodec->pfnCodecDbgSelector(pThis->pCodec, pHlp, pszArgs);
     else
         pHlp->pfnPrintf(pHlp, "Codec implementation doesn't provide corresponding callback.\n");
+#endif
 }
 
@@ -2922 +3056 @@
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
 
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    for (uint32_t lun = 0; lun < 1; lun++)
+    {
+        if (pThis->pCodec[lun])
+        {
+            int rc = hdaCodecDestruct(pThis->pCodec[lun]);
+            AssertRC(rc);
+            RTMemFree(pThis->pCodec[lun]);
+            pThis->pCodec[lun] = NULL;
+        }
+    }
+#else
     if (pThis->pCodec)
     {
@@ -2930 +3076 @@
         pThis->pCodec = NULL;
     }
+#endif
 
     RTMemFree(pThis->pu32CorbBuf);
@@ -3082 +3229 @@
     if (RT_FAILURE(rc))
         return rc;
-
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    //for (iter = 0; i < 3; i++)
+    {
+        /*
+        * Attach driver.
+        */
+        rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThis->IBase, &pThis->pDrvBase, "Audio Driver Port");
+        if (RT_SUCCESS(rc))
+        {
+            pThis->pDrv[0] = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIAUDIOCONNECTOR);
+            AssertMsgReturn(pThis->pDrv,
+                            ("Configuration error: instance %d has no host audio interface!\n", iInstance),
+                            VERR_PDM_MISSING_INTERFACE);
+        }
+        else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+        {
+            Log(("ac97: No attached driver!\n"));
+        }
+        else if (RT_FAILURE(rc))
+        {
+            AssertMsgFailed(("Failed to attach AC97 LUN #0! rc=%Rrc\n", rc));
+            return rc;
+        }
+        rc = PDMDevHlpDriverAttach(pDevIns, 1, &pThis->IBase, &pThis->pDrvBase, "Audio Driver Port");
+        if (RT_SUCCESS(rc))
+        {
+            pThis->pDrv[1] = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIAUDIOCONNECTOR);
+            AssertMsgReturn(pThis->pDrv[1],
+                            ("Configuration error: instance %d has no host audio interface!\n", iInstance),
+                            VERR_PDM_MISSING_INTERFACE);
+        }
+        else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+        {
+            Log(("ac97: No attached driver! LUN#1\n"));
+        }
+        else if (RT_FAILURE(rc))
+        {
+            AssertMsgFailed(("Failed to attach AC97 LUN #1! rc=%Rrc\n", rc));
+            return rc;
+        }
+    }
+#else
     /*
      * Attach driver.
@@ -3094 +3282 @@
         return rc;
     }
-
+#endif
     /* Construct codec state. */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    pThis->pCodec[0] = (PHDACODEC)RTMemAllocZ(sizeof(HDACODEC));
+    if (!pThis->pCodec[0])
+        return PDMDEV_SET_ERROR(pDevIns, VERR_NO_MEMORY, N_("HDA: Out of memory allocating codec state"));
+    pThis->pCodec[1] = (PHDACODEC)RTMemAllocZ(sizeof(HDACODEC));
+    if (!pThis->pCodec[1])
+        return PDMDEV_SET_ERROR(pDevIns, VERR_NO_MEMORY, N_("HDA: Out of memory allocating codec state"));
+
+    pThis->pCodec[0]->pvHDAState = pThis;
+    pThis->pCodec[1]->pvHDAState = pThis;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    pThis->pCodec[0]->pDrv = pThis->pDrv[0];
+    //pThis->pCodec[1]->pDrv = pThis->pDrv[1];
+#endif
+    rc = hdaCodecConstruct(pDevIns, pThis->pCodec[0], pCfgHandle);
+    if (RT_FAILURE(rc))
+        AssertRCReturn(rc, rc);
+    rc = hdaCodecConstruct(pDevIns, pThis->pCodec[1], pCfgHandle);
+    if (RT_FAILURE(rc))
+        AssertRCReturn(rc, rc);
+
+    /* ICH6 datasheet defines 0 values for SVID and SID (18.1.14-15), which together with values returned for
+       verb F20 should provide device/codec recognition. */
+    Assert(pThis->pCodec[0]->u16VendorId);
+    Assert(pThis->pCodec[0]->u16DeviceId);
+    Assert(pThis->pCodec[1]->u16VendorId);
+    Assert(pThis->pCodec[1]->u16DeviceId);
+    PCIDevSetSubSystemVendorId(&pThis->PciDev, pThis->pCodec[0]->u16VendorId); /* 2c ro - intel.) */
+    PCIDevSetSubSystemId(      &pThis->PciDev, pThis->pCodec[0]->u16DeviceId); /* 2e ro. */
+    PCIDevSetSubSystemVendorId(&pThis->PciDev, pThis->pCodec[1]->u16VendorId); /* 2c ro - intel.) */
+    PCIDevSetSubSystemId(      &pThis->PciDev, pThis->pCodec[1]->u16DeviceId); /* 2e ro. */
+
+    hdaReset(pDevIns);
+    pThis->pCodec[0]->id = 0;
+    pThis->pCodec[0]->pfnTransfer = hdaTransfer;
+    pThis->pCodec[0]->pfnReset = hdaCodecReset;
+    pThis->pCodec[1]->id = 0;
+    pThis->pCodec[1]->pfnTransfer = hdaTransfer;
+    pThis->pCodec[1]->pfnReset = hdaCodecReset;
+#else
+
     pThis->pCodec = (PHDACODEC)RTMemAllocZ(sizeof(HDACODEC));
     if (!pThis->pCodec)
@@ -3123 +3352 @@
     HDA_REG(pThis, WAKEEN)   = 0x0;
     HDA_REG(pThis, STATESTS) = 0x0;
-
+#endif
     /*
      * Debug and string formatter types.

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

@@ -26 +26 @@
 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
 #include <VBox/vmm/pdmdev.h>
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+#include <VBox/vmm/pdmaudioifs.h>
+#endif
 #include <iprt/assert.h>
 #include <iprt/uuid.h>
@@ -34 +37 @@
 
 #include "VBoxDD.h"
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
 extern "C" {
 #include "audio.h"
 }
+#endif
 #include "DevIchHdaCodec.h"
 
@@ -696 +701 @@
 } CODECNODE, *PCODECNODE;
 AssertNodeSize(CODECNODE, 60 + 6);
-
-
 /*******************************************************************************
 *   Global Variables                                                           *
@@ -1160 +1163 @@
  * Misc helpers.
  */
-
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+static int hdaCodecToAudVolume(PHDACODEC pThis, AMPLIFIER *pAmp, audmixerctl_t mt)
+#else
 static int hdaCodecToAudVolume(AMPLIFIER *pAmp, audmixerctl_t mt)
+#endif
 {
     uint32_t dir = AMPLIFIER_OUT;
@@ -1180 +1186 @@
     uint8_t lVol = AMPLIFIER_REGISTER(*pAmp, dir, AMPLIFIER_LEFT, 0) & 0x7f;
     uint8_t rVol = AMPLIFIER_REGISTER(*pAmp, dir, AMPLIFIER_RIGHT, 0) & 0x7f;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+     /* @todo in SetVolume no passing audmixerctl_in as its not used in DrvAudio.c */
+    pThis->pDrv->pfnSetVolume(pThis->pDrv, &mute, &lVol, &rVol);
+#else
     AUD_set_volume(mt, &mute, &lVol, &rVol);
+#endif
     return VINF_SUCCESS;
 }
@@ -1328 +1339 @@
     }
     if (CODEC_NID(cmd) == pThis->u8DacLineOut)
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        hdaCodecToAudVolume(pThis, pAmplifier, AUD_MIXER_VOLUME);
+#else
         hdaCodecToAudVolume(pAmplifier, AUD_MIXER_VOLUME);
+#endif
     if (CODEC_NID(cmd) == pThis->u8AdcVolsLineIn) /* Microphone */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        hdaCodecToAudVolume(pThis, pAmplifier, AUD_MIXER_LINE_IN);
+#else
         hdaCodecToAudVolume(pAmplifier, AUD_MIXER_LINE_IN);
+#endif
     return VINF_SUCCESS;
 }
@@ -2238 +2257 @@
 
 
-
 /*
  * APIs exposed to DevHDA.
@@ -2252 +2270 @@
  *       format) before enabling.
  */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+int hdaCodecOpenVoice(PHDACODEC pThis, ENMSOUNDSOURCE enmSoundSource, uint32_t uFrequency, uint32_t cChannels,
+                      audfmt_e fmt, uint32_t Endian)
+#else
 int hdaCodecOpenVoice(PHDACODEC pThis, ENMSOUNDSOURCE enmSoundSource, audsettings_t *pAudioSettings)
+#endif
 {
     int rc;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    Assert(pThis);
+    if (!pThis)
+        return -1;
+#else
     Assert(pThis && pAudioSettings);
     if (   !pThis
         || !pAudioSettings)
         return -1;
+#endif
     switch (enmSoundSource)
     {
         case PI_INDEX:
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            /* old and new stream settings are not same. Then only call open */
+
+            //if (!hdaCodecCompareAudioSettings(&(pThis->SwVoiceIn)->info, pAudioSettings) && !pThis->SwVoiceIn)
+                rc = pThis->pDrv->pfnOpenIn(pThis->pDrv, &pThis->SwVoiceIn, "hda.in", pThis, pi_callback, uFrequency,
+                                            cChannels, fmt, Endian);
+#else
             pThis->SwVoiceIn = AUD_open_in(&pThis->card, pThis->SwVoiceIn, "hda.in", pThis, pi_callback, pAudioSettings);
+#endif
             rc = pThis->SwVoiceIn ? 0 : 1;
             break;
         case PO_INDEX:
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            rc = pThis->pDrv->pfnOpenOut(pThis->pDrv, &pThis->SwVoiceOut, "hda.out", pThis, po_callback, uFrequency,
+                                         cChannels, fmt, Endian);
+#else
             pThis->SwVoiceOut = AUD_open_out(&pThis->card, pThis->SwVoiceOut, "hda.out", pThis, po_callback, pAudioSettings);
+#endif
             rc = pThis->SwVoiceOut ? 0 : 1;
             break;
@@ -2273 +2315 @@
     }
     if (!rc)
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        LogRel(("HdaCodec: can't open %s fmt(freq: %d)\n", enmSoundSource == PI_INDEX? "in" : "out", uFrequency));
+#else
         LogRel(("HdaCodec: can't open %s fmt(freq: %d)\n", enmSoundSource == PI_INDEX? "in" : "out", pAudioSettings->freq));
+#endif
     return rc;
 }
@@ -2344 +2390 @@
      */
     if (hdaCodecIsDacNode(pThis, pThis->u8DacLineOut))
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].dac.B_params, AUD_MIXER_VOLUME);
+#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, AUD_MIXER_VOLUME);
+    hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8AdcVolsLineIn].adcvol.B_params, AUD_MIXER_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;
@@ -2368 +2423 @@
     int rc = stac9220Construct(pThis);
     AssertRC(rc);
+
 
     /* common root node initializers */
@@ -2378 +2434 @@
 
     /// @todo r=michaln: Was this meant to be 'HDA' or something like that? (AC'97 was on ICH0)
-    AUD_register_card ("ICH0", &pThis->card);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    pThis->pDrv->pfnRegisterCard(pThis->pDrv, "ICH0");
+#else
+    AUD_register_card("ICH0", &pThis->card);
 
     /* 44.1 kHz */
@@ -2386 +2445 @@
     as.fmt = AUD_FMT_S16;
     as.endianness = 0;
+#endif
 
     pThis->paNodes[1].node.au32F00_param[0xA] = CODEC_F00_0A_16_BIT;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    hdaCodecOpenVoice(pThis, PI_INDEX, 44100, 2, AUD_FMT_S16, 0);
+    hdaCodecOpenVoice(pThis, PO_INDEX, 44100, 2, AUD_FMT_S16, 0);
+#else
     hdaCodecOpenVoice(pThis, PI_INDEX, &as);
     hdaCodecOpenVoice(pThis, PO_INDEX, &as);
+#endif
+
     pThis->paNodes[1].node.au32F00_param[0xA] |= CODEC_F00_0A_44_1KHZ;
 
@@ -2399 +2465 @@
         pThis->pfnCodecNodeReset(pThis, i, &pThis->paNodes[i]);
     }
-
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].dac.B_params, AUD_MIXER_VOLUME);
+    hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8AdcVolsLineIn].adcvol.B_params, AUD_MIXER_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);
+#endif
 
     /* If no host voices were created, then fallback to nul audio. */
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    if (!pThis->pDrv->pfnIsHostVoiceInOK(pThis->pDrv, pThis->SwVoiceIn))
+        LogRel (("HDA: pfnIsHostVoiceInOK WARNING: Unable to open PCM IN!\n"));
+    if (!pThis->pDrv->pfnIsHostVoiceOutOK(pThis->pDrv, pThis->SwVoiceOut))
+        LogRel (("HDA: pfnIsHostVoiceOutOK WARNING: Unable to open PCM OUT!\n"));
+#else
     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"));
-
+#endif
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    if (   !pThis->pDrv->pfnIsHostVoiceInOK(pThis->pDrv, pThis->SwVoiceIn)
+        && !pThis->pDrv->pfnIsHostVoiceOutOK(pThis->pDrv, pThis->SwVoiceOut))
+#else
     if (   !AUD_is_host_voice_in_ok(pThis->SwVoiceIn)
         && !AUD_is_host_voice_out_ok(pThis->SwVoiceOut))
+#endif
     {
         /* Was not able initialize *any* voice. Select the NULL audio driver instead */
-        AUD_close_in  (&pThis->card, pThis->SwVoiceIn);
-        AUD_close_out (&pThis->card, pThis->SwVoiceOut);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        pThis->pDrv->pfnCloseIn(pThis->pDrv, pThis->SwVoiceIn);
+        pThis->pDrv->pfnCloseOut(pThis->pDrv, pThis->SwVoiceOut);
+#else
+        AUD_close_in(&pThis->card, pThis->SwVoiceIn);
+        AUD_close_out(&pThis->card, pThis->SwVoiceOut);
+#endif
         pThis->SwVoiceOut = NULL;
         pThis->SwVoiceIn = NULL;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        pThis->pDrv->pfnInitNull(pThis->pDrv);
+#else
         AUD_init_null ();
+#endif
 
         PDMDevHlpVMSetRuntimeError (pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
@@ -2423 +2514 @@
                 "with the consequence that no sound is audible"));
     }
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    else if (   !pThis->pDrv->pfnIsHostVoiceInOK(pThis->pDrv, pThis->SwVoiceIn)
+             || !pThis->pDrv->pfnIsHostVoiceOutOK(pThis->pDrv, pThis->SwVoiceOut))
+
+#else
     else if (   !AUD_is_host_voice_in_ok(pThis->SwVoiceIn)
              || !AUD_is_host_voice_out_ok(pThis->SwVoiceOut))
+#endif
     {
         char   szMissingVoices[128];
         size_t len = 0;
+ #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        if (!pThis->pDrv->pfnIsHostVoiceInOK(pThis->pDrv, pThis->SwVoiceIn))
+            len = RTStrPrintf (szMissingVoices, sizeof(szMissingVoices), "PCM_in");
+        if (!pThis->pDrv->pfnIsHostVoiceOutOK(pThis->pDrv, pThis->SwVoiceOut))
+            len += RTStrPrintf (szMissingVoices + len, sizeof(szMissingVoices) - len, len ? ", PCM_out" : "PCM_out");
+ #else
         if (!AUD_is_host_voice_in_ok(pThis->SwVoiceIn))
             len = RTStrPrintf (szMissingVoices, sizeof(szMissingVoices), "PCM_in");
@@ -2433 +2536 @@
             len += RTStrPrintf (szMissingVoices + len, sizeof(szMissingVoices) - len, len ? ", PCM_out" : "PCM_out");
 
+ #endif
         PDMDevHlpVMSetRuntimeError (pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
             N_ ("Some audio devices (%s) could not be opened. Guest applications generating audio "

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

@@ -18 +18 @@
 #ifndef DEV_CODEC_H
 #define DEV_CODEC_H
-
+//#include <VBox/vmm/pdmdev.h>
 /** The ICH HDA (Intel) codec state. */
 typedef struct HDACODEC HDACODEC;
 /** Pointer to the Intel ICH HDA codec state. */
 typedef HDACODEC *PHDACODEC;
-
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+typedef struct PDMIAUDIOCONNECTOR * PPDMIAUDIOCONNECTOR;
+typedef struct PDMGSTVOICEOUT *PPDMGSTVOICEOUT;
+typedef struct PDMGSTVOICEIN  *PPDMGSTVOICEIN;
+#endif
 /**
  * Verb processor method.
@@ -72 +76 @@
     uint8_t                 u8BSKU;
     uint8_t                 u8AssemblyId;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    R3PTRTYPE(PPDMIAUDIOCONNECTOR)     pDrv;
+    /** Pointer to the attached audio driver. */
+    R3PTRTYPE(PPDMIBASE)               pDrvBase;
+#endif
+
 #ifndef VBOX_WITH_HDA_CODEC_EMU
     CODECVERB const        *paVerbs;
@@ -79 +89 @@
 #endif
     PCODECNODE              paNodes;
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    /** PCM in */
+    R3PTRTYPE(PPDMGSTVOICEIN)         SwVoiceIn;
+    /** PCM out */
+    R3PTRTYPE(PPDMGSTVOICEOUT)        SwVoiceOut;
+#else
     QEMUSoundCard           card;
     /** PCM in */
@@ -84 +101 @@
     /** PCM out */
     SWVoiceOut              *SwVoiceOut;
+#endif
     void                   *pvHDAState;
     bool                    fInReset;

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

@@ -34 +34 @@
 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
 #include <VBox/vmm/pdmdev.h>
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+#include <VBox/vmm/pdmaudioifs.h>
+#endif
 #include <iprt/assert.h>
 #include <iprt/string.h>
@@ -39 +42 @@
 #include "vl_vbox.h"
 
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
 extern "C" {
 #include "audio.h"
 }
-
-#ifndef VBOX
-
+#endif
+
+#ifndef VBOX
 #define LENOFA(a) ((int) (sizeof(a)/sizeof(a[0])))
-
-#define dolog(...) AUD_log ("sb16", __VA_ARGS__)
-
-/* #define DEBUG */
-/* #define DEBUG_SB16_MOST */
-
-#ifdef DEBUG
-#define ldebug(...) dolog (__VA_ARGS__)
-#else
-#define ldebug(...)
-#endif
-
 #else /* VBOX */
-
 /** Current saved state version. */
 #define SB16_SAVE_STATE_VERSION         2
@@ -65 +56 @@
  * the config dump. */
 #define SB16_SAVE_STATE_VERSION_VBOX_30 1
-
-DECLINLINE(void) dolog (const char *fmt, ...)
-{
-    va_list ap;
-    va_start (ap, fmt);
-    AUD_vlog ("sb16", fmt, ap);
-    va_end (ap);
-}
-
-# ifdef DEBUG
-static void ldebug (const char *fmt, ...)
-{
-    va_list ap;
-
-    va_start (ap, fmt);
-    AUD_vlog ("sb16", fmt, ap);
-    va_end (ap);
-}
-# else
-DECLINLINE(void) ldebug (const char *fmt, ...)
-{
-    (void)fmt;
-}
-# endif
-
 #endif /* VBOX */
 
@@ -122 +88 @@
 typedef struct SB16State {
 #ifdef VBOX
+    /** Pointer to the device instance. */
     PPDMDEVINSR3 pDevIns;
-#endif
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    /** Pointer to the connector of the attached audio driver. */
+    PPDMIAUDIOCONNECTOR     pDrv;
+# endif
+#endif
+#ifndef VBOX
+    qemu_irq *pic;
+#endif
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
     QEMUSoundCard card;
-#ifndef VBOX
-    qemu_irq *pic;
 #endif
 #ifdef VBOX /* lazy bird */
@@ -182 +155 @@
     int align;
     int audio_free;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    PPDMGSTVOICEOUT voice;
+#else
     SWVoiceOut *voice;
+#endif
 
 #ifndef VBOX
@@ -211 +188 @@
         return 8;
     default:
-        dolog ("bad irq %d\n", irq);
+        LogFlow(("SB16: bad irq %d\n", irq));
         return 2;
     }
@@ -228 +205 @@
         return 10;
     default:
-        dolog ("bad irq magic %d\n", magic);
+        LogFlow(("SB16: bad irq magic %d\n", magic));
         return -1;
     }
@@ -259 +236 @@
     s->dma_running = hold;
 
-    ldebug ("hold %d high %d dma %d\n", hold, s->use_hdma, dma);
+    LogFlow(("SB16: hold %d high %d dma %d\n", hold, s->use_hdma, dma));
 
 #ifndef VBOX
@@ -275 +252 @@
         PDMDevHlpDMASetDREQ (s->pDevIns, dma, 1);
         PDMDevHlpDMASchedule (s->pDevIns);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        s->pDrv->pfnEnableOut(s->pDrv, s->voice, 1);
+#else
         AUD_set_active_out (s->voice, 1);
+#endif
     }
     else
     {
         PDMDevHlpDMASetDREQ (s->pDevIns, dma, 0);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        s->pDrv->pfnEnableOut(s->pDrv, s->voice, 0);
+#else
         AUD_set_active_out (s->voice, 0);
+#endif
     }
 #endif /* VBOX */
@@ -306 +291 @@
 static void continue_dma8 (SB16State *s)
 {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    int rc;
+#endif
     if (s->freq > 0) {
+
+        s->audio_free = 0;
+
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        rc = s->pDrv->pfnOpenOut(s->pDrv, &s->voice, "sb16", s, SB_audio_callback, s->freq, 1 << s->fmt_stereo,
+                                 s->fmt, 0);
+#else
         audsettings_t as;
-
-        s->audio_free = 0;
-
         as.freq = s->freq;
         as.nchannels = 1 << s->fmt_stereo;
         as.fmt = s->fmt;
         as.endianness = 0;
-
         s->voice = AUD_open_out (
             &s->card,
@@ -324 +316 @@
             &as
             );
+#endif
     }
 
@@ -367 +360 @@
 
     if (s->block_size & s->align) {
-        dolog ("warning: misaligned block size %d, alignment %d\n",
-               s->block_size, s->align + 1);
-    }
-
-    ldebug ("freq %d, stereo %d, sign %d, bits %d, "
+        LogFlow(("SB16: warning: misaligned block size %d, alignment %d\n",
+               s->block_size, s->align + 1));
+    }
+
+    LogFlow(("SB16: freq %d, stereo %d, sign %d, bits %d, "
             "dma %d, auto %d, fifo %d, high %d\n",
             s->freq, s->fmt_stereo, s->fmt_signed, s->fmt_bits,
-            s->block_size, s->dma_auto, s->fifo, s->highspeed);
+            s->block_size, s->dma_auto, s->fifo, s->highspeed));
 
     continue_dma8 (s);
@@ -419 +412 @@
     }
 
-    ldebug ("freq %d, stereo %d, sign %d, bits %d, "
+    LogFlow(("SB16: freq %d, stereo %d, sign %d, bits %d, "
             "dma %d, auto %d, fifo %d, high %d\n",
             s->freq, s->fmt_stereo, s->fmt_signed, s->fmt_bits,
-            s->block_size, s->dma_auto, s->fifo, s->highspeed);
+            s->block_size, s->dma_auto, s->fifo, s->highspeed));
 
     if (16 == s->fmt_bits) {
@@ -447 +440 @@
     s->align = (1 << (s->fmt_stereo + (s->fmt_bits == 16))) - 1;
     if (s->block_size & s->align) {
-        dolog ("warning: misaligned block size %d, alignment %d\n",
-               s->block_size, s->align + 1);
+        LogFlow(("SB16: warning: misaligned block size %d, alignment %d\n",
+               s->block_size, s->align + 1));
     }
 
     if (s->freq) {
+
+        s->audio_free = 0;
+
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    int rc;
+        rc = s->pDrv->pfnOpenOut(s->pDrv, &s->voice, "sb16", s,SB_audio_callback, s->freq, 1 << s->fmt_stereo, s->fmt, 0);
+#else
         audsettings_t as;
-
-        s->audio_free = 0;
-
         as.freq = s->freq;
         as.nchannels = 1 << s->fmt_stereo;
         as.fmt = s->fmt;
         as.endianness = 0;
-
         s->voice = AUD_open_out (
             &s->card,
@@ -469 +466 @@
             &as
             );
+#endif
     }
 
@@ -477 +475 @@
 static inline void dsp_out_data (SB16State *s, uint8_t val)
 {
-    ldebug ("outdata %#x\n", val);
+    LogFlow(("SB16: outdata %#x\n", val));
     if ((size_t) s->out_data_len < sizeof (s->out_data)) {
         s->out_data[s->out_data_len++] = val;
@@ -489 +487 @@
     }
     else {
-        dolog ("buffer underflow\n");
+        LogFlow(("SB16: buffer underflow\n"));
         return 0;
     }
@@ -496 +494 @@
 static void command (SB16State *s, uint8_t cmd)
 {
-    ldebug ("command %#x\n", cmd);
+    LogFlow(("SB16: command %#x\n", cmd));
 
     if (cmd > 0xaf && cmd < 0xd0) {
         if (cmd & 8) {
-            dolog ("ADC not yet supported (command %#x)\n", cmd);
+            LogFlow(("SB16: ADC not yet supported (command %#x)\n", cmd));
         }
 
@@ -508 +506 @@
             break;
         default:
-            dolog ("%#x wrong bits\n", cmd);
+            LogFlow(("SB16: %#x wrong bits\n", cmd));
         }
         s->needed_bytes = 3;
@@ -562 +560 @@
 
         case 0x35:
-            dolog ("0x35 - MIDI command not implemented\n");
+            LogFlow(("SB16: 0x35 - MIDI command not implemented\n"));
             break;
 
@@ -596 +594 @@
         case 0x74:
             s->needed_bytes = 2; /* DMA DAC, 4-bit ADPCM */
-            dolog ("0x75 - DMA DAC, 4-bit ADPCM not implemented\n");
+            LogFlow(("SB16: 0x75 - DMA DAC, 4-bit ADPCM not implemented\n"));
             break;
 
         case 0x75:              /* DMA DAC, 4-bit ADPCM Reference */
             s->needed_bytes = 2;
-            dolog ("0x74 - DMA DAC, 4-bit ADPCM Reference not implemented\n");
+            LogFlow(("SB16: 0x74 - DMA DAC, 4-bit ADPCM Reference not implemented\n"));
             break;
 
         case 0x76:              /* DMA DAC, 2.6-bit ADPCM */
             s->needed_bytes = 2;
-            dolog ("0x74 - DMA DAC, 2.6-bit ADPCM not implemented\n");
+            LogFlow(("SB16: 0x74 - DMA DAC, 2.6-bit ADPCM not implemented\n"));
             break;
 
         case 0x77:              /* DMA DAC, 2.6-bit ADPCM Reference */
             s->needed_bytes = 2;
-            dolog ("0x74 - DMA DAC, 2.6-bit ADPCM Reference not implemented\n");
+            LogFlow(("SB16: 0x74 - DMA DAC, 2.6-bit ADPCM Reference not implemented\n"));
             break;
 
         case 0x7d:
-            dolog ("0x7d - Autio-Initialize DMA DAC, 4-bit ADPCM Reference\n");
-            dolog ("not implemented\n");
+            LogFlow(("SB16: 0x7d - Autio-Initialize DMA DAC, 4-bit ADPCM Reference\n"));
+            LogFlow(("SB16: not implemented\n"));
             break;
 
         case 0x7f:
-            dolog (
-                "0x7d - Autio-Initialize DMA DAC, 2.6-bit ADPCM Reference\n"
-                );
-            dolog ("not implemented\n");
+            LogFlow(("SB16: 0x7d - Autio-Initialize DMA DAC, 2.6-bit ADPCM Reference\n"));
+            LogFlow(("SB16: not implemented\n"));
             break;
 
@@ -695 +691 @@
 
         case 0xe7:
-            dolog ("Attempt to probe for ESS (0xe7)?\n");
+            LogFlow(("SB16: Attempt to probe for ESS (0xe7)?\n"));
             break;
 
@@ -726 +722 @@
 
         default:
-            dolog ("Unrecognized command %#x\n", cmd);
+            LogFlow(("SB16: Unrecognized command %#x\n", cmd));
             break;
         }
@@ -732 +728 @@
 
     if (!s->needed_bytes) {
-        ldebug ("\n");
+        LogFlow(("\n"));
     }
 
@@ -745 +741 @@
 
  warn:
-    dolog ("warning: command %#x,%d is not truly understood yet\n",
-           cmd, s->needed_bytes);
+    LogFlow(("SB16: warning: command %#x,%d is not truly understood yet\n",
+           cmd, s->needed_bytes));
     goto exit;
 
@@ -768 +764 @@
 {
     int d0, d1, d2;
-    ldebug ("complete command %#x, in_index %d, needed_bytes %d\n",
-            s->cmd, s->in_index, s->needed_bytes);
+    LogFlow(("SB16: complete command %#x, in_index %d, needed_bytes %d\n",
+            s->cmd, s->in_index, s->needed_bytes));
 
     if (s->cmd > 0xaf && s->cmd < 0xd0) {
@@ -777 +773 @@
 
         if (s->cmd & 8) {
-            dolog ("ADC params cmd = %#x d0 = %d, d1 = %d, d2 = %d\n",
-                   s->cmd, d0, d1, d2);
+            LogFlow(("SB16: ADC params cmd = %#x d0 = %d, d1 = %d, d2 = %d\n",
+                   s->cmd, d0, d1, d2));
         }
         else {
-            ldebug ("cmd = %#x d0 = %d, d1 = %d, d2 = %d\n",
-                    s->cmd, d0, d1, d2);
+            LogFlow(("SB16: cmd = %#x d0 = %d, d1 = %d, d2 = %d\n",
+                    s->cmd, d0, d1, d2));
             dma_cmd (s, s->cmd, d0, d1 + (d2 << 8));
         }
@@ -792 +788 @@
             s->csp_reg83r = 0;
             s->csp_reg83w = 0;
-            ldebug ("CSP command 0x04: mode=%#x\n", s->csp_mode);
+            LogFlow(("SB16: CSP command 0x04: mode=%#x\n", s->csp_mode));
             break;
 
@@ -798 +794 @@
             s->csp_param = dsp_get_data (s);
             s->csp_value = dsp_get_data (s);
-            ldebug ("CSP command 0x05: param=%#x value=%#x\n",
+            LogFlow(("SB16: CSP command 0x05: param=%#x value=%#x\n",
                     s->csp_param,
-                    s->csp_value);
+                    s->csp_value));
             break;
 
@@ -806 +802 @@
             d0 = dsp_get_data (s);
             d1 = dsp_get_data (s);
-            ldebug ("write CSP register %d <- %#x\n", d1, d0);
+            LogFlow(("SB16: write CSP register %d <- %#x\n", d1, d0));
             if (d1 == 0x83) {
-                ldebug ("0x83[%d] <- %#x\n", s->csp_reg83r, d0);
+                LogFlow(("SB16: 0x83[%d] <- %#x\n", s->csp_reg83r, d0));
                 s->csp_reg83[s->csp_reg83r % 4] = d0;
                 s->csp_reg83r += 1;
@@ -819 +815 @@
         case 0x0f:
             d0 = dsp_get_data (s);
-            ldebug ("read CSP register %#x -> %#x, mode=%#x\n",
-                    d0, s->csp_regs[d0], s->csp_mode);
+            LogFlow(("SB16: read CSP register %#x -> %#x, mode=%#x\n",
+                    d0, s->csp_regs[d0], s->csp_mode));
             if (d0 == 0x83) {
-                ldebug ("0x83[%d] -> %#x\n",
+                LogFlow(("SB16: 0x83[%d] -> %#x\n",
                         s->csp_reg83w,
-                        s->csp_reg83[s->csp_reg83w % 4]);
+                        s->csp_reg83[s->csp_reg83w % 4]));
                 dsp_out_data (s, s->csp_reg83[s->csp_reg83w % 4]);
                 s->csp_reg83w += 1;
@@ -835 +831 @@
         case 0x10:
             d0 = dsp_get_data (s);
-            dolog ("cmd 0x10 d0=%#x\n", d0);
+            LogFlow(("SB16: cmd 0x10 d0=%#x\n", d0));
             break;
 
@@ -844 +840 @@
         case 0x40:
             s->time_const = dsp_get_data (s);
-            ldebug ("set time const %d\n", s->time_const);
+            LogFlow(("SB16: set time const %d\n", s->time_const));
             break;
 
@@ -853 +849 @@
         case 0x41:
             s->freq = dsp_get_hilo (s);
-            ldebug ("set freq %d\n", s->freq);
+            LogFlow(("SB16: set freq %d\n", s->freq));
             break;
 
         case 0x48:
             s->block_size = dsp_get_lohi (s) + 1;
-            ldebug ("set dma block len %d\n", s->block_size);
+            LogFlow(("SB16: set dma block len %d\n", s->block_size));
             break;
 
@@ -889 +885 @@
                     }
                 }
-                ldebug ("mix silence %d %d %" PRId64 "\n", samples, bytes, ticks);
+                LogFlow(("SB16: mix silence %d %d %" PRId64 "\n", samples, bytes, ticks));
 #else  /* VBOX */
                 ticks = (bytes * TMTimerGetFreq(s->pTimer)) / freq;
@@ -896 +892 @@
                 else
                     TMTimerSet(s->pTimer, TMTimerGet(s->pTimer) + ticks);
-                ldebug ("mix silence %d %d % %RU64\n", samples, bytes, ticks);
+                LogFlow(("SB16: mix silence %d %d % %RU64\n", samples, bytes, ticks));
 #endif /* VBOX */
             }
@@ -904 +900 @@
             d0 = dsp_get_data (s);
             s->out_data_len = 0;
-            ldebug ("E0 data = %#x\n", d0);
+            LogFlow(("SB16: E0 data = %#x\n", d0));
             dsp_out_data (s, ~d0);
             break;
@@ -910 +906 @@
         case 0xe2:
             d0 = dsp_get_data (s);
-            ldebug ("E2 = %#x\n", d0);
+            LogFlow(("SB16:E2 = %#x\n", d0));
             break;
 
@@ -919 +915 @@
         case 0xf9:
             d0 = dsp_get_data (s);
-            ldebug ("command 0xf9 with %#x\n", d0);
+            LogFlow(("SB16: command 0xf9 with %#x\n", d0));
             switch (d0) {
             case 0x0e:
@@ -940 +936 @@
 
         default:
-            dolog ("complete: unrecognized command %#x\n", s->cmd);
+            LogFlow(("SB16: complete: unrecognized command %#x\n", s->cmd));
             return;
         }
     }
 
-    ldebug ("\n");
+    LogFlow(("\n"));
     s->cmd = -1;
     return;
@@ -952 +948 @@
 static void legacy_reset (SB16State *s)
 {
-    audsettings_t as;
 
     s->freq = 11025;
@@ -959 +954 @@
     s->fmt_stereo = 0;
 
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    int rc;
+    rc = s->pDrv->pfnOpenOut(s->pDrv, &s->voice, "sb16", s, SB_audio_callback, 11025, 1, AUD_FMT_U8, 0);
+#else
+    audsettings_t as;
     as.freq = s->freq;
     as.nchannels = 1;
     as.fmt = AUD_FMT_U8;
     as.endianness = 0;
-
     s->voice = AUD_open_out (
         &s->card,
@@ -973 +972 @@
         );
 
+#endif
     /* Not sure about that... */
     /* AUD_set_active_out (s->voice, 1); */
@@ -1016 +1016 @@
     int iport = nport - s->port;
 
-    ldebug ("write %#x <- %#x\n", nport, val);
+    LogFlow(("SB16: write %#x <- %#x\n", nport, val));
     switch (iport) {
     case 0x06:
@@ -1077 +1077 @@
         else {
             if (s->in_index == sizeof (s->in2_data)) {
-                dolog ("in data overrun\n");
+                LogFlow(("SB16: in data overrun\n"));
             }
             else {
@@ -1093 +1093 @@
 
     default:
-        ldebug ("(nport=%#x, val=%#x)\n", nport, val);
+        LogFlow(("SB16: nport=%#x, val=%#x)\n", nport, val));
         break;
     }
@@ -1125 +1125 @@
         else {
             if (s->cmd != -1) {
-                dolog ("empty output buffer for command %#x\n",
-                       s->cmd);
+                LogFlow(("SB16: empty output buffer for command %#x\n",
+                       s->cmd));
             }
             retval = s->last_read_byte;
@@ -1173 +1173 @@
 
     if (!ack) {
-        ldebug ("read %#x -> %#x\n", nport, retval);
+        LogFlow(("SB16: read %#x -> %#x\n", nport, retval));
     }
 
@@ -1184 +1184 @@
 
  error:
-    dolog ("warning: dsp_read %#x error\n", nport);
+    LogFlow(("SB16: warning: dsp_read %#x error\n", nport));
 #ifndef VBOX
     return 0xff;
@@ -1232 +1232 @@
 #endif
 }
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+uint32_t popcount (uint32_t u)
+{
+    u = ((u&0x55555555) + ((u>>1)&0x55555555));
+    u = ((u&0x33333333) + ((u>>2)&0x33333333));
+    u = ((u&0x0f0f0f0f) + ((u>>4)&0x0f0f0f0f));
+    u = ((u&0x00ff00ff) + ((u>>8)&0x00ff00ff));
+    u = ( u&0x0000ffff) + (u>>16);
+    return u;
+}
+
+uint32_t lsbindex (uint32_t u)
+{
+    return popcount ((u&-u)-1);
+}
+#endif
 
 static IO_WRITE_PROTO(mixer_write_datab)
@@ -1240 +1256 @@
 
     (void) nport;
-    ldebug ("mixer_write [%#x] <- %#x\n", s->mixer_nreg, val);
+    LogFlow(("SB16: mixer_write [%#x] <- %#x\n", s->mixer_nreg, val));
 
     switch (s->mixer_nreg) {
@@ -1291 +1307 @@
         {
             int irq = irq_of_magic (val);
-            ldebug ("setting irq to %d (val=%#x)\n", irq, val);
+            LogFlow(("SB16: setting irq to %d (val=%#x)\n", irq, val));
             if (irq > 0) {
                 s->irq = irq;
@@ -1305 +1321 @@
             hdma = lsbindex (val & 0xf0);
             if (dma != s->dma || hdma != s->hdma) {
-                dolog (
-                    "attempt to change DMA "
+                LogFlow((
+                    "SB16: attempt to change DMA "
                     "8bit %d(%d), 16bit %d(%d) (val=%#x)\n",
-                    dma, s->dma, hdma, s->hdma, val);
+                    dma, s->dma, hdma, s->hdma, val));
             }
 #if 0
@@ -1318 +1334 @@
 
     case 0x82:
-        dolog ("attempt to write into IRQ status register (val=%#x)\n",
-               val);
+        LogFlow(("SB16: attempt to write into IRQ status register (val=%#x)\n",
+               val));
 #ifdef VBOX
         return VINF_SUCCESS;
@@ -1326 +1342 @@
     default:
         if (s->mixer_nreg >= 0x80) {
-            ldebug ("attempt to write mixer[%#x] <- %#x\n", s->mixer_nreg, val);
+            LogFlow(("SB16: attempt to write mixer[%#x] <- %#x\n", s->mixer_nreg, val));
         }
         break;
@@ -1340 +1356 @@
         uint8_t lvol = s->mixer_regs[0x30];
         uint8_t rvol = s->mixer_regs[0x31];
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        /*@todo not passinga audmixer_Ctl values as its not used in DrvAudio.c */
+        s->pDrv->pfnSetVolume(s->pDrv, &mute, &lvol, &rvol);
+#else
         AUD_set_volume(AUD_MIXER_VOLUME, &mute, &lvol, &rvol);
+#endif
     }
     /* Update the voice (PCM) volume. */
@@ -1348 +1369 @@
         uint8_t lvol = s->mixer_regs[0x32];
         uint8_t rvol = s->mixer_regs[0x33];
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        s->pDrv->pfnSetVolume(s->pDrv, &mute, &lvol, &rvol);
+#else
         AUD_set_volume(AUD_MIXER_PCM, &mute, &lvol, &rvol);
+#endif
     }
 #endif /* VBOX */
@@ -1397 +1422 @@
 #ifndef DEBUG_SB16_MOST
     if (s->mixer_nreg != 0x82) {
-        ldebug ("mixer_read[%#x] -> %#x\n",
-                s->mixer_nreg, s->mixer_regs[s->mixer_nreg]);
-    }
-#else
-    ldebug ("mixer_read[%#x] -> %#x\n",
-            s->mixer_nreg, s->mixer_regs[s->mixer_nreg]);
+        LogFlow(("SB16: mixer_read[%#x] -> %#x\n",
+                s->mixer_nreg, s->mixer_regs[s->mixer_nreg]));
+    }
+#else
+    LogFlow(("SB16: mixer_read[%#x] -> %#x\n",
+            s->mixer_nreg, s->mixer_regs[s->mixer_nreg]));
 #endif
 #ifndef VBOX
@@ -1444 +1469 @@
 #endif
 
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        copied = s->pDrv->pfnWrite(s->pDrv, s->voice, tmpbuf, copied);
+#else
         copied = AUD_write (s->voice, tmpbuf, copied);
+#endif
 
         temp -= copied;
@@ -1468 +1497 @@
 
     if (s->block_size <= 0) {
-        dolog ("invalid block size=%d nchan=%d dma_pos=%d dma_len=%d\n",
-               s->block_size, nchan, dma_pos, dma_len);
+        LogFlow(("SB16: invalid block size=%d nchan=%d dma_pos=%d dma_len=%d\n",
+               s->block_size, nchan, dma_pos, dma_len));
         return dma_pos;
     }
@@ -1491 +1520 @@
 
 #ifdef DEBUG_SB16_MOST
-    dolog ("pos:%06d %d till:%d len:%d\n",
-           dma_pos, free, till, dma_len);
+    LogFlow(("SB16: pos:%06d %d till:%d len:%d\n",
+           dma_pos, free, till, dma_len));
 #endif
 
@@ -1523 +1552 @@
 
 #ifdef DEBUG_SB16_MOST
-    ldebug ("pos %5d free %5d size %5d till % 5d copy %5d written %5d size %5d\n",
+    LogFlow(("SB16: pos %5d free %5d size %5d till % 5d copy %5d written %5d size %5d\n",
             dma_pos, free, dma_len, s->left_till_irq, copy, written,
-            s->block_size);
+            s->block_size));
 #endif
 
@@ -1663 +1692 @@
 
     if (s->voice) {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        s->pDrv->pfnCloseOut(s->pDrv, s->voice);
+#else
         AUD_close_out (&s->card, s->voice);
+#endif
         s->voice = NULL;
     }
@@ -1669 +1702 @@
     if (s->dma_running) {
         if (s->freq) {
+
+            s->audio_free = 0;
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+            int rc;
+            rc = s->pDrv->pfnOpenOut(s->pDrv, &s->voice, "sb16", s, SB_audio_callback, s->freq, 1 << s->fmt_stereo, s->fmt, 0);
+#else
             audsettings_t as;
-
-            s->audio_free = 0;
-
             as.freq = s->freq;
             as.nchannels = 1 << s->fmt_stereo;
             as.fmt = s->fmt;
             as.endianness = 0;
-
             s->voice = AUD_open_out (
                 &s->card,
@@ -1686 +1722 @@
                 &as
                 );
+#endif
         }
 
@@ -1706 +1743 @@
 
     if (!audio) {
-        dolog ("No audio state\n");
+        LogFlow(("SB16: No audio state\n"));
         return -1;
     }
@@ -1712 +1749 @@
     s = qemu_mallocz (sizeof (*s));
     if (!s) {
-        dolog ("Could not allocate memory for SB16 (%zu bytes)\n",
-               sizeof (*s));
+        LogFlow(("SB16: Could not allocate memory for SB16 (%zu bytes)\n",
+               sizeof (*s)));
         return -1;
     }
@@ -1735 +1772 @@
     s->aux_ts = qemu_new_timer (vm_clock, aux_timer, s);
     if (!s->aux_ts) {
-        dolog ("warning: Could not create auxiliary timer\n");
+        LogFlow(("SB16: warning: Could not create auxiliary timer\n"));
     }
 
@@ -1756 +1793 @@
 
     register_savevm ("sb16", 0, 1, SB_save, SB_load, s);
-    AUD_register_card (audio, "sb16", &s->card);
+    AUD_register_card (audio, "sb16");
     return 0;
 }
@@ -1943 +1980 @@
 
     rc = PDMDevHlpDriverAttach(pDevIns, 0, &s->IBase, &s->pDrvBase, "Audio Driver Port");
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    if(RT_SUCCESS(rc))
+    {
+        s->pDrv = PDMIBASE_QUERY_INTERFACE(s->pDrvBase, PDMIAUDIOCONNECTOR);
+        AssertMsgReturn(s->pDrv,
+                        ("Configuration error: instance %d has no host audio interface!\n", iInstance),
+                        VERR_PDM_MISSING_INTERFACE);
+    }
+    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+#else
     if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
-        Log(("sb16: No attached driver!\n"));
+#endif
+        Log(("ac97: No attached driver!\n"));
     else if (RT_FAILURE(rc))
-        AssertMsgFailedReturn(("Failed to attach SB16 LUN #0! rc=%Rrc\n", rc), rc);
-
+    {
+        AssertMsgFailed(("Failed to attach AC97 LUN #0! rc=%Rrc\n", rc));
+        return rc;
+    }
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+     s->pDrv->pfnRegisterCard(s->pDrv, "sb16");
+#else
     AUD_register_card("sb16", &s->card);
+#endif
     legacy_reset(s);
 
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    if (!s->pDrv->pfnIsHostVoiceOutOK(s->pDrv,s->voice))
+#else
     if (!AUD_is_host_voice_out_ok(s->voice))
+#endif
     {
         LogRel (("SB16: WARNING: Unable to open PCM OUT!\n"));
-        AUD_close_out(&s->card, s->voice);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        s->pDrv->pfnCloseOut(s->pDrv, s->voice );
+#else
+        AUD_close_out (&s->card, s->voice);
+#endif
         s->voice = NULL;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        s->pDrv->pfnInitNull(s->pDrv);
+#else
         AUD_init_null();
+#endif
         PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
             N_("No audio devices could be opened. Selecting the NULL audio backend "

trunk/src/VBox/Devices/Audio/mixeng.c

@@ -26 +26 @@
 #include "VBoxDD.h"
 #include "vl_vbox.h"
-#include "audio.h"
 #ifdef VBOX
 # include <iprt/asm-math.h>
@@ -33 +32 @@
 
 #define AUDIO_CAP "mixeng"
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+#include "DrvAudio.h"
+#else
+#include "audio.h"
 #include "audio_int.h"
+#endif
 
 #ifndef VBOX
@@ -309 +313 @@
 void *st_rate_start (int inrate, int outrate)
 {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    struct rate *rate = (struct rate *)RTMemAllocZ(1 * sizeof (*rate));
+#else
     struct rate *rate = audio_calloc (AUDIO_FUNC, 1, sizeof (*rate));
+#endif
 
     if (!rate) {
-        dolog ("Could not allocate resampler (%" FMTZ "u bytes)\n",
-               sizeof (*rate));
+        LogFlow(("Could not allocate resampler %u bytes)\n", sizeof (*rate)));
         return NULL;
     }
@@ -338 +345 @@
 void st_rate_stop (void *opaque)
 {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    RTMemFree(opaque);
+#else
     qemu_free (opaque);
-}
-
+#endif
+}
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+void mixeng_clear(PPDMHOSTSTEREOSAMPLE buf, int len)
+{
+    memset (buf, 0, len * sizeof (PDMHOSTSTEREOSAMPLE));
+}
+#else
 void mixeng_clear (st_sample_t *buf, int len)
 {
     memset (buf, 0, len * sizeof (st_sample_t));
 }
-
+#endif
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+void mixeng_sniff_and_clear (PPDMHOSTVOICEOUT hw, PPDMHOSTSTEREOSAMPLE src, int len)
+#else
 void mixeng_sniff_and_clear (HWVoiceOut *hw, st_sample_t *src, int len)
-{
+#endif
+{
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
+    LogFlow(("mixeng: sniffer_run_out\n"));
     sniffer_run_out (hw, src, len);
+#endif
     mixeng_clear (src, len);
 }

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

@@ -29 +29 @@
 #ifdef VBOX
 /* use faster ASMMult2xS32RetS64 */
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
 typedef struct { int mute;  uint32_t r; uint32_t l; } volume_t;
+#endif
 typedef struct { int64_t l; int64_t r; } st_sample_t;
 #else /* !VBOX */
@@ -41 +43 @@
 #endif
 #endif /* VBOX */
-
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
 typedef void (t_sample) (st_sample_t *dst, const void *src,
                          int samples, volume_t *vol);
+#endif
 typedef void (f_sample) (void *dst, const st_sample_t *src, int samples);
 
@@ -55 +58 @@
                        int *isamp, int *osamp);
 void st_rate_stop (void *opaque);
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+void mixeng_clear(PPDMHOSTSTEREOSAMPLE buf, int len);
+void mixeng_sniff_and_clear(PPDMHOSTVOICEOUT hw, PPDMHOSTSTEREOSAMPLE src, int len);
+# else
 void mixeng_clear (st_sample_t *buf, int len);
 void mixeng_sniff_and_clear (struct HWVoiceOut *hw, st_sample_t *src, int len);
+# endif
 
 #endif  /* mixeng.h */

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

@@ -114 +114 @@
 
 static void glue (glue (conv_, ET), _to_stereo)
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    (PPDMHOSTSTEREOSAMPLE dst, const void *src, int samples, volume_t *vol)
+#else
     (st_sample_t *dst, const void *src, int samples, volume_t *vol)
-{
+#endif
+{
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    PPDMHOSTSTEREOSAMPLE out = dst;
+#else
     st_sample_t *out = dst;
+#endif
     IN_T *in = (IN_T *) src;
 #ifndef NOVOL
@@ -127 +135 @@
 #endif
     while (samples--) {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        out->u64LSample = VOL (glue (conv_, ET) (*in++), vol->l);
+        out->u64RSample = VOL (glue (conv_, ET) (*in++), vol->r);
+#else
         out->l = VOL (glue (conv_, ET) (*in++), vol->l);
         out->r = VOL (glue (conv_, ET) (*in++), vol->r);
+#endif
         out += 1;
     }
@@ -134 +147 @@
 
 static void glue (glue (conv_, ET), _to_mono)
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    (PPDMHOSTSTEREOSAMPLE dst, const void *src, int samples, volume_t *vol)
+#else
     (st_sample_t *dst, const void *src, int samples, volume_t *vol)
-{
+#endif
+{
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    PPDMHOSTSTEREOSAMPLE out = dst;
+#else
     st_sample_t *out = dst;
+#endif
     IN_T *in = (IN_T *) src;
 #ifndef NOVOL
@@ -147 +168 @@
 #endif
     while (samples--) {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        out->u64LSample = VOL (glue (conv_, ET) (in[0]), vol->l);
+        out->u64RSample = out->u64LSample;
+#else
         out->l = VOL (glue (conv_, ET) (in[0]), vol->l);
         out->r = out->l;
+
+#endif
         out += 1;
         in += 1;

trunk/src/VBox/Devices/Makefile.kmk

@@ -165 +165 @@
         Parallel/DevParallel.cpp \
         \
-        Audio/audio.c \
-        Audio/audiosniffer.c \
         Audio/mixeng.c \
-        Audio/noaudio.c \
-        Audio/filteraudio.c \
         Input/DrvKeyboardQueue.cpp \
         Input/DrvMouseQueue.cpp \
@@ -497 +493 @@
  # --- Audio bits. ---
 
+ ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+   VBoxDD_DEFS         +=VBOX_WITH_PDM_AUDIO_DRIVER
+ endif
+ ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+   VBoxDD_SOURCES += Audio/DrvAudio.c \
+         Audio/DrvAudioUtil.c \
+         Audio/DrvHostNullAudio.c
+ else
+   VBoxDD_SOURCES += Audio/audio.c \
+         Audio/audiosniffer.c \
+         Audio/noaudio.c \
+         Audio/filteraudio.c 
+ endif
+
  ifdef VBOX_WITH_ALSA
   VBoxDD_DEFS.linux     += VBOX_WITH_ALSA
-  VBoxDD_SOURCES.linux  += \
-        Audio/alsaaudio.c \
-        Audio/alsa_stubs.c
+  ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    VBoxDD_DEFS.linux     += VBOX_WITH_WITH_PDM_AUDIO_DRIVER
+    VBoxDD_SOURCES.linux  += \
+          Audio/DrvHostAlsaAudio.c \
+      Audio/alsa_stubs.c
+  else
+    VBoxDD_SOURCES.linux  += \
+          Audio/alsaaudio.c \
+          Audio/alsa_stubs.c
+  endif
  endif
 
  ifdef VBOX_WITH_PULSE
   VBoxDD_DEFS.linux     += VBOX_WITH_PULSE
-  VBoxDD_SOURCES.linux  += \
-        Audio/pulseaudio.c \
-        Audio/pulse_stubs.c
+  ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    VBoxDD_DEFS.linux     += VBOX_WITH_PDM_AUDIO_DRIVER
+    VBoxDD_SOURCES.linux  += \
+          Audio/DrvHostPulseAudio.c \
+      Audio/pulse_stubs.c
+  else
+    VBoxDD_SOURCES.linux  += \
+          Audio/pulseaudio.c \
+          Audio/pulse_stubs.c
+  endif
   VBoxDD_DEFS.freebsd   += VBOX_WITH_PULSE
-  VBoxDD_SOURCES.freebsd+= \
-        Audio/pulseaudio.c \
-        Audio/pulse_stubs.c
+  ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    VBoxDD_SOURCES.freebsd+= \
+          Audio/DrvHostPulseAudio.c \
+          Audio/pulse_stubs.c
+  else
+    VBoxDD_SOURCES.freebsd+= \
+          Audio/pulseaudio.c \
+          Audio/pulse_stubs.c
+  endif
  endif
 
@@ -631 +661 @@
 
  ifeq ($(KBUILD_TARGET),freebsd)
-  VBoxDD_SOURCES        := \
-        $(filter-out Storage/DrvHostFloppy%, $(VBoxDD_SOURCES)) \
-        Audio/ossaudio.c \
-        Serial/DrvHostSerial.cpp
-  VBoxDD_SOURCES.freebsd += \
-        Network/DrvTAP.cpp
+  ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    VBoxDD_SOURCES        := \
+          $(filter-out Storage/DrvHostFloppy%, $(VBoxDD_SOURCES)) \
+          Audio/DrvHostOssAudio.c \
+          Serial/DrvHostSerial.cpp
+    VBoxDD_SOURCES.freebsd += \
+          Network/DrvTAP.cpp
+  else
+    VBoxDD_SOURCES        := \
+          $(filter-out Storage/DrvHostFloppy%, $(VBoxDD_SOURCES)) \
+          Audio/ossaudio.c \
+          Serial/DrvHostSerial.cpp
+    VBoxDD_SOURCES.freebsd += \
+          Network/DrvTAP.cpp
+  endif
  endif # freebsd
 
  VBoxDD_SOURCES.linux  += \
         Network/DrvTAP.cpp \
-        Audio/ossaudio.c \
         Parallel/DrvHostParallel.cpp \
         Serial/DrvHostSerial.cpp
 
+ ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+  VBoxDD_SOURCES.linux  += \
+    Audio/DrvHostOssAudio.c
+ else
+   VBoxDD_SOURCES.linux  += \
+         Audio/ossaudio.c 
+ endif
+  
  ifeq ($(KBUILD_TARGET),os2)
  VBoxDD_SOURCES        := $(filter-out Storage/DrvHost%, $(VBoxDD_SOURCES))
@@ -650 +696 @@
 
  ifeq ($(KBUILD_TARGET),solaris)
- VBoxDD_SOURCES        := $(filter-out Storage/DrvHostFloppy%, $(VBoxDD_SOURCES))
- VBoxDD_SOURCES.solaris += \
-        Audio/solaudio.c \
+  VBoxDD_SOURCES        := $(filter-out Storage/DrvHostFloppy%, $(VBoxDD_SOURCES))
+  VBoxDD_SOURCES.solaris += \
         Serial/DrvHostSerial.cpp
+  ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    VBoxDD_SOURCES.solaris += \
+          Audio/DrvHostSolAudio.c
+  else
+    VBoxDD_SOURCES.solaris += \
+          Audio/solaudio.c 
+  endif
   ifdef VBOX_WITH_SOLARIS_OSS
-   VBoxDD_SOURCES += Audio/ossaudio.c
-   VBoxDD_DEFS += VBOX_WITH_SOLARIS_OSS
+    ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+      VBoxDD_SOURCES += Audio/DrvHostOssAudio.c
+    else
+      VBoxDD_SOURCES += Audio/ossaudio.c
+    endif
+    VBoxDD_DEFS += VBOX_WITH_SOLARIS_OSS
   endif
   ifdef VBOX_WITH_SUID_WRAPPER
@@ -664 +720 @@
 
  VBoxDD_DEFS.win       += VBOX_WITH_WIN_PARPORT_SUP
+ ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+   VBoxDD_DEFS.win       += VBOX_WITH_PDM_AUDIO_DRIVER
+ endif
  VBoxDD_SOURCES.win    += \
-        Audio/dsoundaudio.c \
         Serial/DrvHostSerial.cpp \
         Parallel/DrvHostParallel.cpp
+
+ ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+ VBoxDD_SOURCES.win    += \
+   Audio/DrvHostDSound.c
+ else
+ VBoxDD_SOURCES.win    += \
+   Audio/dsoundaudio.c 
+ endif
 
  if defined(VBOX_WITH_NETFLT)

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -127 +127 @@
     if (RT_FAILURE(rc))
         return rc;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    //rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceAudioVRDE);
+    //if (RT_FAILURE(rc))
+    //    return rc;
+#else
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceAudioSniffer);
     if (RT_FAILURE(rc))
         return rc;
+#endif
 #ifdef VBOX_WITH_VUSB
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceOHCI);
@@ -266 +272 @@
     if (RT_FAILURE(rc))
         return rc;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+# if defined(RT_OS_WINDOWS)
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostDSound);
+    if (RT_FAILURE(rc))
+        return rc;
+# endif
+# if defined(RT_OS_LINUX)
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostPulseAudio);
+    if (RT_FAILURE(rc))
+        return rc;
+# endif
+# if defined(RT_OS_FREEBSD)
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOssAudio);
+    if (RT_FAILURE(rc))
+        return rc;
+# endif
+# if defined(RT_OS_DARWIN)
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostCoreAudio);
+    if (RT_FAILURE(rc))
+        return rc;
+# endif
+# if defined(RT_OS_SOLARIS)
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostSolAudio);
+    if (RT_FAILURE(rc))
+        return rc;
+# endif
+#endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvACPI);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -56 +56 @@
 extern const PDMDEVREG g_DeviceSB16;
 extern const PDMDEVREG g_DeviceICH6_HDA;
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
 extern const PDMDEVREG g_DeviceAudioSniffer;
+#endif
 extern const PDMDEVREG g_DeviceOHCI;
 extern const PDMDEVREG g_DeviceEHCI;
@@ -111 +113 @@
 extern const PDMDRVREG g_DrvNetSniffer;
 extern const PDMDRVREG g_DrvAUDIO;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+# if defined(RT_OS_WINDOWS)
+extern const PDMDRVREG g_DrvHostDSound;
+# endif
+# if defined(RT_OS_LINUX)
+extern const PDMDRVREG g_DrvHostPulseAudio;
+# endif
+# if defined(RT_OS_DARWIN)
+extern const PDMDRVREG g_DrvHostCoreAudio;
+# endif
+# if defined(RT_OS_SOLARIS)
+extern const PDMDRVREG g_DrvHostSolAudio;
+# endif
+# if defined(RT_OS_FREEBSD)
+extern const PDMDRVREG g_DrvHostOssAudio;
+# endif
+#endif
 extern const PDMDRVREG g_DrvACPI;
 extern const PDMDRVREG g_DrvAcpiCpu;