Changeset 53830 in vbox

Timestamp:

Jan 15, 2015 3:44:12 PM (10 years ago)

Author:

vboxsync

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

97643

Message:

PDM/Audio: Unified timer work, minor cleanup.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (9 diffs)
• AudioMixBuffer.h (modified) (2 diffs)
• DevIchAc97.cpp (modified) (47 diffs)
• DevIchHda.cpp (modified) (55 diffs)
• DrvAudio.cpp (modified) (15 diffs)

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

@@ -38 +38 @@
 static void audioMixBufFreeBuf(PPDMAUDIOMIXBUF pMixBuf);
 static inline void audioMixBufPrint(PPDMAUDIOMIXBUF pMixBuf);
-static void audioMixBufReset(PPDMAUDIOMIXBUF pMixBuf);
 
 typedef uint32_t (AUDMIXBUF_FN_CONVFROM) (PPDMAUDIOSAMPLE paDst, const void *pvSrc, size_t cbSrc, uint32_t cSamples);
@@ -51 +50 @@
 {
     AssertPtrReturn(pMixBuf, VERR_INVALID_POINTER);
-    AssertReturn(cSamplesToRead, VERR_INVALID_PARAMETER);
     AssertPtrReturn(ppvSamples, VERR_INVALID_POINTER);
     AssertPtrReturn(pcSamplesRead, VERR_INVALID_POINTER);
 
     int rc;
+
+    if (!cSamplesToRead)
+    {
+        *pcSamplesRead = 0;
+        return VINF_SUCCESS;
+    }
 
     uint32_t cSamplesRead;
@@ -86 +90 @@
  *
  * @param   pMixBuf
- * @param   cSamples
+ * @param   cSamplesToClear
  */
-void audioMixBufFinish(PPDMAUDIOMIXBUF pMixBuf, uint32_t cSamples)
-{
-    LogFlowFunc(("cSamples=%RU32\n", cSamples));
+void audioMixBufFinish(PPDMAUDIOMIXBUF pMixBuf, uint32_t cSamplesToClear)
+{
+    LogFlowFunc(("cSamples=%RU32\n", cSamplesToClear));
     LogFlowFunc(("%s: offReadWrite=%RU32, cProcessed=%RU32\n",
                  pMixBuf->pszName, pMixBuf->offReadWrite, pMixBuf->cProcessed));
@@ -98 +102 @@
     {
         LogFlowFunc(("\t%s: cMixed=%RU32 -> %RU32\n",
-                     pIter->pszName, pIter->cMixed, pIter->cMixed - cSamples));
-
-        Assert(pIter->cMixed >= cSamples);
-        pIter->cMixed -= cSamples;
+                     pIter->pszName, pIter->cMixed, pIter->cMixed - cSamplesToClear));
+
+        Assert(pIter->cMixed >= cSamplesToClear);
+        pIter->cMixed -= cSamplesToClear;
         pIter->offReadWrite = 0;
     }
 
-    uint32_t cLeft = RT_MIN(cSamples, pMixBuf->cSamples);
+    uint32_t cLeft = RT_MIN(cSamplesToClear, pMixBuf->cSamples);
     uint32_t offClear;
 
@@ -149 +153 @@
 }
 
+/** @todo Rename this function! Too confusing in combination with audioMixBufFreeBuf(). */
 uint32_t audioMixBufFree(PPDMAUDIOMIXBUF pMixBuf)
 {
@@ -593 +598 @@
 
     pMixBuf->offReadWrite = 0;
-    pMixBuf->cMixed = 0;
-    pMixBuf->cProcessed = 0;
+    pMixBuf->cMixed       = 0;
+    pMixBuf->cProcessed   = 0;
 
     /* Prevent division by zero.
@@ -841 +846 @@
 static inline void audioMixBufPrint(PPDMAUDIOMIXBUF pMixBuf)
 {
-#ifdef DEBUG
+#ifdef DEBUG_DISABLED
     PPDMAUDIOMIXBUF pParent = pMixBuf;
     if (pMixBuf->pParent)
@@ -1020 +1025 @@
 }
 
-static void audioMixBufReset(PPDMAUDIOMIXBUF pMixBuf)
+void audioMixBufReset(PPDMAUDIOMIXBUF pMixBuf)
 {
     AssertPtrReturnVoid(pMixBuf);
@@ -1027 +1032 @@
 
     pMixBuf->offReadWrite = 0;
-    pMixBuf->cMixed = 0;
-    pMixBuf->cProcessed = 0;
+    pMixBuf->cMixed       = 0;
+    pMixBuf->cProcessed   = 0;
 
     RT_BZERO(pMixBuf->pSamples, AUDIOMIXBUF_S2B(pMixBuf, pMixBuf->cSamples));

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

@@ -52 +52 @@
 inline uint32_t audioMixBufBytesToSamples(PPDMAUDIOMIXBUF pMixBuf);
 void audioMixBufDestroy(PPDMAUDIOMIXBUF pMixBuf);
-void audioMixBufFinish(PPDMAUDIOMIXBUF pMixBuf, uint32_t cSamples);
+void audioMixBufFinish(PPDMAUDIOMIXBUF pMixBuf, uint32_t cSamplesToClear);
 uint32_t audioMixBufFree(PPDMAUDIOMIXBUF pMixBuf);
 size_t audioMixBufFreeBytes(PPDMAUDIOMIXBUF pMixBuf);
@@ -66 +66 @@
 int audioMixBufReadCirc(PPDMAUDIOMIXBUF pMixBuf, void *pvBuf, size_t cbBuf, uint32_t *pcRead);
 int audioMixBufReadCircEx(PPDMAUDIOMIXBUF pMixBuf, PDMAUDIOMIXBUFFMT enmFmt, void *pvBuf, size_t cbBuf, uint32_t *pcRead);
+void audioMixBufReset(PPDMAUDIOMIXBUF pMixBuf);
 uint32_t audioMixBufSize(PPDMAUDIOMIXBUF pMixBuf);
 size_t audioMixBufSizeBytes(PPDMAUDIOMIXBUF pMixBuf);

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

@@ -23 +23 @@
 
 #include <iprt/assert.h>
-#include <iprt/mem.h>
-#include <iprt/string.h>
-#include <iprt/uuid.h>
+#ifdef IN_RING3
+# include <iprt/mem.h>
+# include <iprt/string.h>
+# include <iprt/uuid.h>
+#endif
 
 #include "VBoxDD.h"
@@ -37 +39 @@
 #endif
 
-/*
 #ifdef LOG_GROUP
  #undef LOG_GROUP
@@ -43 +44 @@
 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
 #include <VBox/log.h>
-*/
 
 /*******************************************************************************
@@ -212 +212 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+typedef struct AC97INPUTSTREAM
+{
+    /** PCM line input stream. */
+    R3PTRTYPE(PPDMAUDIOGSTSTRMIN)      pStrmIn;
+    /** Mixer handle for line input stream. */
+    R3PTRTYPE(PAUDMIXSTREAM)           phStrmIn;
+} AC97INPUTSTREAM, *PAC97INPUTSTREAM;
+
+typedef struct AC97OUTPUTSTREAM
+{
+    /** PCM output stream. */
+    R3PTRTYPE(PPDMAUDIOGSTSTRMOUT)     pStrmOut;
+} AC97OUTPUTSTREAM, *PAC97OUTPUTSTREAM;
+
 /**
  * Struct for maintaining a host backend driver.
@@ -218 +232 @@
 typedef struct AC97DRIVER
 {
+    union
+    {
+        /** Node for storing this driver in our device driver
+         *  list of AC97STATE. */
+        RTLISTNODE                     Node;
+        struct
+        {
+            R3PTRTYPE(void *)          dummy1;
+            R3PTRTYPE(void *)          dummy2;
+        } dummy;
+    };
+
     /** Pointer to AC97 controller (state). */
-    PAC97STATE                         pAC97State;
+    R3PTRTYPE(PAC97STATE)              pAC97State;
     /** Driver flags. */
     PDMAUDIODRVFLAGS                   Flags;
+    uint32_t                           PaddingFlags;
     /** LUN # to which this driver has been assigned. */
     uint8_t                            uLUN;
@@ -227 +254 @@
      *  host backend. */
     R3PTRTYPE(PPDMIAUDIOCONNECTOR)     pConnector;
-    /** PCM input stream. */
-    R3PTRTYPE(PPDMAUDIOGSTSTRMIN)      pStrmIn;
-    /** Mixer handle for input stream. */
-    R3PTRTYPE(PAUDMIXSTREAM)           phStrmIn;
-    /** PCM output stream. */
-    R3PTRTYPE(PPDMAUDIOGSTSTRMOUT)     pStrmOut;
-    /** PCM microphone input stream. */
-    R3PTRTYPE(PPDMAUDIOGSTSTRMIN)      pStrmMic;
-    /** Mixer handle for output stream. */
-    R3PTRTYPE(PAUDMIXSTREAM)           phStrmMic;
-} AC97DRIVER;
-/** Pointer to a AC97 driver. */
-typedef AC97DRIVER *PAC97DRIVER;
+    /** Stream for line input. */
+    AC97INPUTSTREAM                    LineIn;
+    /** Stream for mic input. */
+    AC97INPUTSTREAM                    MicIn;
+    /** Stream for output. */
+    AC97OUTPUTSTREAM                   Out;
+    /** Number of samples to play (output), needed
+     *  for the timer routine. */
+    uint32_t                           cSamplesLive;
+} AC97DRIVER, *PAC97DRIVER;
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
@@ -246 +270 @@
     /** The PCI device state. */
     PCIDevice               PciDev;
-
-    /** Audio stuff. */
     /** Global Control (Bus Master Control Register) */
     uint32_t                glob_cnt;
@@ -259 +281 @@
     uint8_t                 mixer_data[256];
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    /** Number of active + allocated LUNs. Each
-     *  LUN has an AC'97 driver assigned. */
-    uint8_t                 cLUNs;
-    /** Array of active AC'97 drivers. */
-    R3PTRTYPE(PAC97DRIVER)  paDrv[32];
+    /** The emulation timer for handling the attached
+     *  LUN drivers. */
+    PTMTIMERR3              pTimer;
+    /** Timer ticks for handling the LUN drivers. */
+    uint64_t                uTicks;
+# ifdef VBOX_WITH_STATISTICS
+    STAMPROFILE             StatTimer;
+    STAMCOUNTER             StatBytesRead;
+    STAMCOUNTER             StatBytesWritten;
+# endif
+    /** List of associated LUN drivers. */
+    RTLISTANCHOR            lstDrv;
     /** The device' software mixer. */
     R3PTRTYPE(PAUDIOMIXER)  pMixer;
@@ -289 +318 @@
     /** Base port of the I/O space region. */
     RTIOPORT                IOPortBase[2];
+    /** Pointer to temporary scratch read/write buffer. */
+    R3PTRTYPE(uint8_t *)    pvReadWriteBuf;
+    /** Size of the temporary scratch read/write buffer. */
+    uint32_t                cbReadWriteBuf;
 } AC97STATE;
 /** Pointer to the AC97 device state. */
 typedef AC97STATE *PAC97STATE;
+
+#ifndef VBOX_DEVICE_STRUCT_TESTCASE
 
 #define ICHAC97STATE_2_DEVINS(a_pAC97)   ((a_pAC97)->pDevIns)
@@ -334 +369 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-static void ichac97OutputCallback(void *pvContext, uint32_t cbFree);
-static void ichac97InputCallback(void *pvContext, uint32_t cbAvail);
-static void ichac97MicInCallback(void *pvContext, uint32_t cbAvail);
+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);
@@ -429 +463 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    PAC97DRIVER pDrv;
     switch (bm_index)
     {
         case PI_INDEX:
-            for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-                pThis->paDrv[lun]->pConnector->pfnEnableIn(pThis->paDrv[lun]->pConnector,
-                                                           pThis->paDrv[lun]->pStrmIn, RT_BOOL(on));
+             RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+                pDrv->pConnector->pfnEnableIn(pDrv->pConnector,
+                                              pDrv->LineIn.pStrmIn, RT_BOOL(on));
             break;
 
         case PO_INDEX:
-            for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-                pThis->paDrv[lun]->pConnector->pfnEnableOut(pThis->paDrv[lun]->pConnector,
-                                                            pThis->paDrv[lun]->pStrmOut, RT_BOOL(on));
+            RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+                pDrv->pConnector->pfnEnableOut(pDrv->pConnector,
+                                               pDrv->Out.pStrmOut, RT_BOOL(on));
             break;
 
         case MC_INDEX:
-            for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-                pThis->paDrv[lun]->pConnector->pfnEnableIn(pThis->paDrv[lun]->pConnector,
-                                                           pThis->paDrv[lun]->pStrmMic, RT_BOOL(on));
+            RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+                pDrv->pConnector->pfnEnableIn(pDrv->pConnector,
+                                              pDrv->MicIn.pStrmIn, RT_BOOL(on));
             break;
 
@@ -514 +549 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    PAC97DRIVER pDrv;
+    uint8_t uLUN = 0;
+
     if (freq)
     {
@@ -527 +565 @@
         switch (index)
         {
-            case PI_INDEX: /* PCM in */
-                for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
+            case PI_INDEX: /* Line input. */
+            {
+                RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
                 {
-                    if (RTStrAPrintf(&pszDesc, "[LUN#%RU8] ac97.pi", lun) <= 0)
+                    if (RTStrAPrintf(&pszDesc, "[LUN#%RU8] ac97.pi", uLUN) <= 0)
                     {
                         rc = VERR_NO_MEMORY;
@@ -536 +575 @@
                     }
 
-                    rc = pThis->paDrv[lun]->pConnector->pfnOpenIn(pThis->paDrv[lun]->pConnector,
-                                                                  pszDesc, PDMAUDIORECSOURCE_LINE_IN,
-                                                                  ichac97InputCallback, pThis->paDrv[lun] /* pvContext */,
-                                                                  &streamCfg,
-                                                                  &pThis->paDrv[lun]->pStrmIn);
-                    LogFlowFunc(("LUN#%RU8: Opened line input with rc=%Rrc\n", lun, rc));
+                    rc = pDrv->pConnector->pfnOpenIn(pDrv->pConnector,
+                                                     pszDesc, PDMAUDIORECSOURCE_LINE_IN,
+                                                     NULL, pDrv /* pvContext */,
+                                                     &streamCfg,
+                                                     &pDrv->LineIn.pStrmIn);
+                    LogFlowFunc(("LUN#%RU8: Opened line input with rc=%Rrc\n", uLUN, rc));
                     if (rc == VINF_SUCCESS) /* Note: Could return VWRN_ALREADY_EXISTS. */
                     {
-                        audioMixerRemoveStream(pThis->pSinkLineIn, pThis->paDrv[lun]->phStrmIn);
+                        audioMixerRemoveStream(pThis->pSinkLineIn, pDrv->LineIn.phStrmIn);
                         rc = audioMixerAddStreamIn(pThis->pSinkLineIn,
-                                                   pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pStrmIn,
+                                                   pDrv->pConnector, pDrv->LineIn.pStrmIn,
                                                    0 /* uFlags */,
-                                                   &pThis->paDrv[lun]->phStrmIn);
+                                                   &pDrv->LineIn.phStrmIn);
                     }
 
                     RTStrFree(pszDesc);
+                    uLUN++;
                 }
                 break;
-
-            case PO_INDEX: /* PCM out */
-                for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
+            }
+
+            case PO_INDEX: /* Output. */
+            {
+                RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
                 {
-                    if (RTStrAPrintf(&pszDesc, "[LUN#%RU8] ac97.po", lun) <= 0)
+                    if (RTStrAPrintf(&pszDesc, "[LUN#%RU8] ac97.po", uLUN) <= 0)
                     {
                         rc = VERR_NO_MEMORY;
@@ -564 +606 @@
                     }
 
-                    rc = pThis->paDrv[lun]->pConnector->pfnOpenOut(pThis->paDrv[lun]->pConnector, pszDesc,
-                                                                   ichac97OutputCallback, pThis->paDrv[lun] /* pvContext */,
-                                                                   &streamCfg,
-                                                                   &pThis->paDrv[lun]->pStrmOut);
-                    LogFlowFunc(("LUN#%RU8: Opened output with rc=%Rrc\n", lun, rc));
+                    rc = pDrv->pConnector->pfnOpenOut(pDrv->pConnector, pszDesc,
+                                                      NULL, pDrv /* pvContext */,
+                                                      &streamCfg,
+                                                      &pDrv->Out.pStrmOut);
+                    LogFlowFunc(("LUN#%RU8: Opened output with rc=%Rrc\n", uLUN, rc));
+
                     RTStrFree(pszDesc);
+                    uLUN++;
                 }
                 break;
+            }
 
             case MC_INDEX: /* Mic in */
-                for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
+            {
+                RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
                 {
-                    if (RTStrAPrintf(&pszDesc, "[LUN#%RU8] ac97.mc", lun) <= 0)
+                    if (RTStrAPrintf(&pszDesc, "[LUN#%RU8] ac97.mc", uLUN) <= 0)
                     {
                         rc = VERR_NO_MEMORY;
@@ -582 +628 @@
                     }
 
-                    rc = pThis->paDrv[lun]->pConnector->pfnOpenIn(pThis->paDrv[lun]->pConnector,
-                                                                  pszDesc, PDMAUDIORECSOURCE_MIC,
-                                                                  ichac97MicInCallback, pThis->paDrv[lun] /* pvContext */,
-                                                                  &streamCfg,
-                                                                  &pThis->paDrv[lun]->pStrmMic);
-                    LogFlowFunc(("LUN#%RU8: Opened mic input with rc=%Rrc\n", lun, rc));
+                    rc = pDrv->pConnector->pfnOpenIn(pDrv->pConnector,
+                                                     pszDesc, PDMAUDIORECSOURCE_MIC,
+                                                     NULL, pDrv /* pvContext */,
+                                                     &streamCfg,
+                                                     &pDrv->MicIn.pStrmIn);
+                    LogFlowFunc(("LUN#%RU8: Opened mic input with rc=%Rrc\n", uLUN, rc));
                     if (rc == VINF_SUCCESS) /* Note: Could return VWRN_ALREADY_EXISTS. */
                     {
-                        audioMixerRemoveStream(pThis->pSinkMicIn, pThis->paDrv[lun]->phStrmMic);
+                        audioMixerRemoveStream(pThis->pSinkMicIn, pDrv->MicIn.phStrmIn);
                         rc = audioMixerAddStreamIn(pThis->pSinkMicIn,
-                                                   pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pStrmMic,
+                                                   pDrv->pConnector, pDrv->MicIn.pStrmIn,
                                                    0 /* uFlags */,
-                                                   &pThis->paDrv[lun]->phStrmMic);
+                                                   &pDrv->MicIn.phStrmIn);
                     }
 
                     RTStrFree(pszDesc);
+                    uLUN++;
                 }
                 break;
+            }
 
             default:
                 AssertMsgFailed(("Unsupported index %d\n", index));
+                rc = VERR_NOT_SUPPORTED;
                 break;
         }
@@ -611 +660 @@
         {
             case PI_INDEX:
-                for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
+            {
+                RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
                 {
-                    pThis->paDrv[lun]->pConnector->pfnCloseIn(pThis->paDrv[lun]->pConnector,
-                                                              pThis->paDrv[lun]->pStrmIn);
-                    audioMixerRemoveStream(pThis->pSinkLineIn,
-                                           pThis->paDrv[lun]->phStrmIn);
-                    pThis->paDrv[lun]->pStrmIn = NULL;
-                    pThis->paDrv[lun]->phStrmIn = NULL;
+                    pDrv->pConnector->pfnCloseIn(pDrv->pConnector, pDrv->LineIn.pStrmIn);
+                    audioMixerRemoveStream(pThis->pSinkLineIn,pDrv->LineIn.phStrmIn);
+
+                    pDrv->LineIn.pStrmIn = NULL;
+                    pDrv->LineIn.phStrmIn = NULL;
                 }
 
                 LogFlowFunc(("Closed line input\n"));
                 break;
+            }
 
             case PO_INDEX:
-                for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
+            {
+                RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
                 {
-                    pThis->paDrv[lun]->pConnector->pfnCloseOut(pThis->paDrv[lun]->pConnector,
-                                                               pThis->paDrv[lun]->pStrmOut);
-                    pThis->paDrv[lun]->pStrmOut = NULL;
+                    pDrv->pConnector->pfnCloseOut(pDrv->pConnector, pDrv->Out.pStrmOut);
+                    pDrv->Out.pStrmOut = NULL;
                 }
 
                 LogFlowFunc(("Closed output\n"));
                 break;
+            }
 
             case MC_INDEX:
-                for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
+            {
+                RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
                 {
-                    pThis->paDrv[lun]->pConnector->pfnCloseIn(pThis->paDrv[lun]->pConnector,
-                                                              pThis->paDrv[lun]->pStrmMic);
-                    audioMixerRemoveStream(pThis->pSinkMicIn,
-                                           pThis->paDrv[lun]->phStrmMic);
-                    pThis->paDrv[lun]->pStrmMic = NULL;
-                    pThis->paDrv[lun]->phStrmMic = NULL;
+                    pDrv->pConnector->pfnCloseIn(pDrv->pConnector, pDrv->MicIn.pStrmIn);
+                    audioMixerRemoveStream(pThis->pSinkMicIn, pDrv->MicIn.phStrmIn);
+
+                    pDrv->MicIn.pStrmIn  = NULL;
+                    pDrv->MicIn.phStrmIn = NULL;
                 }
 
-                LogFlowFunc(("Closed mic input\n"));
+                LogFlowFunc(("Closed microphone input\n"));
                 break;
+            }
 
             default:
@@ -738 +790 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-        pThis->paDrv[lun]->pConnector->pfnEnableIn(pThis->paDrv[lun]->pConnector,
-                                                   pThis->paDrv[lun]->pStrmIn, fEnable);
+    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]);
@@ -752 +804 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-        pThis->paDrv[lun]->pConnector->pfnEnableOut(pThis->paDrv[lun]->pConnector,
-                                                    pThis->paDrv[lun]->pStrmOut, fEnable);
+    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]);
@@ -766 +817 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-        pThis->paDrv[lun]->pConnector->pfnEnableIn(pThis->paDrv[lun]->pConnector,
-                                                   pThis->paDrv[lun]->pStrmMic, fEnable);
+    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]);
@@ -788 +838 @@
     lvol = 255 * lvol / VOL_MASK;
 
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    PAC97DRIVER pDrv;
+#endif
+
 #ifdef SOFT_VOLUME
     if (index == AC97_Master_Volume_Mute)
     {
 # ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-        for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-        {
-            pThis->paDrv[lun]->pConnector->pfnIsSetOutVolume(pThis->paDrv[lun]->pConnector,
-                                                             pThis->paDrv[lun]->pStrmOut,
-                                                             RT_BOOL(mute), lvol, rvol);
-        }
+        RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+            pDrv->pConnector->pfnIsSetOutVolume(pDrv->pConnector, pDrv->Out.pStrmOut, RT_BOOL(mute), lvol, rvol);
 # else
         AUD_set_volume_out(pThis->voice_po, mute, lvol, rvol);
@@ -805 +855 @@
     {
 # ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-        for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-        {
-            /** @todo In SetVolume no passing audmixerctl_in as its not used in DrvAudio.c */
-            pThis->paDrv[lun]->pConnector->pfnSetVolume(pThis->paDrv[lun]->pConnector,
-                                                        RT_BOOL(mute), lvol, rvol);
+        RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+        {
+            /** @todo In SetVolume no passing audmixerctl_in as its not used in DrvAudio.cpp. */
+            pDrv->pConnector->pfnSetVolume(pDrv->pConnector, RT_BOOL(mute), lvol, rvol);
         }
 # else
@@ -817 +866 @@
 #else /* !SOFT_VOLUME */
 # ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-        pThis->paDrv[lun]->pConnector->pfnSetVolume(pThis->paDrv[lun]->pConnector,
-                                                    RT_BOOL(mute), lvol, rvol);
+    RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+        pDrv->pConnector->pfnSetVolume(pDrv->pConnector, RT_BOOL(mute), lvol, rvol);
 # else
     AUD_set_volume(mt, &mute, &lvol, &rvol);
@@ -901 +949 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-    {
-        pThis->paDrv[lun]->phStrmIn = NULL;
-        pThis->paDrv[lun]->phStrmMic = NULL;
+    PAC97DRIVER pDrv;
+
+    RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+    {
+        pDrv->LineIn.phStrmIn = NULL;
+        pDrv->MicIn.phStrmIn  = NULL;
     }
 
@@ -992 +1042 @@
 }
 
-static int ichac97WriteAudio(PAC97STATE pThis, PAC97BMREG pReg, int max, int *stop)
+static int ichac97WriteAudio(PAC97STATE pThis, PAC97BMREG pReg, uint32_t cbMax, uint32_t *pcbWritten)
 {
     PPDMDEVINS  pDevIns = ICHAC97STATE_2_DEVINS(pThis);
 
-    uint8_t     tmpbuf[_4K];
-    uint32_t    addr = pReg->bd.addr;
-    uint32_t    written = 0;
-    uint32_t    to_copy = 0;
-
-    uint32_t temp = RT_MIN((uint32_t)pReg->picb << 1, (uint32_t)max);
-    if (!temp)
-    {
-        *stop = 1;
-        return 0;
-    }
+    uint32_t    addr           = pReg->bd.addr;
+    uint32_t    cbWrittenTotal = 0;
+    uint32_t    cbToRead;
+
+    uint32_t cbToWrite = RT_MIN((uint32_t)(pReg->picb << 1), cbMax);
+    if (!cbToWrite)
+        return VERR_NO_DATA;
 
     int rc = VINF_SUCCESS;
 
-    while (temp)
-    {
-        uint32_t copied;
-        to_copy = RT_MIN(temp, sizeof(tmpbuf));
-        PDMDevHlpPhysRead(pDevIns, addr, tmpbuf, to_copy); /** @todo Check rc? */
+    LogFlowFunc(("pReg=%p, cbMax=%RU32\n", pReg, cbMax));
+
+    while (cbToWrite)
+    {
+        uint32_t cbWritten;
+        uint32_t cbWrittenMin = UINT32_MAX;
+
+        cbToRead = RT_MIN(cbToWrite, pThis->cbReadWriteBuf);
+        PDMDevHlpPhysRead(pDevIns, addr, pThis->pvReadWriteBuf, cbToRead); /** @todo Check rc? */
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-# ifdef DEBUG_LUN
-        uint8_t lun = DEBUG_LUN_NUM;
-# else
         /* Just multiplex the output to the connected backends.
          * No need to utilize the virtual mixer here (yet). */
-        for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-        {
-# endif
-            rc = pThis->paDrv[lun]->pConnector->pfnWrite(pThis->paDrv[lun]->pConnector,
-                                                         pThis->paDrv[lun]->pStrmOut,
-                                                         tmpbuf, to_copy, &copied);
-            if (RT_FAILURE(rc))
+        PAC97DRIVER pDrv;
+        RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+        {
+            int rc2 = pDrv->pConnector->pfnWrite(pDrv->pConnector, pDrv->Out.pStrmOut,
+                                                 pThis->pvReadWriteBuf, cbToRead, &cbWritten);
+            if (RT_FAILURE(rc2))
                 continue;
-# ifndef DEBUG_LUN
-        }
-# endif
+
+            cbWrittenMin = RT_MIN(cbWrittenMin, cbWritten);
+            LogFlowFunc(("\tLUN#%RU8: cbWritten=%RU32, cWrittenMin=%RU32\n", pDrv->uLUN, cbWritten, cbWrittenMin));
+        }
 #else
-        copied = AUD_write(pThis->voice_po, tmpbuf, to_copy);
+        cbWrittenMin = AUD_write(pThis->voice_po, pThis->pvReadWriteBuf, cbToRead);
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-        LogFlowFunc(("to_copy=%RU32, copied=%RU32, temp=%RU32, temp_left=%RU32\n",
-                     to_copy, copied, temp, temp - copied));
-
-        if (!copied)
-        {
-            *stop = 1;
+        LogFlowFunc(("\tcbToRead=%RU32, cbWrittenMin=%RU32, cbToWrite=%RU32, cbLeft=%RU32\n",
+                     cbToRead, cbWrittenMin, cbToWrite, cbToWrite - cbWrittenMin));
+
+        if (!cbWrittenMin)
+        {
+            rc = VERR_NO_DATA;
             break;
         }
-        temp    -= copied;
-        addr    += copied;
-        written += copied;
-    }
-
-    if (!temp)
-    {
-        if (to_copy < 4)
-        {
-            LogFlowFunc(("whoops\n"));
-            pThis->last_samp = 0;
-        }
-        else
-            pThis->last_samp = *(uint32_t *)&tmpbuf[to_copy - 4];
+
+        Assert(cbWrittenMin != UINT32_MAX);
+        Assert(cbToWrite >= cbWrittenMin);
+        cbToWrite      -= cbWrittenMin;
+        addr           += cbWrittenMin;
+        cbWrittenTotal += cbWrittenMin;
     }
 
     pReg->bd.addr = addr;
 
-    LogFlowFunc(("written=%RU32\n", written));
-    return written;
-}
-
-static void ichac97WriteBUP(PAC97STATE pThis, int elapsed)
+    if (RT_SUCCESS(rc))
+    {
+        if (!cbToWrite) /* All data written? */
+        {
+            if (cbToRead < 4)
+            {
+                AssertMsgFailed(("Unable to save last written sample, cbToRead < 4 (is %RU32)\n", cbToRead));
+                pThis->last_samp = 0;
+            }
+            else
+                pThis->last_samp = *(uint32_t *)&pThis->pvReadWriteBuf[cbToRead - 4];
+        }
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        if (pcbWritten)
+            *pcbWritten = cbWrittenTotal;
+    }
+
+    LogFlowFunc(("cbWrittenTotal=%RU32, rc=%Rrc\n", cbWrittenTotal, rc));
+    return rc;
+}
+
+static void ichac97WriteBUP(PAC97STATE pThis, uint32_t cbElapsed)
 {
     if (!(pThis->bup_flag & BUP_SET))
@@ -1083 +1142 @@
     }
 
-    int written = 0;
-
-    while (elapsed)
-    {
-        unsigned int temp = RT_MIN((unsigned int)elapsed, sizeof(pThis->silence));
-        uint32_t copied;
-        while (temp)
+    while (cbElapsed)
+    {
+        uint32_t cbWrittenMin = UINT32_MAX;
+
+        uint32_t cbToWrite = RT_MIN(cbElapsed, (uint32_t)sizeof(pThis->silence));
+        while (cbToWrite)
         {
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-# ifdef DEBUG_LUN
-            uint8_t lun = DEBUG_LUN_NUM;
-# else
-            for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
+            PAC97DRIVER pDrv;
+            uint32_t cbWritten;
+            RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
             {
-# endif
-                int rc2 = pThis->paDrv[lun]->pConnector->pfnWrite(pThis->paDrv[lun]->pConnector,
-                                                                  pThis->paDrv[lun]->pStrmOut,
-                                                                  pThis->silence, temp, &copied);
+                int rc2 = pDrv->pConnector->pfnWrite(pDrv->pConnector, pDrv->Out.pStrmOut,
+                                                     pThis->silence, cbToWrite, &cbWritten);
                 if (RT_FAILURE(rc2))
                     continue;
-# ifndef DEBUG_LUN
+
+                cbWrittenMin = RT_MIN(cbWrittenMin, cbWritten);
             }
-# endif
 #else
-            copied = AUD_write(pThis->voice_po, pThis->silence, temp);
+            cbWrittenMin = AUD_write(pThis->voice_po, pThis->silence, cbToWrite);
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
-            if (!copied)
+            if (!cbWrittenMin)
                 return;
-            temp    -= copied;
-            elapsed -= copied;
-            written += copied;
-        }
-    }
-}
-
-static int ichac97ReadAudio(PAC97STATE pThis, PAC97BMREG pReg, int max, int *stop)
-{
-    PPDMDEVINS  pDevIns = ICHAC97STATE_2_DEVINS(pThis);
+
+            Assert(cbToWrite >= cbWrittenMin);
+            cbToWrite -= cbWrittenMin;
+            Assert(cbElapsed >= cbWrittenMin);
+            cbElapsed -= cbWrittenMin;
+        }
+    }
+}
+
+static int ichac97ReadAudio(PAC97STATE pThis, PAC97BMREG pReg, uint32_t cbMax, uint32_t *pcbWritten)
+{
+    AssertReturn(cbMax, VERR_INVALID_PARAMETER);
+
+    PPDMDEVINS pDevIns = ICHAC97STATE_2_DEVINS(pThis);
+
+    int rc = VINF_SUCCESS;
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
@@ -1129 +1190 @@
     AssertPtr(pSink);
 
-    int rc;
-    uint32_t cbRead;
-
-    size_t cbMixBuf = max * sizeof(uint8_t);
-    Assert(cbMixBuf);
+    uint32_t cbRead = 0;
+
+    size_t cbMixBuf = cbMax;
     uint32_t cbToRead = RT_MIN(pReg->picb << 1, cbMixBuf);
+
+    if (!cbToRead)
+        return VERR_NO_DATA;
 
     uint8_t *pvMixBuf = (uint8_t *)RTMemAlloc(cbMixBuf);
@@ -1146 +1208 @@
             pReg->bd.addr += cbRead;
         }
-        else
-            *stop = 1;
 
         RTMemFree(pvMixBuf);
     }
     else
-        *stop = 1;
-
-    if (*stop)
-        cbRead = 0;
-
-    return cbRead;
+        rc = VERR_NO_MEMORY;
+
+    if (RT_SUCCESS(rc))
+    {
+        Assert(cbRead);
+        if (pcbWritten)
+            *pcbWritten = cbRead;
+    }
+
+    return rc;
 #else
     uint32_t    addr = pReg->bd.addr;
@@ -1166 +1230 @@
     SWVoiceIn  *voice = (pReg - pThis->bm_regs) == MC_INDEX ? pThis->voice_mc : pThis->voice_pi;
 
-    temp = audio_MIN(temp, (uint32_t)max);
+    temp = audio_MIN(temp, (uint32_t)cbMax);
     if (!temp)
-    {
-        *stop = 1;
-        return 0;
-    }
+        return VERR_NO_DATA;
 
     uint8_t tmpbuf[4096];
@@ -1181 +1242 @@
         if (!acquired)
         {
-            *stop = 1;
+            rc = VERR_GENERAL_FAILURE; /* Not worth fixing anymore. */
             break;
         }
@@ -1191 +1252 @@
 
     pReg->bd.addr = addr;
-    return nread;
+
+    if (RT_SUCCESS(rc))
+    {
+        if (pcbWritten)
+            *pcbWritten = nread;
+    }
+
+    return rc;
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 }
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-static void ichac97TransferAudio(PAC97DRIVER pDrv, int index, int elapsed)
-#else
-static void ichac97TransferAudio(PAC97STATE pThis, int index, int elapsed)
+static DECLCALLBACK(void) ichac97Timer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
+{
+    PAC97STATE pThis = PDMINS_2_DATA(pDevIns, PAC97STATE);
+    AssertPtr(pThis);
+
+    STAM_PROFILE_START(&pThis->StatTimer, a);
+
+    int rc = VINF_SUCCESS;
+
+    uint32_t cbInMax  = 0;
+    uint32_t cbOutMin = UINT32_MAX;
+
+    PAC97DRIVER pDrv;
+    uint32_t cbIn, cbOut;
+
+    RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+    {
+        if (!pDrv->pConnector->pfnIsOutputOK(pDrv->pConnector, pDrv->Out.pStrmOut))
+            continue;
+
+        rc = pDrv->pConnector->pfnQueryData(pDrv->pConnector, /** @todo Rename QueryStatus */
+                                            &cbIn, &cbOut, &pDrv->cSamplesLive);
+        if (RT_SUCCESS(rc))
+        {
+            if (cbIn || cbOut)
+                LogFlowFunc(("\tLUN#%RU8: cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
+
+            cbInMax  = RT_MAX(cbInMax, cbIn);
+            cbOutMin = RT_MIN(cbOutMin, cbOut);
+        }
+        else
+            pDrv->cSamplesLive = 0;
+    }
+
+    /*
+     * Playback.
+     */
+    if (cbOutMin)
+    {
+        Assert(cbOutMin != UINT32_MAX);
+        ichac97TransferAudio(pThis, PO_INDEX, cbOutMin); /** @todo Add rc! */
+    }
+    else
+    {
+        RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+        {
+            if (pDrv->cSamplesLive)
+                pDrv->pConnector->pfnPlayOut(pDrv->pConnector);
+        }
+    }
+
+    /*
+     * Recording.
+     */
+    if (cbInMax)
+        ichac97TransferAudio(pThis, PI_INDEX, cbInMax); /** @todo Add rc! */
+
+    TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
+
+    STAM_PROFILE_STOP(&pThis->StatTimer, a);
+}
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-{
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    PAC97STATE pThis = pDrv->pAC97State;
-
-    if (pDrv->uLUN != 0) /* Only LUN 0 can write and read from the device. */
-        return;
-    /** @todo Fix this limitation by implementing a virtual mixer. */
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+
+static int ichac97TransferAudio(PAC97STATE pThis, int index, uint32_t cbElapsed)
+{
+    LogFlowFunc(("pThis=%p, index=%d, cbElapsed=%RU32\n", pThis, index, cbElapsed));
 
     PAC97BMREG pReg = &pThis->bm_regs[index];
@@ -1217 +1339 @@
             {
                 case PO_INDEX:
-                    ichac97WriteBUP(pThis, elapsed);
+                    ichac97WriteBUP(pThis, cbElapsed);
                     break;
 
@@ -1225 +1347 @@
         }
 
-        return;
-    }
-
-    int written = 0;
-    int stop = 0;
-
-    while ((elapsed >> 1) && !stop)
-    {
-        int temp;
-
+        return VINF_SUCCESS;
+    }
+
+    int rc;
+    uint32_t cbWrittenTotal = 0;
+
+    while ((cbElapsed >> 1))
+    {
         if (!pReg->bd_valid)
         {
@@ -1260 +1380 @@
         }
 
+        uint32_t cbWritten;
         switch (index)
         {
             case PO_INDEX:
-                temp = ichac97WriteAudio(pThis, pReg, elapsed, &stop);
-                written += temp;
-                elapsed -= temp;
-                Assert((temp & 1) == 0);    /* Else the following shift won't work */
-                pReg->picb -= (temp >> 1);
+            {
+                rc = ichac97WriteAudio(pThis, pReg, cbElapsed, &cbWritten);
+                if (RT_SUCCESS(rc))
+                {
+                    cbWrittenTotal += cbWritten;
+                    cbElapsed      -= cbWritten;
+                    Assert((cbWritten & 1) == 0);    /* Else the following shift won't work */
+                    pReg->picb     -= (cbWritten >> 1);
+                }
                 break;
+            }
 
             case PI_INDEX:
             case MC_INDEX:
-                temp = ichac97ReadAudio(pThis, pReg, elapsed, &stop);
-                elapsed -= temp;
-                Assert((temp & 1) == 0);    /* Else the following shift won't work */
-                pReg->picb -= (temp >> 1);
+            {
+                rc = ichac97ReadAudio(pThis, pReg, cbElapsed, &cbWritten);
+                if (RT_SUCCESS(rc))
+                {
+                    cbElapsed  -= cbWritten;
+                    Assert((cbWritten & 1) == 0);    /* Else the following shift won't work */
+                    pReg->picb -= (cbWritten >> 1);
+                }
                 break;
+            }
 
             default:
-                AssertMsgFailed(("Index %d not supported\n", index));
+                AssertMsgFailed(("Index %ld not supported\n", index));
                 break;
         }
-        LogFlowFunc(("pReg->picb = %d\n", pReg->picb));
+
+        LogFlowFunc(("pReg->picb=%RU16, cbWrittenTotal=%RU32\n", pReg->picb, cbWrittenTotal));
 
         if (!pReg->picb)
@@ -1297 +1429 @@
                 LogFlowFunc(("Underrun civ (%d) == lvi (%d)\n", pReg->civ, pReg->lvi));
                 new_sr |= SR_LVBCI | SR_DCH | SR_CELV;
-                stop = 1;
                 pThis->bup_flag = (pReg->bd.ctl_len & BD_BUP) ? BUP_LAST : 0;
+
+                rc = VERR_NO_DATA;
             }
             else
@@ -1309 +1442 @@
             ichac97UpdateStatus(pThis, pReg, new_sr);
         }
-    }
-}
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-static void ichac97InputCallback(void *pvContext, uint32_t cbAvail)
-{
-    PAC97DRIVER pThis = (PAC97DRIVER)pvContext;
-    ichac97TransferAudio(pThis, PI_INDEX, cbAvail);
-}
-#else
+
+        if (RT_FAILURE(rc))
+        {
+            if (rc == VERR_NO_DATA)
+                rc = VINF_SUCCESS;
+
+            break;
+        }
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
 static void ichac97InputCallback(void *pvContext, int cbAvail)
 {
     ichac97TransferAudio((AC97STATE *)pvContext, PI_INDEX, cbAvail);
 }
-#endif
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-static void ichac97MicInCallback(void *pvContext, uint32_t cbAvail)
-{
-    PAC97DRIVER pThis = (PAC97DRIVER)pvContext;
-    ichac97TransferAudio(pThis, MC_INDEX, cbAvail);
-}
-#else
+
 static void ichac97MicInCallback(void *pvContext, int cbAvail)
 {
     ichac97TransferAudio((AC97STATE *)pvContext, MC_INDEX, cbAvail);
 }
-#endif
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-static void ichac97OutputCallback(void *pvContext, uint32_t cbFree)
-{
-    PAC97DRIVER pThis = (PAC97DRIVER)pvContext;
-    ichac97TransferAudio(pThis, PO_INDEX, cbFree);
-}
-#else
+
 static void ichac97OutputCallback(void *pvContext, int cbFree)
 {
@@ -1865 +1987 @@
 }
 
-
+#ifdef IN_RING3
 /**
  * @callback_method_impl{FNSSMDEVSAVEEXEC}
@@ -1896 +2018 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    /* Writing only host backend values here and ignore data for other backends
-     * like VRDE and video recording. LUN 0 always is the host backend. */
-    if (pThis->cLUNs >= 1)
-    {
-        PPDMIAUDIOCONNECTOR pCon = pThis->paDrv[0]->pConnector;
+    PAC97DRIVER pDrv;
+    RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+    {
+        PPDMIAUDIOCONNECTOR pCon = pDrv->pConnector;
         AssertPtr(pCon);
-        active[PI_INDEX] = pCon->pfnIsActiveIn(pCon,  pThis->paDrv[0]->pStrmIn) ? 1 : 0;
-        active[PO_INDEX] = pCon->pfnIsActiveOut(pCon, pThis->paDrv[0]->pStrmOut) ? 1 : 0;
-        active[MC_INDEX] = pCon->pfnIsActiveIn(pCon,  pThis->paDrv[0]->pStrmMic) ? 1 : 0;
-    }
-    else
-        RT_ZERO(active);
+        active[PI_INDEX] = pCon->pfnIsActiveIn (pCon, pDrv->LineIn.pStrmIn) ? 1 : 0;
+        active[PO_INDEX] = pCon->pfnIsActiveOut(pCon, pDrv->Out.pStrmOut)   ? 1 : 0;
+        active[MC_INDEX] = pCon->pfnIsActiveIn (pCon, pDrv->MicIn.pStrmIn)  ? 1 : 0;
+    }
 #else
     active[PI_INDEX] = AUD_is_active_in( pThis->voice_pi) ? 1 : 0;
@@ -2025 +2144 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-    {
-        if (pThis->paDrv[lun])
-        {
-            RTMemFree(pThis->paDrv[lun]);
-            pThis->paDrv[lun] = NULL;
-        }
-    }
-
-    pThis->cLUNs = 0;
+    PAC97DRIVER pDrv;
+    while (!RTListIsEmpty(&pThis->lstDrv))
+    {
+        pDrv = RTListGetFirst(&pThis->lstDrv, AC97DRIVER, Node);
+
+        RTListNodeRemove(&pDrv->Node);
+        RTMemFree(pDrv);
+    }
 
     if (pThis->pMixer)
@@ -2042 +2159 @@
     }
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+
+    if (pThis->pvReadWriteBuf)
+    {
+        RTMemFree(pThis->pvReadWriteBuf);
+        pThis->pvReadWriteBuf = NULL;
+        pThis->cbReadWriteBuf = 0;
+    }
 
     return VINF_SUCCESS;
@@ -2098 +2222 @@
                 pDrv->Flags |= PDMAUDIODRVFLAG_PRIMARY;
 
-            LogFunc(("LUN #%u: pCon=%p, drvFlags=0x%x\n",
-                     uLUN, pDrv->pConnector, pDrv->Flags));
-
-            pThis->paDrv[uLUN] = pDrv;
-            pThis->cLUNs++;
+            LogFunc(("LUN#%RU8: pCon=%p, drvFlags=0x%x\n", uLUN, pDrv->pConnector, pDrv->Flags));
+
+            /* Attach to driver list. */
+            RTListAppend(&pThis->lstDrv, &pDrv->Node);
         }
         else
@@ -2190 +2313 @@
      */
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    /* We support 32 LUNs max. This should be enough for now. */
-    for (uint8_t lun = 0; lun < 32 ; lun++)
-    {
-        LogFunc(("Trying to attach driver for LUN #%RU8 ...\n", lun));
-        rc = ichac97Attach(pDevIns, lun, PDM_TACH_FLAGS_NOT_HOT_PLUG);
+    RTListInit(&pThis->lstDrv);
+
+    uint8_t uLUN = 0;
+    do
+    {
+        LogFunc(("Trying to attach driver for LUN #%RU8 ...\n", uLUN));
+        rc = ichac97Attach(pDevIns, uLUN++, PDM_TACH_FLAGS_NOT_HOT_PLUG);
         if (RT_FAILURE(rc))
         {
@@ -2201 +2326 @@
             break;
         }
-    }
-
-    LogRel(("AC97: %RU8 LUN(s) attached\n", pThis->cLUNs));
+
+    } while (0);
+
+    LogFunc(("cLUNs=%RU8, rc=%Rrc\n", uLUN, rc));
 #else
     rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThis->IBase, &pThis->pDrvBase, "Audio Driver Port");
@@ -2221 +2347 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-    {
-        if (!pThis->paDrv[lun]->pConnector->pfnIsInputOK(pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pStrmIn))
-            LogRel(("AC97: WARNING: Unable to open PCM line input for LUN #%RU32!\n", lun));
-        if (!pThis->paDrv[lun]->pConnector->pfnIsOutputOK(pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pStrmOut))
-            LogRel(("AC97: WARNING: Unable to open PCM output for LUN #%RU32!\n", lun));
-        if (!pThis->paDrv[lun]->pConnector->pfnIsInputOK(pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pStrmMic))
-            LogRel(("AC97: WARNING: Unable to open PCM microphone input for LUN #%RU32!\n", lun));
-    }
-
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-    {
-        PAC97DRIVER pDrv = pThis->paDrv[lun];
-        AssertPtr(pDrv);
-
-        /* Only primary drivers are critical for the VM to run. Everything else
-         * might not worth showing an own error message box in the GUI. */
+    PAC97DRIVER pDrv;
+    uLUN = 0;
+    RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+    {
+        if (!pDrv->pConnector->pfnIsInputOK(pDrv->pConnector, pDrv->LineIn.pStrmIn))
+            LogRel(("AC97: WARNING: Unable to open PCM line input for LUN #%RU32!\n", uLUN));
+        if (!pDrv->pConnector->pfnIsOutputOK(pDrv->pConnector, pDrv->Out.pStrmOut))
+            LogRel(("AC97: WARNING: Unable to open PCM output for LUN #%RU32!\n", uLUN));
+        if (!pDrv->pConnector->pfnIsInputOK(pDrv->pConnector, pDrv->MicIn.pStrmIn))
+            LogRel(("AC97: WARNING: Unable to open PCM microphone input for LUN #%RU32!\n", uLUN));
+
+        uLUN++;
+    }
+
+    RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
+    {
+        /*
+         * Only primary drivers are critical for the VM to run. Everything else
+         * might not worth showing an own error message box in the GUI.
+         */
         if (!(pDrv->Flags & PDMAUDIODRVFLAG_PRIMARY))
             continue;
 
-        PPDMIAUDIOCONNECTOR pCon = pThis->paDrv[lun]->pConnector;
+        PPDMIAUDIOCONNECTOR pCon = pDrv->pConnector;
         AssertPtr(pCon);
-        if (   !pCon->pfnIsInputOK (pCon, pDrv->pStrmIn)
-            && !pCon->pfnIsOutputOK(pCon, pDrv->pStrmOut)
-            && !pCon->pfnIsInputOK (pCon, pDrv->pStrmMic))
-        {
-            LogRel(("AC97: Selecting NULL driver\n"));
+        if (   !pCon->pfnIsInputOK (pCon, pDrv->LineIn.pStrmIn)
+            && !pCon->pfnIsOutputOK(pCon, pDrv->Out.pStrmOut)
+            && !pCon->pfnIsInputOK (pCon, pDrv->MicIn.pStrmIn))
+        {
+            LogRel(("AC97: Falling back to NULL driver\n"));
 
             /* Was not able initialize *any* stream.
              * Select the NULL audio driver instead. */
-            pCon->pfnCloseIn (pCon, pDrv->pStrmIn);
-            pCon->pfnCloseOut(pCon, pDrv->pStrmOut);
-            pCon->pfnCloseIn (pCon, pDrv->pStrmMic);
-
-            pDrv->pStrmOut = NULL;
-            pDrv->pStrmIn = NULL;
-            pDrv->pStrmMic = NULL;
+            pCon->pfnCloseIn (pCon, pDrv->LineIn.pStrmIn);
+            pCon->pfnCloseOut(pCon, pDrv->Out.pStrmOut);
+            pCon->pfnCloseIn (pCon, pDrv->MicIn.pStrmIn);
+
+            pDrv->Out.pStrmOut = NULL;
+            pDrv->LineIn.pStrmIn = NULL;
+            pDrv->MicIn.pStrmIn = NULL;
 
             pCon->pfnInitNull(pCon);
@@ -2266 +2395 @@
                    "with the consequence that no sound is audible"));
         }
-        else if (   !pCon->pfnIsInputOK (pCon, pDrv->pStrmIn)
-                 || !pCon->pfnIsOutputOK(pCon, pDrv->pStrmOut)
-                 || !pCon->pfnIsInputOK (pCon, pDrv->pStrmMic))
-        {
-            char   szMissingStreams[128];
+        else if (   !pCon->pfnIsInputOK (pCon, pDrv->LineIn.pStrmIn)
+                 || !pCon->pfnIsOutputOK(pCon, pDrv->Out.pStrmOut)
+                 || !pCon->pfnIsInputOK (pCon, pDrv->MicIn.pStrmIn))
+        {
+            char   szMissingStreams[255];
             size_t len = 0;
-            if (!pCon->pfnIsInputOK (pCon, pDrv->pStrmIn))
+            if (!pCon->pfnIsInputOK (pCon, pDrv->LineIn.pStrmIn))
                 len = RTStrPrintf(szMissingStreams,
                                   sizeof(szMissingStreams), "PCM Input");
-            if (!pCon->pfnIsOutputOK(pCon, pDrv->pStrmOut))
+            if (!pCon->pfnIsOutputOK(pCon, pDrv->Out.pStrmOut))
                 len += RTStrPrintf(szMissingStreams + len,
                                    sizeof(szMissingStreams) - len, len ? ", PCM Output" : "PCM Output");
-            if (!pCon->pfnIsInputOK (pCon, pDrv->pStrmMic))
+            if (!pCon->pfnIsInputOK (pCon, pDrv->MicIn.pStrmIn))
                 len += RTStrPrintf(szMissingStreams + len,
-                                   sizeof(szMissingStreams) - len, len ? ", PCM Mic" : "PCM Mic");
+                                   sizeof(szMissingStreams) - len, len ? ", PCM Microphone" : "PCM Microphone");
 
             PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",
@@ -2335 +2464 @@
     }
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+
+    if (RT_SUCCESS(rc))
+    {
+        pThis->cbReadWriteBuf = _4K; /** @todo Make this configurable. */
+        pThis->pvReadWriteBuf = (uint8_t *)RTMemAlloc(pThis->cbReadWriteBuf);
+        if (!pThis->pvReadWriteBuf)
+            rc = VERR_NO_MEMORY;
+    }
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    if (RT_SUCCESS(rc))
+    {
+        /* Start the emulation timer. */
+        rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, ichac97Timer, pThis,
+                                    TMTIMER_FLAGS_NO_CRIT_SECT, "DevIchAc97", &pThis->pTimer);
+        AssertRCReturn(rc, rc);
+
+        if (RT_SUCCESS(rc))
+        {
+            pThis->uTicks = PDMDevHlpTMTimeVirtGetFreq(pDevIns) / 200; /** Hz. @todo Make this configurable! */
+            if (pThis->uTicks < 100)
+                pThis->uTicks = 100;
+            LogFunc(("Timer ticks=%RU64\n", pThis->uTicks));
+
+            /* Fire off timer. */
+            TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
+        }
+    }
+
+# ifdef VBOX_WITH_STATISTICS
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Register statistics.
+         */
+        PDMDevHlpSTAMRegister(pDevIns, &pThis->StatTimer,            STAMTYPE_PROFILE, "/Devices/AC97/Timer",             STAMUNIT_TICKS_PER_CALL, "Profiling hdaTimer.");
+        PDMDevHlpSTAMRegister(pDevIns, &pThis->StatBytesRead,        STAMTYPE_COUNTER, "/Devices/AC97/BytesRead"   ,      STAMUNIT_BYTES,          "Bytes read from AC97 emulation.");
+        PDMDevHlpSTAMRegister(pDevIns, &pThis->StatBytesWritten,     STAMTYPE_COUNTER, "/Devices/AC97/BytesWritten",      STAMUNIT_BYTES,          "Bytes written to AC97 emulation.");
+    }
+# endif
+
+#endif
 
     return VINF_SUCCESS;
@@ -2393 +2564 @@
     PDM_DEVREG_VERSION
 };
+
+#endif /* !IN_RING3 */
+#endif /* !VBOX_DEVICE_STRUCT_TESTCASE */
+

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

@@ -58 +58 @@
 
 #ifdef DEBUG
-#define DEBUG_LUN
+//#define DEBUG_LUN
 # ifdef DEBUG_LUN
 #  define DEBUG_LUN_NUM 0
@@ -562 +562 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+typedef struct HDAINPUTSTREAM
+{
+    /** PCM line input stream. */
+    R3PTRTYPE(PPDMAUDIOGSTSTRMIN)      pStrmIn;
+    /** Mixer handle for line input stream. */
+    R3PTRTYPE(PAUDMIXSTREAM)           phStrmIn;
+} HDAINPUTSTREAM, *PHDAINPUTSTREAM;
+
+typedef struct HDAOUTPUTSTREAM
+{
+    /** PCM output stream. */
+    R3PTRTYPE(PPDMAUDIOGSTSTRMOUT)     pStrmOut;
+} HDAOUTPUTSTREAM, *PHDAOUTPUTSTREAM;
+
 /**
  * Struct for maintaining a host backend driver.
@@ -567 +581 @@
  * HDA codec. The HDA controller does the actual multiplexing
  * of HDA codec data to various host backend drivers then.
+ *
+ * This HDA device uses a timer in order to synchronize all
+ * read/write accesses across all attached LUNs / backends.
  */
 typedef struct HDADRIVER
 {
-    RTLISTNODE                         Node;
+    union
+    {
+        /** Node for storing this driver in our device driver
+         *  list of HDASTATE. */
+        RTLISTNODE                     Node;
+        struct
+        {
+            R3PTRTYPE(void *)          dummy1;
+            R3PTRTYPE(void *)          dummy2;
+        } dummy;
+    };
+
     /** Pointer to HDA controller (state). */
-    PHDASTATE                          pHDAState;
+    R3PTRTYPE(PHDASTATE)               pHDAState;
     /** Driver flags. */
     PDMAUDIODRVFLAGS                   Flags;
+    uint8_t                            u32Padding0[3];
     /** LUN to which this driver has been assigned. */
     uint8_t                            uLUN;
@@ -580 +609 @@
      *  host backend. */
     R3PTRTYPE(PPDMIAUDIOCONNECTOR)     pConnector;
-    /** PCM line input stream. */
-    R3PTRTYPE(PPDMAUDIOGSTSTRMIN)      pStrmIn;
-    /** Mixer handle for line input stream. */
-    R3PTRTYPE(PAUDMIXSTREAM)           phStrmIn;
-    /** PCM microphone input stream. */
-    R3PTRTYPE(PPDMAUDIOGSTSTRMIN)      pStrmMic;
-    /** Mixer handle for microphone input stream. */
-    R3PTRTYPE(PAUDMIXSTREAM)           phStrmMic;
-    /** PCM output stream. */
-    R3PTRTYPE(PPDMAUDIOGSTSTRMOUT)     pGstStrmOut;
+    /** Stream for line input. */
+    HDAINPUTSTREAM                     LineIn;
+    /** Stream for mic input. */
+    HDAINPUTSTREAM                     MicIn;
+    /** Stream for output. */
+    HDAOUTPUTSTREAM                    Out;
+    /** Number of samples to play (output), needed
+     *  for the timer routine. */
+    uint32_t                           cSamplesLive;
 } HDADRIVER, *PHDADRIVER;
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
@@ -639 +667 @@
     bool                               fRCEnabled;
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    /** Number of active + allocated LUNs. Each
-     *  LUN has a HDA driver assigned. */
-    uint8_t                            cLUNs;
-    uint8_t                            au8PaddingLUNs[4];
-    /** The HDA codec to use. */
+    /** The emulation timer for handling the attached
+     *  LUN drivers. */
+    PTMTIMERR3                         pTimer;
+    /** Timer ticks for handling the LUN drivers. */
+    uint64_t                           uTicks;
+# ifdef VBOX_WITH_STATISTICS
+    STAMPROFILE                        StatTimer;
+    STAMCOUNTER                        StatBytesRead;
+    STAMCOUNTER                        StatBytesWritten;
+# endif
+    /** Pointer to HDA codec to use. */
     R3PTRTYPE(PHDACODEC)               pCodec;
-    /** Array of active HDA drivers. */
-    R3PTRTYPE(PHDADRIVER)              paDrv[32];
+    union
+    {
+        /** List of associated LUN drivers. */
+        RTLISTANCHOR                   lstDrv;
+        struct
+        {
+            R3PTRTYPE(void *)          dummy1;
+            R3PTRTYPE(void *)          dummy2;
+        } dummy;
+    };
     /** The device' software mixer. */
     R3PTRTYPE(PAUDIOMIXER)             pMixer;
-    /** Audio sink for line input. */
+    /** Audio mixer sink for line input. */
     R3PTRTYPE(PAUDMIXSINK)             pSinkLineIn;
-    /** Audio sink for microphone input. */
+    /** Audio mixer sink for microphone input. */
     R3PTRTYPE(PAUDMIXSINK)             pSinkMicIn;
-#else
-    R3PTRTYPE(PPDMIAUDIOCONNECTOR)     pDrv;
+#else /* !VBOX_WITH_PDM_AUDIO_DRIVER */
     /** The HDA codec to use. */
     R3PTRTYPE(PHDACODEC)               pCodec;
@@ -662 +703 @@
     uint8_t                            u8Counter;
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    uint8_t                            au8Padding[4];
+    uint8_t                            au8Padding[7];
 #else
     uint8_t                            au8Padding[7];
@@ -718 +759 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-static void hdaTransfer(PHDADRIVER pDrv, ENMSOUNDSOURCE enmSrc, uint32_t cbAvail);
+static DECLCALLBACK(void) hdaTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser);
+static int hdaTransfer(PHDASTATE pThis, ENMSOUNDSOURCE enmSrc, uint32_t cbAvail);
 #else
-static void hdaTransfer(PHDACODEC pCodec, ENMSOUNDSOURCE enmSource, int cbAvail);
+static int hdaTransfer(PHDACODEC pCodec, ENMSOUNDSOURCE enmSource, int cbAvail);
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
@@ -1529 +1571 @@
         {
             Assert((!fReset && !fInReset));
+
+            PHDADRIVER pDrv;
             switch (iReg)
             {
                 case HDA_REG_SD0CTL:
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-                    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-                        pThis->paDrv[lun]->pConnector->pfnEnableIn(pThis->paDrv[lun]->pConnector,
-                                                                   pThis->paDrv[lun]->pStrmIn, fRun);
-#else
+# 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 */
+# endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
                     break;
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-# ifdef VBOX_WITH_HDA_MIC_IN
+# ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+#  ifdef VBOX_WITH_HDA_MIC_IN
                 case HDA_REG_SD2CTL:
-                    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-                        pThis->paDrv[lun]->pConnector->pfnEnableIn(pThis->paDrv[lun]->pConnector,
-                                                                   pThis->paDrv[lun]->pStrmMic, fRun);
-# endif
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+                    RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
+                        pDrv->pConnector->pfnEnableIn(pDrv->pConnector,
+                                                      pDrv->MicIn.pStrmIn, fRun);
+#  endif
+# endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
                     break;
                 case HDA_REG_SD4CTL:
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-                    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-                        pThis->paDrv[lun]->pConnector->pfnEnableOut(pThis->paDrv[lun]->pConnector,
-                                                                    pThis->paDrv[lun]->pGstStrmOut, fRun);
-#else
+# 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 */
+# endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
                     break;
                 default:
@@ -1565 +1609 @@
 #else /* !IN_RING3 */
         return VINF_IOM_R3_MMIO_WRITE;
-#endif
+#endif /* IN_RING3 */
     }
 
@@ -1768 +1812 @@
         return rc;
 
+    PHDADRIVER pDrv;
     switch (iReg)
     {
         case HDA_REG_SD0FMT:
-            for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
+            RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
                 rc = hdaCodecOpenStream(pThis->pCodec, PI_INDEX, &as);
             break;
@@ -1777 +1822 @@
 # ifdef VBOX_WITH_HDA_MIC_IN
         case HDA_REG_SD2FMT:
-            for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
+            RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
                 rc = hdaCodecOpenStream(pThis->pCodec, MC_INDEX, &as);
             break;
@@ -1850 +1895 @@
         HDA_REG(pThis, IRS) = HDA_REG_FIELD_FLAG_MASK(IRS, ICB);  /* busy */
         LogFunc(("IC:%x\n", cmd));
-# if 0
-        for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-        {
-            rc = pThis->pCodec[lun]->pfnLookup(pThis->pCodec[lun],
-                                               HDA_CODEC_CMD(cmd, lun),
-                                               &pfn);
-            if (RT_SUCCESS(rc))
-            {
-                AssertPtr(pfn);
-                rc = pfn(pThis->pCodec[lun],
-                         HDA_CODEC_CMD(cmd, lun), &resp);
-                if (RT_FAILURE(rc))
-                    break;
-            }
-        }
-# else
+
         rc = pThis->pCodec->pfnLookup(pThis->pCodec,
                                       HDA_CODEC_CMD(cmd, 0 /* LUN */),
@@ -1873 +1903 @@
         rc = pfn(pThis->pCodec,
                  HDA_CODEC_CMD(cmd, 0 /* LUN */), &resp);
-# endif
-
         if (RT_FAILURE(rc))
             AssertRCReturn(rc, rc);
+
         HDA_REG(pThis, IR) = (uint32_t)resp;
         LogFunc(("IR:%x\n", HDA_REG(pThis, IR)));
@@ -2008 +2037 @@
                                                       uint32_t u32SoundBackendBufferBytesAvail, uint32_t u32CblLimit)
 {
-    uint32_t cb2Copy;
     /*
      * Number of bytes depends on the current position in buffer (u32BdleCviLen-u32BdleCviPos)
      */
     Assert((pBdle->u32BdleCviLen >= pBdle->u32BdleCviPos)); /* sanity */
-    cb2Copy = pBdle->u32BdleCviLen - pBdle->u32BdleCviPos;
+    uint32_t cb2Copy = pBdle->u32BdleCviLen - pBdle->u32BdleCviPos;
     /*
      * we may increase the counter in range of [0, FIFOS + 1]
@@ -2169 +2197 @@
  *       but "reports bytes" when all conditions are met (FIFOW).
  */
-static uint32_t hdaReadAudio(PHDASTATE pThis, PAUDMIXSINK pSink, PHDABDLEDESC pBdle,
+static uint32_t hdaReadAudio(PHDASTATE pThis, PAUDMIXSINK pSink,
                              PHDASTREAMTRANSFERDESC pStreamDesc,
-                             uint32_t *pu32Avail, bool *fStop, uint32_t u32CblLimit)
-{
+                             uint32_t u32CblLimit, uint32_t *pcbAvail, uint32_t *pcbRead)
+{
+    PHDABDLEDESC pBdle = &pThis->StInBdle; /** @todo Add support for mic in. */
+
+    int rc;
     uint32_t cbTransferred = 0;
 
     LogFlowFunc(("CVI(pos:%d, len:%d)\n", pBdle->u32BdleCviPos, pBdle->u32BdleCviLen));
 
-    uint32_t cb2Copy = hdaCalculateTransferBufferLength(pBdle, pStreamDesc, *pu32Avail, u32CblLimit);
+    uint32_t cb2Copy = hdaCalculateTransferBufferLength(pBdle, pStreamDesc, *pcbAvail, u32CblLimit);
     if (!cb2Copy)
     {
         /* If we enter here we can't report "unreported bits". */
-        *fStop = true;
+        rc = VERR_NO_DATA;
     }
     else
     {
         uint32_t cbRead = 0;
-        int rc = audioMixerProcessSinkIn(pSink, pBdle->au8HdaBuffer, cb2Copy, &cbRead);
+        rc = audioMixerProcessSinkIn(pSink, pBdle->au8HdaBuffer, cb2Copy, &cbRead);
         if (RT_SUCCESS(rc))
         {
+            Assert(cbRead);
+
             /*
              * Write the HDA DMA buffer.
@@ -2197 +2230 @@
 
             /* Don't see any reason why cb2Copy would differ from cbRead. */
-            Assert((cbRead == cb2Copy && (*pu32Avail) >= cb2Copy)); /* sanity */
+            Assert((cbRead == cb2Copy && (*pcbAvail) >= cb2Copy)); /* sanity */
 
             if (pBdle->cbUnderFifoW + cbRead > hdaFifoWToSz(pThis, 0))
-                hdaBackendReadTransferReported(pBdle, cb2Copy, cbRead, &cbTransferred, pu32Avail);
+                hdaBackendReadTransferReported(pBdle, cb2Copy, cbRead, &cbTransferred, pcbAvail);
             else
             {
-                hdaBackendTransferUnreported(pThis, pBdle, pStreamDesc, cbRead, pu32Avail);
-                *fStop = true;
+                hdaBackendTransferUnreported(pThis, pBdle, pStreamDesc, cbRead, pcbAvail);
+                rc = VERR_NO_DATA;
             }
         }
-        else
-            *fStop = true;
     }
 
     Assert((cbTransferred <= (SDFIFOS(pThis, 0) + 1)));
-    LogFunc(("CVI(pos:%RU32, len:%RU32), cbTransferred: %RU32\n",
-             pBdle->u32BdleCviPos, pBdle->u32BdleCviLen, cbTransferred));
-    return cbTransferred;
+    LogFunc(("CVI(pos:%RU32, len:%RU32), cbTransferred=%RU32, rc=%Rrc\n",
+             pBdle->u32BdleCviPos, pBdle->u32BdleCviLen, cbTransferred, rc));
+
+    if (RT_SUCCESS(rc))
+        *pcbRead = cbTransferred;
+
+    return rc;
 }
 #else
@@ -2220 +2255 @@
 {
     PHDABDLEDESC pBdle = &pThis->StInBdle;
+
     uint32_t cbTransferred = 0;
     uint32_t cb2Copy = 0;
@@ -2235 +2271 @@
          * 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
          */
-        PDMDevHlpPCIPhysWrite(pThis->CTX_SUFF(pDevIns), pBdle->u64BdleCviAddr + pBdle->u32BdleCviPos, pBdle->au8HdaBuffer, cbBackendCopy);
+        PDMDevHlpPCIPhysWrite(pThis->CTX_SUFF(pDevIns), pBdle->u64BdleCviAddr + pBdle->u32BdleCviPos, pBdle->au8HdaBuffer,
+                              cbBackendCopy);
+        STAM_COUNTER_ADD(&pThis->StatBytesWritten, cbBackendCopy);
 
         /* Don't see any reason why cb2Copy would differ from cbBackendCopy */
@@ -2264 +2298 @@
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
-static uint32_t hdaWriteAudio(PHDASTATE pThis, PHDASTREAMTRANSFERDESC pStreamDesc, uint32_t *pu32Avail, bool *fStop, uint32_t u32CblLimit)
+static int hdaWriteAudio(PHDASTATE pThis, PHDASTREAMTRANSFERDESC pStreamDesc, uint32_t u32CblLimit,
+                         uint32_t *pcbAvail, uint32_t *pcbWritten)
 {
     PHDABDLEDESC pBdle = &pThis->StOutBdle;
+
+    int rc;
+
     uint32_t cbTransferred = 0;
-    uint32_t cbWrittenMax = 0; /* local byte counter, how many bytes copied to backend */
+    uint32_t cbWrittenMin = 0; /* local byte counter, how many bytes copied to backend */
 
     LogFunc(("CVI(cvi:%RU32, pos:%RU32, len:%RU32)\n", pBdle->u32BdleCvi, pBdle->u32BdleCviPos, pBdle->u32BdleCviLen));
 
     /* Local byte counter (on local buffer). */
-    uint32_t cb2Copy = hdaCalculateTransferBufferLength(pBdle, pStreamDesc, *pu32Avail, u32CblLimit);
+    uint32_t cb2Copy = hdaCalculateTransferBufferLength(pBdle, pStreamDesc, *pcbAvail, u32CblLimit);
 
     /*
@@ -2280 +2318 @@
      */
     if (!cb2Copy)
-        *fStop = true;
+    {
+        rc = VERR_NO_DATA;
+    }
     else
     {
@@ -2286 +2326 @@
                           pBdle->u64BdleCviAddr + pBdle->u32BdleCviPos,
                           pBdle->au8HdaBuffer + pBdle->cbUnderFifoW, cb2Copy);
+        STAM_COUNTER_ADD(&pThis->StatBytesRead, cb2Copy);
 
         /*
@@ -2293 +2334 @@
         {
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-            int rc;
             uint32_t cbWritten;
-# ifdef DEBUG_LUN
-            uint8_t lun = DEBUG_LUN_NUM;
-# else
-            for (uint8_t lun = 0; lun < 1; lun++)
+            cbWrittenMin = UINT32_MAX;
+
+            PHDADRIVER pDrv;
+            RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
             {
-# endif
-                rc = pThis->paDrv[lun]->pConnector->pfnWrite(pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pGstStrmOut,
-                                                             pBdle->au8HdaBuffer, cb2Copy + pBdle->cbUnderFifoW,
-                                                             &cbWritten);
-# ifndef DEBUG_LUN
-                if (RT_FAILURE(rc))
-                    continue;
-# endif
-                cbWrittenMax = RT_MAX(cbWrittenMax, cbWritten);
-# ifndef DEBUG_LUN
+                if (pDrv->pConnector->pfnIsActiveOut(pDrv->pConnector, pDrv->Out.pStrmOut))
+                {
+                    rc = pDrv->pConnector->pfnWrite(pDrv->pConnector, pDrv->Out.pStrmOut,
+                                                    pBdle->au8HdaBuffer, cb2Copy + pBdle->cbUnderFifoW,
+                                                    &cbWritten);
+                    if (RT_FAILURE(rc))
+                        continue;
+                }
+                else /* Stream disabled, just assume all was copied. */
+                    cbWritten = cb2Copy;
+
+                cbWrittenMin = RT_MIN(cbWrittenMin, cbWritten);
+                LogFlowFunc(("\tLUN#%RU8: cbWritten=%RU32, cWrittenMin=%RU32\n", pDrv->uLUN, cbWritten, cbWrittenMin));
             }
-# endif
+
+            if (cbWrittenMin == UINT32_MAX)
+                cbWrittenMin = 0;
 #else
-            cbWrittenMax = AUD_write (pThis->pCodec->SwVoiceOut, pBdle->au8HdaBuffer, cb2Copy + pBdle->cbUnderFifoW);
+            cbWrittenMin = AUD_write (pThis->pCodec->SwVoiceOut, pBdle->au8HdaBuffer, cb2Copy + pBdle->cbUnderFifoW);
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
-            hdaBackendWriteTransferReported(pBdle, cb2Copy, cbWrittenMax, &cbTransferred, pu32Avail);
+            hdaBackendWriteTransferReported(pBdle, cb2Copy, cbWrittenMin, &cbTransferred, pcbAvail);
         }
         else
@@ -2322 +2367 @@
             /* Not enough bytes to be processed and reported, we'll try our luck next time around. */
             hdaBackendTransferUnreported(pThis, pBdle, pStreamDesc, cb2Copy, NULL);
-            *fStop = true;
+            rc = VERR_NO_DATA;
         }
     }
 
     Assert(cbTransferred <= SDFIFOS(pThis, 4) + 1);
-    LogFunc(("CVI(pos:%RU32, len:%RU32, cbTransferred:%RU32)\n", pBdle->u32BdleCviPos, pBdle->u32BdleCviLen, cbTransferred));
-    return cbTransferred;
+    LogFunc(("CVI(pos:%RU32, len:%RU32, cbTransferred:%RU32), rc=%Rrc\n",
+             pBdle->u32BdleCviPos, pBdle->u32BdleCviLen, cbTransferred, rc));
+
+    if (RT_SUCCESS(rc))
+        *pcbWritten = cbTransferred;
+
+    return rc;
 }
 
@@ -2382 +2432 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-# ifdef VBOX_WITH_HDA_MIC_IN
-static void hdaMicInputCallback(void *pvDrv, uint32_t cbAvail)
-{
-    PHDADRIVER pThis = (PHDADRIVER)pvDrv;
-    hdaTransfer(pThis, MC_INDEX, cbAvail);
-}
-# endif /* VBOX_WITH_HDA_MIC_IN */
-
-static void hdaLineInputCallback(void *pvDrv, uint32_t cbAvail)
-{
-    PHDADRIVER pThis = (PHDADRIVER)pvDrv;
-    hdaTransfer(pThis, PI_INDEX, cbAvail);
-}
-
-static void hdaOutputCallback(void *pvDrv, uint32_t cbFree)
-{
-    PHDADRIVER pThis = (PHDADRIVER)pvDrv;
-    hdaTransfer(pThis, PO_INDEX, cbFree);
-}
-
 static DECLCALLBACK(int) hdaOpenIn(PHDASTATE pThis,
                                    const char *pszName, PDMAUDIORECSOURCE enmRecSource,
                                    PPDMAUDIOSTREAMCFG pCfg)
 {
-    PDMAUDIOCALLBACK_FN pfnCallback;
     PAUDMIXSINK pSink;
 
@@ -2413 +2442 @@
 # ifdef VBOX_WITH_HDA_MIC_IN
         case PDMAUDIORECSOURCE_MIC:
-            pfnCallback = hdaMicInputCallback;
             pSink = pThis->pSinkMicIn;
             break;
 # endif
         case PDMAUDIORECSOURCE_LINE_IN:
-            pfnCallback = hdaLineInputCallback;
             pSink = pThis->pSinkLineIn;
             break;
@@ -2429 +2456 @@
     char *pszDesc;
 
-    Assert(pThis->cLUNs);
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-    {
-        if (RTStrAPrintf(&pszDesc, "[LUN#%RU8] %s", lun, pszName) <= 0)
+    PHDADRIVER pDrv;
+    RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
+    {
+        if (RTStrAPrintf(&pszDesc, "[LUN#%RU8] %s", pDrv->uLUN, pszName) <= 0)
         {
             rc = VERR_NO_MEMORY;
@@ -2438 +2465 @@
         }
 
-        PHDADRIVER pDrv = pThis->paDrv[lun];
         rc = pDrv->pConnector->pfnOpenIn(pDrv->pConnector,
                                          pszDesc, enmRecSource,
-                                         pfnCallback /* fnCallback */, pDrv /* pvCallback */,
+                                         NULL /* fnCallback */, NULL /* pvCallback */,
                                          pCfg,
-                                         &pDrv->pStrmIn);
-        LogFlowFunc(("LUN#%RU8: Opened input \"%s\", with rc=%Rrc\n", lun, pszDesc, rc));
+                                         &pDrv->LineIn.pStrmIn);
+        LogFlowFunc(("LUN#%RU8: Opened input \"%s\", with rc=%Rrc\n", pDrv->uLUN, pszDesc, rc));
         if (rc == VINF_SUCCESS) /* Note: Could return VWRN_ALREADY_EXISTS. */
         {
-            audioMixerRemoveStream(pSink, pDrv->phStrmIn);
+            audioMixerRemoveStream(pSink, pDrv->LineIn.phStrmIn);
             rc = audioMixerAddStreamIn(pSink,
-                                       pDrv->pConnector, pDrv->pStrmIn,
-                                       0 /* uFlags */, &pDrv->phStrmIn);
+                                       pDrv->pConnector, pDrv->LineIn.pStrmIn,
+                                       0 /* uFlags */, &pDrv->LineIn.phStrmIn);
         }
 
@@ -2463 +2489 @@
                                     const char *pszName, PPDMAUDIOSTREAMCFG pCfg)
 {
-    int rc;
-
-    Assert(pThis->cLUNs);
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-    {
-        PHDADRIVER pDrv = pThis->paDrv[lun];
-        rc = pDrv->pConnector->pfnOpenOut(pDrv->pConnector, pszName,
-                                          hdaOutputCallback /* fnCallback */, pDrv /* pvCallback */,
-                                          pCfg,
-                                          &pDrv->pGstStrmOut);
+    int rc = VINF_SUCCESS;
+
+    PHDADRIVER pDrv;
+    RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
+    {
+        int rc2 = pDrv->pConnector->pfnOpenOut(pDrv->pConnector, pszName,
+                                               NULL /* fnCallback */, pDrv /* pvCallback */,
+                                               pCfg,
+                                               &pDrv->Out.pStrmOut);
+        if (RT_FAILURE(rc2))
+        {
+            LogFunc(("LUN#%RU8: Opening stream \"%s\" failed, rc=%Rrc\n", pDrv->uLUN, pszName, rc2));
+            if (RT_SUCCESS(rc))
+                rc = rc2;
+            /* Keep going. */
+        }
     }
 
@@ -2482 +2514 @@
                                       bool fMute, uint8_t uVolLeft, uint8_t uVolRight)
 {
-    int rc;
-
-    Assert(pThis->cLUNs);
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-    {
-        PHDADRIVER pDrv = pThis->paDrv[lun];
-        rc = pDrv->pConnector->pfnSetVolume(pDrv->pConnector,
-                                            fMute, uVolLeft, uVolRight);
+    int rc = VINF_SUCCESS;
+
+    PHDADRIVER pDrv;
+    RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
+    {
+        int rc2 = pDrv->pConnector->pfnSetVolume(pDrv->pConnector,
+                                                 fMute, uVolLeft, uVolRight);
+        if (RT_FAILURE(rc2))
+        {
+            LogFunc(("Failed for LUN #%RU8, rc=%Rrc\n", pDrv->uLUN, rc2));
+            if (RT_SUCCESS(rc))
+                rc = rc2;
+            /* Keep going. */
+        }
     }
 
@@ -2498 +2536 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-static DECLCALLBACK(void) hdaTransfer(PHDADRIVER pDrv,
-                                      ENMSOUNDSOURCE enmSrc, uint32_t cbAvail)
-{
-    AssertPtrReturnVoid(pDrv);
-    PHDASTATE pThis = pDrv->pHDAState;
-
-    LogFlowFunc(("pDrv=%p (LUN #%RU8), enmSrc=%ld, cbAvail=%RU32\n",
-                 pDrv, pDrv->uLUN, enmSrc, cbAvail));
+static DECLCALLBACK(void) hdaTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
+{
+    PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
+    AssertPtr(pThis);
+
+    STAM_PROFILE_START(&pThis->StatTimer, a);
+
+    int rc = VINF_SUCCESS;
+
+    uint32_t cbInMax  = 0;
+    uint32_t cbOutMin = UINT32_MAX;
+
+    PHDADRIVER pDrv;
+    uint32_t cbIn, cbOut;
+#ifdef DEBUG_LUN
+    uint8_t uLUN = 0;
+#endif
+    RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
+    {
+        if (!pDrv->pConnector->pfnIsOutputOK(pDrv->pConnector, pDrv->Out.pStrmOut))
+            continue;
+
+        rc = pDrv->pConnector->pfnQueryData(pDrv->pConnector, /** @todo Rename QueryStatus */
+                                            &cbIn, &cbOut, &pDrv->cSamplesLive);
+        if (RT_SUCCESS(rc))
+        {
+#ifdef DEBUG_LUN
+            LogFlowFunc(("\tLUN#%RU8: cbIn=%RU32, cbOut=%RU32\n", uLUN, cbIn, cbOut));
+#endif
+            cbInMax  = RT_MAX(cbInMax, cbIn);
+            cbOutMin = RT_MIN(cbOutMin, cbOut);
+        }
+        else
+            pDrv->cSamplesLive = 0;
+
+#ifdef DEBUG_LUN
+        uLUN++;
+#endif
+    }
+
+    /*
+     * Playback.
+     */
+    if (cbOutMin)
+    {
+        Assert(cbOutMin != UINT32_MAX);
+        hdaTransfer(pThis, PO_INDEX, cbOutMin); /** @todo Add rc! */
+    }
+    else
+    {
+        RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
+        {
+            if (pDrv->cSamplesLive)
+                pDrv->pConnector->pfnPlayOut(pDrv->pConnector);
+        }
+    }
+
+    /*
+     * Recording.
+     */
+    if (cbInMax)
+        hdaTransfer(pThis, PI_INDEX, cbInMax); /** @todo Add rc! */
+
+    TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
+
+    STAM_PROFILE_STOP(&pThis->StatTimer, a);
+}
+
+static DECLCALLBACK(int) hdaTransfer(PHDASTATE pThis,
+                                     ENMSOUNDSOURCE enmSrc, uint32_t cbAvail)
+{
+    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+
+    LogFlowFunc(("pThis=%p, cbAvail=%RU32\n", pThis, cbAvail));
 #else
-static DECLCALLBACK(void) hdaTransfer(PHDACODEC pCodec, ENMSOUNDSOURCE enmSrc, int cbAvail)
-{
-    AssertPtrReturnVoid(pCodec);
+static DECLCALLBACK(int) hdaTransfer(PHDACODEC pCodec, ENMSOUNDSOURCE enmSrc, int cbAvail)
+{
+    AssertPtrReturnVoid(pCodec, VERR_INVALID_POINTER);
     PHDASTATE pThis = pCodec->pHDAState;
+    AssertPtrReturnVoid(pThis, VERR_INVALID_POINTER);
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+    int rc;
+
     uint8_t      u8Strm;
     PHDABDLEDESC pBdle;
@@ -2541 +2648 @@
         default:
             AssertMsgFailed(("Unknown source index %ld\n", enmSrc));
-            return;
+            return VERR_NOT_SUPPORTED;
     }
 
@@ -2547 +2654 @@
     hdaInitTransferDescriptor(pThis, pBdle, u8Strm, &StreamDesc);
 
-    bool fStop = false;
-    while (cbAvail && !fStop)
+    while (cbAvail)
     {
         Assert(   (StreamDesc.u32Ctl & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN))
@@ -2568 +2674 @@
         PAUDMIXSINK pSink;
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
-        uint32_t cb;
+        uint32_t cbWritten;
         switch (enmSrc)
         {
@@ -2574 +2680 @@
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
                 pSink = pThis->pSinkLineIn;
-                cb = hdaReadAudio(pThis, pSink, pBdle, &StreamDesc, &cbAvail, &fStop, u32CblLimit);
+                rc = hdaReadAudio(pThis, pSink, &StreamDesc, u32CblLimit, &cbAvail, &cbWritten);
 #else
-                cb = hdaReadAudio(pThis, &StreamDesc, (uint32_t *)&cbAvail, &fStop, u32CblLimit);
+                rc = hdaReadAudio(pThis, &StreamDesc, u32CblLimit, &cbAvail, &cbWritten);
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
                 break;
             case PO_INDEX:
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-                cb = hdaWriteAudio(pThis, &StreamDesc, &cbAvail, &fStop, u32CblLimit);
+                rc = hdaWriteAudio(pThis, &StreamDesc, u32CblLimit, &cbAvail, &cbWritten);
 #else
-                cb = hdaWriteAudio(pThis, &StreamDesc, (uint32_t *)&cbAvail, &fStop, u32CblLimit);
+                rc = hdaWriteAudio(pThis, &StreamDesc, u32CblLimit, &cbAvail, &cbWritten);
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
                 break;
@@ -2590 +2696 @@
             case MC_INDEX:
                 pSink = pThis->pSinkMicIn;
-                cb = hdaReadAudio(pThis, pSink, pBdle, &StreamDesc, &cbAvail, &fStop, u32CblLimit);
+                rc = hdaReadAudio(pThis, pSink, &StreamDesc, u32CblLimit, &cbAvail, &cbWritten);
                 break;
 # endif
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
             default:
-                cb = 0;
-                fStop = true;
-                AssertMsgFailedReturnVoid(("Unsupported source index %d\n", enmSrc));
+                AssertMsgFailed(("Unsupported source index %ld\n", enmSrc));
+                rc = VERR_NOT_SUPPORTED;
                 break;
         }
-        Assert(cb <= StreamDesc.u32Fifos + 1);
+        Assert(cbWritten <= StreamDesc.u32Fifos + 1);
         *StreamDesc.pu32Sts &= ~HDA_REG_FIELD_FLAG_MASK(SDSTS, FIFORDY);
 
         /* Process end of buffer condition. */
-        hdaStreamCounterUpdate(pThis, pBdle, &StreamDesc, cb);
-        fStop = !fStop ? !hdaDoNextTransferCycle(pThis, pBdle, &StreamDesc) : fStop;
-    }
+        hdaStreamCounterUpdate(pThis, pBdle, &StreamDesc, cbWritten);
+
+        if (   !hdaDoNextTransferCycle(pThis, pBdle, &StreamDesc)
+            || RT_FAILURE(rc))
+        {
+            if (rc == VERR_NO_DATA) /* No more data to process. */
+                rc = VINF_SUCCESS;
+
+            break;
+        }
+    }
+
+    return rc;
 }
 #endif /* IN_RING3 */
@@ -2871 +2986 @@
             else
             {
-                LogRel(("Invalid write access @0x%x!\n", offReg));
+                LogRel(("HDA: Invalid write access @0x%x!\n", offReg));
                 cbReg = 1;
             }
@@ -3016 +3131 @@
 {
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
+
     /* Save Codec nodes states */
-#if 0
-    /** @todo Handle LUNs > 0! */
-    hdaCodecSaveState(pThis->pCodec[0], pSSM);
-#else
     hdaCodecSaveState(pThis->pCodec, pSSM);
-#endif
 
     /* Save MMIO registers */
@@ -3049 +3160 @@
      * Load Codec nodes states.
      */
-#if 0
-    /** @todo Handle LUNs > 0! */
-    int rc = hdaCodecLoadState(pThis->pCodec[0], pSSM, uVersion);
-#else
     int rc = hdaCodecLoadState(pThis->pCodec, pSSM, uVersion);
-#endif
     if (RT_FAILURE(rc))
         return rc;
@@ -3119 +3225 @@
      */
     bool fEnableIn    = RT_BOOL(SDCTL(pThis, 0) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
+#ifdef VBOX_WITH_HDA_MIC_IN
     bool fEnableMicIn = RT_BOOL(SDCTL(pThis, 2) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
+#endif
     bool fEnableOut   = RT_BOOL(SDCTL(pThis, 4) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-    {
-        rc = pThis->paDrv[lun]->pConnector->pfnEnableIn(pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pStrmIn,
-                                                        fEnableIn);
+    PHDADRIVER pDrv;
+    RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
+    {
+        rc = pDrv->pConnector->pfnEnableIn(pDrv->pConnector, pDrv->LineIn.pStrmIn,
+                                           fEnableIn);
         if (RT_FAILURE(rc))
             break;
-        rc = pThis->paDrv[lun]->pConnector->pfnEnableIn(pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pStrmMic,
-                                                        fEnableMicIn);
+# ifdef VBOX_WITH_HDA_MIC_IN
+        rc = pDrv->pConnector->pfnEnableIn(pDrv->pConnector, pDrv->MicIn.pStrmIn,
+                                           fEnableMicIn);
         if (RT_FAILURE(rc))
             break;
-        rc = pThis->paDrv[lun]->pConnector->pfnEnableOut(pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pGstStrmOut,
-                                                         fEnableOut);
+# endif
+        rc = pDrv->pConnector->pfnEnableOut(pDrv->pConnector, pDrv->Out.pStrmOut,
+                                            fEnableOut);
         if (RT_FAILURE(rc))
             break;
@@ -3315 +3426 @@
 }
 
+
 /**
  * @callback_method_impl{FNDBGFHANDLERDEV}
@@ -3321 +3433 @@
 {
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
-#if 0
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-    {
-        if (pThis->pCodec[lun]->pfnCodecDbgListNodes)
-            pThis->pCodec[lun]->pfnCodecDbgListNodes(pThis->pCodec[lun], pHlp, pszArgs);
-        else
-            pHlp->pfnPrintf(pHlp, "Codec implementation for LUN #%RU8 doesn't provide corresponding callback\n", lun);
-    }
-#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
 }
 
@@ -3344 +3447 @@
 {
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
-#if 0
-    for (uint8_t lun = 0; lun < pThis->cLUNs; 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
 }
 
@@ -3404 +3498 @@
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /* Stop any audio currently playing. */
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-    {
-        pThis->paDrv[lun]->pConnector->pfnEnableIn(pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pStrmIn,
-                                                   false /* Disable */);
+    PHDADRIVER pDrv;
+    RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
+    {
+        pDrv->pConnector->pfnEnableIn(pDrv->pConnector, pDrv->LineIn.pStrmIn, false /* Disable */);
         /* Ignore rc. */
-        pThis->paDrv[lun]->pConnector->pfnEnableIn(pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pStrmMic,
-                                                   false /* Disable */);
+        pDrv->pConnector->pfnEnableIn(pDrv->pConnector, pDrv->MicIn.pStrmIn, false /* Disable */);
         /* Ditto. */
-        pThis->paDrv[lun]->pConnector->pfnEnableOut(pThis->paDrv[lun]->pConnector, pThis->paDrv[lun]->pGstStrmOut,
-                                                    false /* Disable */);
+        pDrv->pConnector->pfnEnableOut(pDrv->pConnector, pDrv->Out.pStrmOut, false /* Disable */);
         /* Ditto. */
     }
@@ -3443 +3535 @@
         if (u8Strm == 0)
             pBdle = &pThis->StInBdle;
+# ifdef VBOX_WITH_HDA_MIC_IN
         else if (u8Strm == 2)
             pBdle = &pThis->StMicBdle;
+# endif
         else if(u8Strm == 4)
             pBdle = &pThis->StOutBdle;
@@ -3458 +3552 @@
     }
 
-    /* emulation of codec "wake up" (HDA spec 5.5.1 and 6.5)*/
+    /* Emulation of codec "wake up" (HDA spec 5.5.1 and 6.5). */
     HDA_REG(pThis, STATESTS) = 0x1;
 
-    LogFunc(("Reset finished\n"));
+    LogRel(("HDA: Reset\n"));
 }
 
@@ -3471 +3565 @@
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
 
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    PHDADRIVER pDrv;
+    while (!RTListIsEmpty(&pThis->lstDrv))
+    {
+        pDrv = RTListGetFirst(&pThis->lstDrv, HDADRIVER, Node);
+
+        RTListNodeRemove(&pDrv->Node);
+        RTMemFree(pDrv);
+    }
+
+    if (pThis->pMixer)
+    {
+        audioMixerDestroy(pThis->pMixer);
+        pThis->pMixer = NULL;
+    }
+#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
+
     if (pThis->pCodec)
     {
@@ -3479 +3590 @@
         pThis->pCodec = NULL;
     }
-
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    for (uint8_t lun = 0; lun < pThis->cLUNs; lun++)
-    {
-        if (pThis->paDrv[lun])
-        {
-            RTMemFree(pThis->paDrv[lun]);
-            pThis->paDrv[lun] = NULL;
-        }
-    }
-
-    if (pThis->pMixer)
-    {
-        audioMixerDestroy(pThis->pMixer);
-        pThis->pMixer = NULL;
-    }
-
-    pThis->cLUNs = 0;
-#else
-    if (pThis->pCodec)
-    {
-        int rc = hdaCodecDestruct(pThis->pCodec);
-        AssertRC(rc);
-
-        RTMemFree(pThis->pCodec);
-        pThis->pCodec = NULL;
-    }
-#endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
 
     RTMemFree(pThis->pu32CorbBuf);
@@ -3542 +3625 @@
      */
     char *pszDesc = NULL;
-    if (RTStrAPrintf(&pszDesc, "Audio driver port (HDA) for LUN #%u", uLUN) <= 0)
+    if (RTStrAPrintf(&pszDesc, "Audio driver port (HDA) for LUN#%u", uLUN) <= 0)
         AssertMsgReturn(pszDesc,
                         ("Not enough memory for HDA driver port description of LUN #%u\n", uLUN),
@@ -3556 +3639 @@
             pDrv->pConnector = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIAUDIOCONNECTOR);
             AssertMsg(pDrv->pConnector != NULL,
-                      ("Configuration error: LUN #%u has no host audio interface, rc=%Rrc\n",
+                      ("Configuration error: LUN#%u has no host audio interface, rc=%Rrc\n",
                       uLUN, rc));
             pDrv->pHDAState = pThis;
-            pDrv->uLUN = uLUN;
+            pDrv->uLUN      = uLUN;
 
             /*
@@ -3568 +3651 @@
                 pDrv->Flags |= PDMAUDIODRVFLAG_PRIMARY;
 
-            LogFunc(("LUN #%u: pCon=%p, drvFlags=0x%x\n",
-                     uLUN, pDrv->pConnector, pDrv->Flags));
-
-            pThis->paDrv[uLUN] = pDrv;
-            pThis->cLUNs++;
+            LogFunc(("LUN#%u: pCon=%p, drvFlags=0x%x\n", uLUN, pDrv->pConnector, pDrv->Flags));
+
+            /* Attach to driver list. */
+            RTListAppend(&pThis->lstDrv, &pDrv->Node);
         }
         else
             rc = VERR_NO_MEMORY;
     }
-    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+    else if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
+             || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
     {
         LogFunc(("No attached driver for LUN #%u\n", uLUN));
@@ -3587 +3670 @@
     RTStrFree(pszDesc);
 
-    LogFunc(("iLUN=%u, fFlags=0x%x, rc=%Rrc\n", uLUN, fFlags, rc));
+    LogFunc(("uLUN=%u, fFlags=0x%x, rc=%Rrc\n", uLUN, fFlags, rc));
     return rc;
 }
@@ -3741 +3824 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    /* We support 32 LUNs max. This should be enough for now. */
-    for (uint8_t lun = 0; lun < 32 ; lun++)
-    {
-        LogFunc(("Trying to attach driver for LUN #%RU32 ...\n", lun));
-        rc = hdaAttach(pDevIns, lun, PDM_TACH_FLAGS_NOT_HOT_PLUG);
+    RTListInit(&pThis->lstDrv);
+
+    unsigned uLUN = 0;
+    do
+    {
+        LogFunc(("Trying to attach driver for LUN #%RU32 ...\n", uLUN));
+        rc = hdaAttach(pDevIns, uLUN++, PDM_TACH_FLAGS_NOT_HOT_PLUG);
         if (RT_FAILURE(rc))
         {
             if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
                 rc = VINF_SUCCESS;
+
             break;
         }
-    }
+
+    } while (RT_SUCCESS(rc));
 
     if (RT_SUCCESS(rc))
@@ -3780 +3867 @@
     }
 
-    LogFunc(("cLUNs=%RU8, rc=%Rrc\n", pThis->cLUNs, rc));
+    LogFunc(("cLUNs=%RU8, rc=%Rrc\n", uLUN, rc));
 #else
     /*
@@ -3825 +3912 @@
         PCIDevSetSubSystemId(      &pThis->PciDev, pThis->pCodec->u16DeviceId); /* 2e ro. */
 
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
         pThis->pCodec->pfnTransfer = hdaTransfer;
-        pThis->pCodec->pfnReset = hdaCodecReset;
+#endif
+        pThis->pCodec->pfnReset    = hdaCodecReset;
     }
 
@@ -3903 +3992 @@
     #endif
 
-            /* The final entry is a full dword, no gaps! Allows shortcuts. */
+            /* The final entry is a full DWORD, no gaps! Allows shortcuts. */
             AssertReleaseMsg(pNextReg || ((pReg->offset + pReg->size) & 3) == 0,
                              ("[%#x] = {%#x LB %#x}\n", i, pReg->offset, pReg->size));
         }
     }
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    if (RT_SUCCESS(rc))
+    {
+        /* Start the emulation timer. */
+        rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, hdaTimer, pThis,
+                                    TMTIMER_FLAGS_NO_CRIT_SECT, "DevIchHda", &pThis->pTimer);
+        AssertRCReturn(rc, rc);
+
+        if (RT_SUCCESS(rc))
+        {
+            /** @todo Investigate why sounds is getting corrupted if the "ticks" value is too
+             *        low, e.g. "PDMDevHlpTMTimeVirtGetFreq / 200". */
+            pThis->uTicks = PDMDevHlpTMTimeVirtGetFreq(pDevIns) / 500; /** @todo Make this configurable! */
+            if (pThis->uTicks < 100)
+                pThis->uTicks = 100;
+            LogFunc(("Timer ticks=%RU64\n", pThis->uTicks));
+
+            /* Fire off timer. */
+            TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
+        }
+    }
+
+# ifdef VBOX_WITH_STATISTICS
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Register statistics.
+         */
+        PDMDevHlpSTAMRegister(pDevIns, &pThis->StatTimer,            STAMTYPE_PROFILE, "/Devices/HDA/Timer",             STAMUNIT_TICKS_PER_CALL, "Profiling hdaTimer.");
+        PDMDevHlpSTAMRegister(pDevIns, &pThis->StatBytesRead,        STAMTYPE_COUNTER, "/Devices/HDA/BytesRead"   ,      STAMUNIT_BYTES,          "Bytes read from HDA emulation.");
+        PDMDevHlpSTAMRegister(pDevIns, &pThis->StatBytesWritten,     STAMTYPE_COUNTER, "/Devices/HDA/BytesWritten",      STAMUNIT_BYTES,          "Bytes written to HDA emulation.");
+    }
+# endif
+
+#endif
 
     LogFlowFuncLeaveRC(rc);

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

@@ -884 +884 @@
     }
 
-    LogFlowFunc(("pvBuf=%p, cbBuf=%zu, cWritten=%RU32 (%zu bytes), cMixed=%RU32, rc=%Rrc\n",
+    LogFlowFunc(("Written pvBuf=%p, cbBuf=%zu, cWritten=%RU32 (%RU32 bytes), cMixed=%RU32, rc=%Rrc\n",
                  pvBuf, cbBuf, cWritten, AUDIOMIXBUF_S2B(&pGstStrmOut->MixBuf, cWritten),
                  cMixed, rc));
@@ -984 +984 @@
 }
 
-static int drvAudioPlayOut(PDRVAUDIO pThis)
-{
+static DECLCALLBACK(int) drvAudioQueryData(PPDMIAUDIOCONNECTOR pInterface,
+                                           uint32_t *pcbAvailIn, uint32_t *pcbFreeOut,
+                                           uint32_t *pcSamplesLive)
+{
+    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
+
+    PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);
+
+    int rc = VINF_SUCCESS;
+    uint32_t cSamplesLive = 0;
+
     /*
-     * Process all enabled host output streams.
+     * Playback.
      */
+    uint32_t cbFreeOut = UINT32_MAX;
+
     PPDMAUDIOHSTSTRMOUT pHstStrmOut = NULL;
     while ((pHstStrmOut = drvAudioHstFindAnyEnabledOut(pThis, pHstStrmOut)))
     {
         uint32_t cStreamsLive;
-        uint32_t cSamplesLive = drvAudioHstOutSamplesLive(pHstStrmOut, &cStreamsLive);
+        cSamplesLive = drvAudioHstOutSamplesLive(pHstStrmOut, &cStreamsLive);
         if (!cStreamsLive)
             cSamplesLive = 0;
@@ -1009 +1020 @@
                 pHstStrmOut->fEnabled        = false;
                 pHstStrmOut->fPendingDisable = false;
+
+                LogFunc(("%p: Disabling stream\n", pHstStrmOut));
             }
             else
-                LogFlowFunc(("Backend vetoed closing output stream, rc=%Rrc\n", rc2));
+                LogFunc(("%p: Backend vetoed against closing output stream, rc=%Rrc\n",
+                         pHstStrmOut, rc2));
 
             continue;
         }
+
+        LogFlowFunc(("%p: Has %RU32 live samples\n", pHstStrmOut, cSamplesLive));
 
         /*
@@ -1026 +1042 @@
         if (!cSamplesLive)
         {
-            LogFlowFunc(("No live samples available\n"));
-
-            uint32_t cbFree;
+            uint32_t cbFree2 = UINT32_MAX;
             RTListForEach(&pHstStrmOut->lstGstStrmOut, pGstStrmOut, PDMAUDIOGSTSTRMOUT, Node)
             {
@@ -1035 +1049 @@
                     /* Tell the sound device emulation how many samples are free
                      * so that it can start writing PCM data to us. */
-                    cbFree = AUDIOMIXBUF_S2B_RATIO(&pGstStrmOut->MixBuf,
-                                                   audioMixBufFree(&pGstStrmOut->MixBuf));
-                    if (cbFree)
-                    {
-                        LogFlowFunc(("cbFree=%RU32\n", cbFree));
-                        pGstStrmOut->Callback.fn(pGstStrmOut->Callback.pvContext, cbFree);
-                    }
+                    cbFree2 = RT_MIN(cbFree2, AUDIOMIXBUF_S2B_RATIO(&pGstStrmOut->MixBuf,
+                                                                    audioMixBufFree(&pGstStrmOut->MixBuf)));
                 }
             }
+
+            cbFreeOut = RT_MIN(cbFreeOut, cbFree2);
+            continue;
+        }
+    }
+
+    /*
+     * Recording.
+     */
+    uint32_t cbAvailIn = 0;
+
+    PPDMAUDIOHSTSTRMIN pHstStrmIn = NULL;
+    while ((pHstStrmIn = drvAudioFindNextEnabledHstIn(pThis, pHstStrmIn)))
+    {
+        /* Call the host backend to capture the audio input data. */
+        uint32_t cSamplesCaptured;
+        int rc2 = pThis->pHostDrvAudio->pfnCaptureIn(pThis->pHostDrvAudio, pHstStrmIn,
+                                                     &cSamplesCaptured);
+        if (RT_FAILURE(rc2))
+            continue;
+
+        PPDMAUDIOGSTSTRMIN pGstStrmIn = pHstStrmIn->pGstStrmIn;
+        AssertPtrBreak(pGstStrmIn);
+
+        if (pGstStrmIn->State.fActive)
+        {
+            cbAvailIn = RT_MAX(cbAvailIn, AUDIOMIXBUF_S2B(&pHstStrmIn->MixBuf,
+                                                          audioMixBufMixed(&pHstStrmIn->MixBuf)));
+        }
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        if (cbFreeOut == UINT32_MAX)
+            cbFreeOut = 0;
+
+        if (pcbAvailIn)
+            *pcbAvailIn = cbAvailIn;
+
+        if (pcbFreeOut)
+            *pcbFreeOut = cbFreeOut;
+
+        if (pcSamplesLive)
+            *pcSamplesLive = cSamplesLive;
+    }
+
+    return rc;
+}
+
+static DECLCALLBACK(int) drvAudioPlayOut(PPDMIAUDIOCONNECTOR pInterface)
+{
+    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
+    /* pcbFree is optional. */
+
+    PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);
+
+    int rc = VINF_SUCCESS;
+
+    /*
+     * Process all enabled host output streams.
+     */
+    PPDMAUDIOHSTSTRMOUT pHstStrmOut = NULL;
+    while ((pHstStrmOut = drvAudioHstFindAnyEnabledOut(pThis, pHstStrmOut)))
+    {
+        uint32_t cStreamsLive;
+        uint32_t cSamplesLive = drvAudioHstOutSamplesLive(pHstStrmOut, &cStreamsLive);
+        if (!cStreamsLive)
+            cSamplesLive = 0;
+
+        /* Has this stream marked as disabled but there still were guest streams relying
+         * on it? Check if this stream now can be closed and do so, if possible. */
+        if (   pHstStrmOut->fPendingDisable
+            && !cStreamsLive)
+        {
+            /* Stop playing the current (pending) stream. */
+            int rc2 = pThis->pHostDrvAudio->pfnControlOut(pThis->pHostDrvAudio, pHstStrmOut,
+                                                          PDMAUDIOSTREAMCMD_DISABLE);
+            if (RT_SUCCESS(rc2))
+            {
+                pHstStrmOut->fEnabled        = false;
+                pHstStrmOut->fPendingDisable = false;
+
+                LogFunc(("\t%p: Disabling stream\n", pHstStrmOut));
+            }
+            else
+                LogFunc(("\t%p: Backend vetoed against closing output stream, rc=%Rrc\n",
+                         rc2, pHstStrmOut));
 
             continue;
@@ -1051 +1147 @@
         int rc2 = pThis->pHostDrvAudio->pfnPlayOut(pThis->pHostDrvAudio, pHstStrmOut,
                                                    &cSamplesPlayed);
-        LogFlowFunc(("%p: cStreamsLive=%RU32, cSamplesLive=%RU32, cSamplesPlayed=%RU32, rc=%Rrc\n",
+        LogFlowFunc(("\t%p: cStreamsLive=%RU32, cSamplesLive=%RU32, cSamplesPlayed=%RU32, rc=%Rrc\n",
                      pHstStrmOut, cStreamsLive, cSamplesLive, cSamplesPlayed, rc2));
 
         bool fNeedsCleanup = false;
-        uint32_t cbFree;
+
+        PPDMAUDIOGSTSTRMOUT pGstStrmOut;
         RTListForEach(&pHstStrmOut->lstGstStrmOut, pGstStrmOut, PDMAUDIOGSTSTRMOUT, Node)
         {
@@ -1068 +1165 @@
                                  && !pGstStrmOut->Callback.fn;
             }
-
-            if (pGstStrmOut->State.fActive)
-            {
-                /* Tell the device emulation how many samples are free so that it can start
-                 * writing PCM data to us. */
-                cbFree = AUDIOMIXBUF_S2B_RATIO(&pGstStrmOut->MixBuf,
-                                               audioMixBufFree(&pGstStrmOut->MixBuf));
-                if (cbFree)
-                {
-                    LogFlowFunc(("cbFree=%RU32\n", cbFree));
-                    pGstStrmOut->Callback.fn(pGstStrmOut->Callback.pvContext, cbFree);
-                }
-            }
         }
 
@@ -1087 +1171 @@
             RTListForEach(&pHstStrmOut->lstGstStrmOut, pGstStrmOut, PDMAUDIOGSTSTRMOUT, Node)
             {
-                if (   !pGstStrmOut->State.fActive
-                    && !pGstStrmOut->Callback.fn)
-                {
+                if (!pGstStrmOut->State.fActive)
                     drvAudioDestroyGstOut(pThis, pGstStrmOut);
-                }
             }
         }
     }
 
-    return VINF_SUCCESS;
-}
-
-/**
- * Notifies the device emulation of newly available (captured) host input data.
- *
- * @return  IPRT status code.
- * @param   pThis               Pointer to audio driver instance.
- */
-static int drvAudioSendIn(PDRVAUDIO pThis)
-{
-    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
-
-    PPDMAUDIOHSTSTRMIN pHstStrmIn = NULL;
-    while ((pHstStrmIn = drvAudioFindNextEnabledHstIn(pThis, pHstStrmIn)))
-    {
-        /* Call the host backend to capture the audio input data. */
-        uint32_t cSamplesCaptured;
-        int rc2 = pThis->pHostDrvAudio->pfnCaptureIn(pThis->pHostDrvAudio, pHstStrmIn,
-                                                     &cSamplesCaptured);
-        if (RT_FAILURE(rc2))
-            continue;
-
-        PPDMAUDIOGSTSTRMIN pGstStrmIn = pHstStrmIn->pGstStrmIn;
-        AssertPtrBreak(pGstStrmIn);
-
-        if (pGstStrmIn->State.fActive)
-        {
-            uint32_t cbData = AUDIOMIXBUF_S2B(&pHstStrmIn->MixBuf,
-                                              audioMixBufMixed(&pHstStrmIn->MixBuf));
-            if (cbData)
-            {
-                /*
-                 * Tell the device emulation how many audio input bytes are available
-                 * to process (and to write to the device itself).
-                 */
-                LogFlowFunc(("cbData=%RU32\n", cbData));
-                pGstStrmIn->Callback.fn(pGstStrmIn->Callback.pvContext, cbData);
-            }
-        }
-    }
-
-    return VINF_SUCCESS;
-}
-
-static void drvAudioTimer(PDRVAUDIO pThis)
-{
-    drvAudioPlayOut(pThis);
-    drvAudioSendIn(pThis);
-
-    AssertPtr(pThis->pTimer);
-    int rc = TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
-    AssertRC(rc);
+    return rc;
 }
 
@@ -1255 +1284 @@
 }
 
-static DECLCALLBACK(void) drvAudioTimerHelper(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser)
-{
-    PDRVAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIO);
-    drvAudioTimer(pThis);
-}
-
 static struct audio_option audio_options[] =
 {
@@ -1316 +1339 @@
     RTListInit(&pThis->lstHstStrmOut);
 
-    int rc;
+    int rc = VINF_SUCCESS;
 
     /* Get the configuration data from the selected backend (if available). */
@@ -1322 +1345 @@
     if (RT_LIKELY(pThis->pHostDrvAudio->pfnGetConf))
         rc = pThis->pHostDrvAudio->pfnGetConf(pThis->pHostDrvAudio, &pThis->BackendCfg);
-    else
-        AssertMsgFailed(("No audio backend configuration given\n"));
 
     if (RT_SUCCESS(rc))
     {
-        LogFlowFunc(("Creating timer ...\n"));
-        rc = PDMDrvHlpTMTimerCreate(pDrvIns, TMCLOCK_VIRTUAL, drvAudioTimerHelper,
-                                    pThis, TMTIMER_FLAGS_DEFAULT_CRIT_SECT,
-                                    "Audio emulation timer", &pThis->pTimer);
-        if (RT_FAILURE(rc))
-        {
-            LogFlowFunc(("Failed to create timer, rc=%Rrc\n", rc));
-            return rc;
-        }
-    }
-
-    rc = drvAudioProcessOptions(pCfgHandle, "AUDIO", audio_options);
-    /** @todo Check for invalid options? */
-
-    pThis->cFreeOutputStreams = conf.fixed_out.cStreams;
-    pThis->cFreeInputStreams = conf.fixed_in.cStreams;
-
-    if (!pThis->cFreeOutputStreams)
-    {
-        LogFlowFunc(("Bogus number of playback voices %d, setting to 1\n",
-                     pThis->cFreeOutputStreams));
-        pThis->cFreeOutputStreams = 1;
-    }
-
-    if (!pThis->cFreeInputStreams)
-    {
-        LogFlowFunc(("Bogus number of capture voices %d, setting to 1\n",
-                     pThis->cFreeInputStreams));
-        pThis->cFreeInputStreams = 1;
-    }
-
-    /* Initialization of audio buffers. Create ring buffer of 768 each. */
-    rc = RTCircBufCreate(&pThis->pAudioWriteBuf, 768 * 1024);
-    if (RT_SUCCESS(rc))
-    {
-        /* Allocating space for about 500 msec of audio data 48KHz, 128 bit sample
-         * (guest format - PDMHOSTSTEREOSAMPLE) and dual channel.
-         */
-        rc = RTCircBufCreate(&pThis->pAudioReadBuf, 768 * 1024);
+        rc = drvAudioProcessOptions(pCfgHandle, "AUDIO", audio_options);
+        /** @todo Check for invalid options? */
+
+        pThis->cFreeOutputStreams = conf.fixed_out.cStreams;
+        pThis->cFreeInputStreams  = conf.fixed_in.cStreams;
+
+        if (!pThis->cFreeOutputStreams)
+            pThis->cFreeOutputStreams = 1;
+
+        if (!pThis->cFreeInputStreams)
+            pThis->cFreeInputStreams = 1;
     }
 
@@ -1374 +1367 @@
         rc = drvAudioHostInit(pCfgHandle, pThis);
 
-    if (RT_SUCCESS(rc))
-    {
-        if (conf.period.hz <= 0)
-            pThis->uTicks = 100; /* Don't stress CPU too much. */
-        else
-            pThis->uTicks = PDMDrvHlpTMGetVirtualFreq(pDrvIns) / conf.period.hz;
-    }
-
-    if (   RT_SUCCESS(rc)
-        && pThis->pTimer)
-    {
-        LogFlowFunc(("Timer ticks=%RU64, hz=%d\n", pThis->uTicks, conf.period.hz));
-
-        /* Fire off timer. */
-        TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTicks);
-    }
-    else
-    {
-        if (pThis->pTimer)
-            TMR3TimerDestroy(pThis->pTimer);
-    }
-
     LogFlowFuncLeaveRC(rc);
     return rc;
@@ -1404 +1375 @@
     PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);
     NOREF(pThis);
+
+    LogRel(("Audio: Using NULL driver; no sound will be audible\n"));
 
     /* Nothing to do here yet. */
@@ -1862 +1835 @@
     pDrvIns->IBase.pfnQueryInterface                 = drvAudioQueryInterface;
     /* IAudio. */
+    pThis->IAudioConnector.pfnQueryData              = drvAudioQueryData;
     pThis->IAudioConnector.pfnRead                   = drvAudioRead;
     pThis->IAudioConnector.pfnWrite                  = drvAudioWrite;
@@ -1875 +1849 @@
     pThis->IAudioConnector.pfnOpenIn                 = drvAudioOpenIn;
     pThis->IAudioConnector.pfnOpenOut                = drvAudioOpenOut;
+    pThis->IAudioConnector.pfnPlayOut                = drvAudioPlayOut;
     pThis->IAudioConnector.pfnIsActiveIn             = drvAudioIsActiveIn;
     pThis->IAudioConnector.pfnIsActiveOut            = drvAudioIsActiveOut;