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

Timestamp:

Nov 26, 2019 11:52:11 PM (5 years ago)

Author:

vboxsync

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

135045

Message:

DevSB16: cleanups. bugref:9218

File:

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

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

@@ -83 +83 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
+/** Pointer to the SB16 state. */
+typedef struct SB16STATE *PSB16STATE;
+
 /**
  * Structure defining a (host backend) driver stream.
@@ -96 +99 @@
 
 /**
- * Struct for maintaining a host backend driver.
- */
-typedef struct SB16STATE *PSB16STATE;
+ * Struct for tracking a host backend driver, i.e. our per-LUN data.
+ */
 typedef struct SB16DRIVER
 {
     /** Node for storing this driver in our device driver list of SB16STATE. */
-    RTLISTNODER3                       Node;
+    RTLISTNODER3                    Node;
     /** Pointer to SB16 controller (state). */
-    R3PTRTYPE(PSB16STATE)              pSB16State;
+    R3PTRTYPE(PSB16STATE)           pSB16State;
+    /** Pointer to attached driver base interface. */
+    R3PTRTYPE(PPDMIBASE)            pDrvBase;
+    /** Audio connector interface to the underlying host backend. */
+    R3PTRTYPE(PPDMIAUDIOCONNECTOR)  pConnector;
+    /** Stream for output. */
+    SB16DRIVERSTREAM                Out;
     /** Driver flags. */
-    PDMAUDIODRVFLAGS                   fFlags;
+    PDMAUDIODRVFLAGS                fFlags;
     /** LUN # to which this driver has been assigned. */
-    uint8_t                            uLUN;
+    uint8_t                         uLUN;
     /** Whether this driver is in an attached state or not. */
-    bool                               fAttached;
-    uint8_t                            Padding[2];
-    /** Pointer to attached driver base interface. */
-    R3PTRTYPE(PPDMIBASE)               pDrvBase;
-    /** Audio connector interface to the underlying host backend. */
-    R3PTRTYPE(PPDMIAUDIOCONNECTOR)     pConnector;
-    /** Stream for output. */
-    SB16DRIVERSTREAM                   Out;
-} SB16DRIVER, *PSB16DRIVER;
+    bool                            fAttached;
+    /** The LUN description. */
+    char                            szDesc[2+48];
+} SB16DRIVER;
+/** Pointer to the per-LUN data. */
+typedef SB16DRIVER *PSB16DRIVER;
 
 /**
@@ -127 +132 @@
     /** The stream's current configuration. */
     PDMAUDIOSTREAMCFG                  Cfg;
-} SB16STREAM, *PSB16STREAM;
-
+} SB16STREAM;
+/** Pointer to a SB16 stream */
+typedef SB16STREAM *PSB16STREAM;
+
+/**
+ * The SB16 state.
+ */
 typedef struct SB16STATE
 {
@@ -164 +174 @@
     int use_hdma;
     int highspeed;
-    int can_write; /** @todo Value never gets 0? */
+    int can_write; /** @todo Value never gets set to 0! */
 
     int v2x6;
@@ -171 +181 @@
     uint8_t csp_value;
     uint8_t csp_mode;
+    uint8_t csp_index;
     uint8_t csp_regs[256];
-    uint8_t csp_index;
     uint8_t csp_reg83[4];
     int csp_reg83r;
@@ -190 +200 @@
 
     RTLISTANCHOR                   lstDrv;
-    /** Number of active (running) SDn streams. */
-    uint8_t                        cStreamsActive;
-    /** The timer for pumping data thru the attached LUN drivers. */
-    TMTIMERHANDLE                  hTimerIO;
-    /** Flag indicating whether the timer is active or not. */
-    bool                           fTimerActive;
-    uint8_t                        u8Padding1[7];
-    /** The timer interval for pumping data thru the LUN drivers in timer ticks. */
-    uint64_t                       cTicksTimerIOInterval;
-    /** Timestamp of the last timer callback (sb16TimerIO).
-     * Used to calculate the time actually elapsed between two timer callbacks. */
-    uint64_t                       tsTimerIO;
     /** IRQ timer   */
     TMTIMERHANDLE                  hTimerIRQ;
@@ -209 +207 @@
     SB16STREAM                     Out;
 
+    /** The timer for pumping data thru the attached LUN drivers. */
+    TMTIMERHANDLE                  hTimerIO;
+    /** The timer interval for pumping data thru the LUN drivers in timer ticks. */
+    uint64_t                       cTicksTimerIOInterval;
+    /** Timestamp of the last timer callback (sb16TimerIO).
+     * Used to calculate the time actually elapsed between two timer callbacks. */
+    uint64_t                       tsTimerIO;
+    /** Number of active (running) SDn streams. */
+    uint8_t                        cStreamsActive;
+    /** Flag indicating whether the timer is active or not. */
+    bool volatile                  fTimerActive;
+    uint8_t                        u8Padding1[5];
+
     /* mixer state */
     uint8_t mixer_nreg;
     uint8_t mixer_regs[256];
-} SB16STATE, *PSB16STATE;
+} SB16STATE;
 
 
@@ -387 +398 @@
 
     if (pThis->block_size & pThis->align)
-        LogFlowFunc(("warning: misaligned block size %d, alignment %d\n",
-                     pThis->block_size, pThis->align + 1));
+        LogFlowFunc(("warning: misaligned block size %d, alignment %d\n", pThis->block_size, pThis->align + 1));
 
     LogFlowFunc(("freq %d, stereo %d, sign %d, bits %d, dma %d, auto %d, fifo %d, high %d\n",
@@ -480 +490 @@
         return pThis->in2_data[--pThis->in_index];
     }
-    else {
-        LogFlowFunc(("buffer underflow\n"));
-        return 0;
-    }
+    LogFlowFunc(("buffer underflow\n"));
+    return 0;
 }
 
@@ -739 +747 @@
 
 warn:
-    LogFlowFunc(("warning: command %#x,%d is not truly understood yet\n",
-                 cmd, pThis->needed_bytes));
+    LogFlowFunc(("warning: command %#x,%d is not truly understood yet\n", cmd, pThis->needed_bytes));
     goto exit;
 }
@@ -761 +768 @@
 {
     int d0, d1, d2;
-    LogFlowFunc(("complete command %#x, in_index %d, needed_bytes %d\n",
-            pThis->cmd, pThis->in_index, pThis->needed_bytes));
+    LogFlowFunc(("complete command %#x, in_index %d, needed_bytes %d\n", pThis->cmd, pThis->in_index, pThis->needed_bytes));
 
     if (pThis->cmd > 0xaf && pThis->cmd < 0xd0)
@@ -792 +798 @@
             pThis->csp_param = dsp_get_data (pThis);
             pThis->csp_value = dsp_get_data (pThis);
-            LogFlowFunc(("CSP command 0x05: param=%#x value=%#x\n",
-                    pThis->csp_param,
-                    pThis->csp_value));
+            LogFlowFunc(("CSP command 0x05: param=%#x value=%#x\n", pThis->csp_param, pThis->csp_value));
             break;
 
@@ -818 +822 @@
             if (d0 == 0x83)
             {
-                LogFlowFunc(("0x83[%d] -> %#x\n",
-                        pThis->csp_reg83w,
-                        pThis->csp_reg83[pThis->csp_reg83w % 4]));
-                dsp_out_data (pThis, pThis->csp_reg83[pThis->csp_reg83w % 4]);
+                LogFlowFunc(("0x83[%d] -> %#x\n", pThis->csp_reg83w, pThis->csp_reg83[pThis->csp_reg83w % 4]));
+                dsp_out_data(pThis, pThis->csp_reg83[pThis->csp_reg83w % 4]);
                 pThis->csp_reg83w += 1;
             }
@@ -997 +999 @@
     RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
     {
-        if (!pDrv->Out.pStream)
-            continue;
-
-        int rc2 = pDrv->pConnector->pfnStreamSetVolume(pDrv->pConnector, pDrv->Out.pStream, &VolCombined);
-        AssertRC(rc2);
+        PPDMAUDIOSTREAM pStream = pDrv->Out.pStream;
+        if (pStream)
+        {
+            int rc2 = pDrv->pConnector->pfnStreamSetVolume(pDrv->pConnector, pStream, &VolCombined);
+            AssertRC(rc2);
+        }
     }
 }
@@ -1027 +1030 @@
     pCfg->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfg->Props.cBytes, pCfg->Props.cChannels);
 
-    AssertCompile(sizeof(pCfg->szName) > sizeof("Output"));
-    strcpy(pCfg->szName, "Output");
+    AssertCompile(sizeof(pCfg->szName) >= sizeof("Output"));
+    memcpy(pCfg->szName, "Output", sizeof("Output"));
 
     sb16CloseOut(pThis);
@@ -1282 +1285 @@
 }
 
-uint32_t popcount(uint32_t u) /** @todo r=andy WTF? */
+#ifndef VBOX
+static uint32_t popcount(uint32_t u)
 {
     u = ((u&0x55555555) + ((u>>1)&0x55555555));
@@ -1291 +1295 @@
     return u;
 }
-
-uint32_t lsbindex(uint32_t u)
-{
+#endif
+
+static uint32_t lsbindex(uint32_t u)
+{
+#ifdef VBOX
+    return u ? ASMBitFirstSetU32(u) - 1 : 32;
+#else
     return popcount((u & -(int32_t)u) - 1);
+#endif
 }
 
@@ -1505 +1514 @@
 static int sb16WriteAudio(PSB16STATE pThis, int nchan, uint32_t dma_pos, uint32_t dma_len, int len)
 {
-    uint8_t  tmpbuf[_4K]; /** @todo Have a buffer on the heap. */
+    uint8_t  abBuf[_4K]; /** @todo Have a buffer on the heap. */
     uint32_t cbToWrite = len;
     uint32_t cbWrittenTotal = 0;
@@ -1512 +1521 @@
     {
         uint32_t cbToRead = RT_MIN(dma_len - dma_pos, cbToWrite);
-        if (cbToRead > sizeof(tmpbuf))
-            cbToRead = sizeof(tmpbuf);
+        if (cbToRead > sizeof(abBuf))
+            cbToRead = sizeof(abBuf);
 
         uint32_t cbRead = 0;
-        int rc2 = PDMDevHlpDMAReadMemory(pThis->pDevInsR3, nchan, tmpbuf, dma_pos, cbToRead, &cbRead);
+        int rc2 = PDMDevHlpDMAReadMemory(pThis->pDevInsR3, nchan, abBuf, dma_pos, cbToRead, &cbRead);
         AssertMsgRC(rc2, (" from DMA failed: %Rrc\n", rc2));
 
@@ -1525 +1534 @@
             RTFileOpen(&fh, VBOX_AUDIO_DEBUG_DUMP_PCM_DATA_PATH "sb16WriteAudio.pcm",
                        RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
-            RTFileWrite(fh, tmpbuf, cbRead, NULL);
+            RTFileWrite(fh, abBuf, cbRead, NULL);
             RTFileClose(fh);
         }
@@ -1539 +1548 @@
         RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
         {
-            if (!pDrv->Out.pStream)
-                continue;
-
-            if (!DrvAudioHlpStreamStatusCanWrite(pDrv->pConnector->pfnStreamGetStatus(pDrv->pConnector,  pDrv->Out.pStream)))
-                continue;
-
-            uint32_t cbWrittenToStream = 0;
-            rc2 = pDrv->pConnector->pfnStreamWrite(pDrv->pConnector, pDrv->Out.pStream, tmpbuf, cbRead, &cbWrittenToStream);
-
-            LogFlowFunc(("\tLUN#%RU8: rc=%Rrc, cbWrittenToStream=%RU32\n", pDrv->uLUN, rc2, cbWrittenToStream));
+            if (   pDrv->Out.pStream
+                && DrvAudioHlpStreamStatusCanWrite(pDrv->pConnector->pfnStreamGetStatus(pDrv->pConnector, pDrv->Out.pStream)))
+            {
+                uint32_t cbWrittenToStream = 0;
+                rc2 = pDrv->pConnector->pfnStreamWrite(pDrv->pConnector, pDrv->Out.pStream, abBuf, cbRead, &cbWrittenToStream);
+
+                LogFlowFunc(("\tLUN#%RU8: rc=%Rrc, cbWrittenToStream=%RU32\n", pDrv->uLUN, rc2, cbWrittenToStream));
+            }
         }
 
@@ -1555 +1562 @@
         LogFlowFunc(("\tcbToRead=%RU32, cbToWrite=%RU32, cbWritten=%RU32, cbLeft=%RU32\n",
                      cbToRead, cbToWrite, cbWritten, cbToWrite - cbWrittenTotal));
+
+        if (!cbWritten)
+            break;
 
         Assert(cbToWrite >= cbWritten);
@@ -1560 +1570 @@
         dma_pos         = (dma_pos + cbWritten) % dma_len;
         cbWrittenTotal += cbWritten;
-
-        if (!cbWritten)
-            break;
     }
 
@@ -1626 +1633 @@
 
     Log3Func(("pos %d/%d free %5d till %5d copy %5d written %5d block_size %5d\n",
-               dma_pos, dma_len, free, pThis->left_till_irq, copy, written,
-               pThis->block_size));
+               dma_pos, dma_len, free, pThis->left_till_irq, copy, written, pThis->block_size));
 
     while (pThis->left_till_irq <= 0)
@@ -1685 +1691 @@
     RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
     {
-        PPDMAUDIOSTREAM pStream = pDrv->Out.pStream;
-        if (!pStream)
-            continue;
-
-        PPDMIAUDIOCONNECTOR pConn = pDrv->pConnector;
-        if (!pConn)
-            continue;
-
-        int rc2 = pConn->pfnStreamIterate(pConn, pStream);
-        if (RT_SUCCESS(rc2))
+        PPDMAUDIOSTREAM     const pStream = pDrv->Out.pStream;
+        PPDMIAUDIOCONNECTOR const pConn   = pDrv->pConnector;
+        if (pStream && pConn)
         {
-            rc2 = pConn->pfnStreamPlay(pConn, pStream, NULL /* cPlayed */);
-            if (RT_FAILURE(rc2))
+            int rc2 = pConn->pfnStreamIterate(pConn, pStream);
+            if (RT_SUCCESS(rc2))
             {
-                LogFlowFunc(("%s: Failed playing stream, rc=%Rrc\n", pStream->szName, rc2));
-                continue;
+                rc2 = pConn->pfnStreamPlay(pConn, pStream, NULL /* cPlayed */);
+                if (RT_FAILURE(rc2))
+                {
+                    LogFlowFunc(("%s: Failed playing stream, rc=%Rrc\n", pStream->szName, rc2));
+                    continue;
+                }
+
+                /* Only do the next DMA transfer if we're able to write the remaining data block. */
+                fDoTransfer = pConn->pfnStreamGetWritable(pConn, pStream) > (unsigned)pThis->left_till_irq;
             }
 
-            /* Only do the next DMA transfer if we're able to write the remaining data block. */
-            fDoTransfer = pConn->pfnStreamGetWritable(pConn, pStream) > (unsigned)pThis->left_till_irq;
+            PDMAUDIOSTREAMSTS strmSts = pConn->pfnStreamGetStatus(pConn, pStream);
+            fIsPlaying |= (   (strmSts & PDMAUDIOSTREAMSTS_FLAG_ENABLED)
+                           || (strmSts & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE));
         }
-
-        PDMAUDIOSTREAMSTS strmSts = pConn->pfnStreamGetStatus(pConn, pStream);
-        fIsPlaying |= (   (strmSts & PDMAUDIOSTREAMSTS_FLAG_ENABLED)
-                       || (strmSts & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE));
     }
 
     bool fTimerActive = ASMAtomicReadBool(&pThis->fTimerActive);
-    bool fKickTimer   = fTimerActive || fIsPlaying;
-
+    bool fArmTimer    = fTimerActive || fIsPlaying;
     LogFlowFunc(("fTimerActive=%RTbool, fIsPlaying=%RTbool\n", fTimerActive, fIsPlaying));
 
@@ -1720 +1722 @@
     {
         /* Schedule the next transfer. */
-        PDMDevHlpDMASchedule(pThis->pDevInsR3);
-
-        /* Kick the timer at least one more time. */
-        fKickTimer = true;
+        PDMDevHlpDMASchedule(pDevIns);
+
+        /* Arm the timer at least one more time. */
+        fArmTimer = true;
     }
 
@@ -1731 +1733 @@
     /** @todo Implement recording. */
 
-    if (fKickTimer)
-    {
-        /* Kick the timer again. */
+    if (fArmTimer)
+    {
+        /* Arm the timer again. */
         uint64_t cTicks = pThis->cTicksTimerIOInterval;
         /** @todo adjust cTicks down by now much cbOutMin represents. */
@@ -1914 +1916 @@
     {
         int32_t irq;
-        pHlp->pfnSSMGetS32 (pSSM, &irq);
+        pHlp->pfnSSMGetS32(pSSM, &irq);
         int32_t dma;
-        pHlp->pfnSSMGetS32 (pSSM, &dma);
+        pHlp->pfnSSMGetS32(pSSM, &dma);
         int32_t hdma;
-        pHlp->pfnSSMGetS32 (pSSM, &hdma);
+        pHlp->pfnSSMGetS32(pSSM, &hdma);
         int32_t port;
-        pHlp->pfnSSMGetS32 (pSSM, &port);
+        pHlp->pfnSSMGetS32(pSSM, &port);
         int32_t ver;
-        int rc = pHlp->pfnSSMGetS32 (pSSM, &ver);
+        int rc = pHlp->pfnSSMGetS32(pSSM, &ver);
         AssertRCReturn (rc, rc);
 
@@ -1932 +1934 @@
         {
             return pHlp->pfnSSMSetCfgError(pSSM, RT_SRC_POS,
-                                    N_("config changed: irq=%x/%x dma=%x/%x hdma=%x/%x port=%x/%x ver=%x/%x (saved/config)"),
-                                    irq,  pThis->irqCfg,
-                                    dma,  pThis->dmaCfg,
-                                    hdma, pThis->hdmaCfg,
-                                    port, pThis->portCfg,
-                                    ver,  pThis->verCfg);
+                                           N_("config changed: irq=%x/%x dma=%x/%x hdma=%x/%x port=%x/%x ver=%x/%x (saved/config)"),
+                                           irq,  pThis->irqCfg,
+                                           dma,  pThis->dmaCfg,
+                                           hdma, pThis->hdmaCfg,
+                                           port, pThis->portCfg,
+                                           ver,  pThis->verCfg);
         }
     }
@@ -1951 +1953 @@
  *
  * @returns IPRT status code.
- * @param   pThis               SB16 state.
  * @param   pCfg                Stream configuration to use.
  * @param   pDrv                Driver stream to create PDM stream for.
  */
-static int sb16CreateDrvStream(PSB16STATE pThis, PPDMAUDIOSTREAMCFG pCfg, PSB16DRIVER pDrv)
-{
-    RT_NOREF(pThis);
-
+static int sb16CreateDrvStream(PPDMAUDIOSTREAMCFG pCfg, PSB16DRIVER pDrv)
+{
     AssertReturn(pCfg->enmDir == PDMAUDIODIR_OUT, VERR_INVALID_PARAMETER);
     Assert(DrvAudioHlpStreamCfgIsValid(pCfg));
@@ -1993 +1992 @@
 static void sb16DestroyDrvStream(PSB16STATE pThis, PSB16DRIVER pDrv)
 {
-    AssertPtrReturnVoid(pThis);
-    AssertPtrReturnVoid(pDrv);
+    AssertPtr(pThis);
+    AssertPtr(pDrv);
 
     if (pDrv->Out.pStream)
@@ -2019 +2018 @@
 static int sb16CheckAndReOpenOut(PPDMDEVINS pDevIns, PSB16STATE pThis)
 {
-    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+    AssertPtr(pThis);
 
     int rc = VINF_SUCCESS;
@@ -2058 +2057 @@
 static int sb16OpenOut(PPDMDEVINS pDevIns, PSB16STATE pThis, PPDMAUDIOSTREAMCFG pCfg)
 {
-    AssertPtrReturn(pThis, VERR_INVALID_POINTER);  /// @todo r=bird: Too paranoiad here.
-    AssertPtrReturn(pCfg,  VERR_INVALID_POINTER);  /// @todo r=bird: This is certifiable, only caller sends us a stack object...
     LogFlowFuncEnter();
+    AssertPtr(pThis);
+    AssertPtr(pCfg);
 
     if (!DrvAudioHlpStreamCfgIsValid(pCfg))
@@ -2066 +2065 @@
 
     int rc = DrvAudioHlpStreamCfgCopy(&pThis->Out.Cfg, pCfg);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    /* Set scheduling hint (if available). */
-    if (pThis->cTicksTimerIOInterval)
-        pThis->Out.Cfg.Device.uSchedulingHintMs = 1000 /* ms */
-                                                / (  PDMDevHlpTimerGetFreq(pDevIns, pThis->hTimerIO)
-                                                   / RT_MIN(pThis->cTicksTimerIOInterval, 1));
-
-    PSB16DRIVER pDrv;
-    RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
-    {
-        int rc2 = sb16CreateDrvStream(pThis, &pThis->Out.Cfg, pDrv);
-        if (RT_FAILURE(rc2))
-            LogFunc(("Attaching stream failed with %Rrc\n", rc2));
-
-        /* Do not pass failure to rc here, as there might be drivers which aren't
-         * configured / ready yet. */
-    }
-
-    sb16UpdateVolume(pThis);
+    if (RT_SUCCESS(rc))
+    {
+        /* Set scheduling hint (if available). */
+        if (pThis->cTicksTimerIOInterval)
+            pThis->Out.Cfg.Device.uSchedulingHintMs = 1000 /* ms */
+                                                    / (  PDMDevHlpTimerGetFreq(pDevIns, pThis->hTimerIO)
+                                                       / RT_MIN(pThis->cTicksTimerIOInterval, 1));
+
+        PSB16DRIVER pDrv;
+        RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
+        {
+            int rc2 = sb16CreateDrvStream(&pThis->Out.Cfg, pDrv);
+            if (RT_FAILURE(rc2))
+                LogFunc(("Attaching stream failed with %Rrc\n", rc2));
+
+            /* Do not pass failure to rc here, as there might be drivers which aren't
+             * configured / ready yet. */
+        }
+
+        sb16UpdateVolume(pThis);
+    }
 
     LogFlowFuncLeaveRC(rc);
@@ -2094 +2093 @@
 static void sb16CloseOut(PSB16STATE pThis)
 {
-    AssertPtrReturnVoid(pThis); /// @todo r=bird: too much panaoia here!
     LogFlowFuncEnter();
+    AssertPtr(pThis);
 
     PSB16DRIVER pDrv;
@@ -2140 +2139 @@
      * Attach driver.
      */
-    char *pszDesc;
-    if (RTStrAPrintf(&pszDesc, "Audio driver port (SB16) for LUN #%u", uLUN) <= 0)
-        AssertLogRelFailedReturn(VERR_NO_MEMORY);
+    PSB16DRIVER pDrv = (PSB16DRIVER)RTMemAllocZ(sizeof(SB16DRIVER));
+    AssertReturn(pDrv, VERR_NO_MEMORY);
+    RTStrPrintf(pDrv->szDesc, sizeof(pDrv->szDesc), "Audio driver port (SB16) for LUN #%u", uLUN);
 
     PPDMIBASE pDrvBase;
-    int rc = PDMDevHlpDriverAttach(pThis->pDevInsR3, uLUN,
-                                   &pThis->IBase, &pDrvBase, pszDesc);
+    int rc = PDMDevHlpDriverAttach(pThis->pDevInsR3, uLUN, &pThis->IBase, &pDrvBase, pDrv->szDesc);
     if (RT_SUCCESS(rc))
     {
-        PSB16DRIVER pDrv = (PSB16DRIVER)RTMemAllocZ(sizeof(SB16DRIVER));
-        if (pDrv)
+        pDrv->pDrvBase   = pDrvBase;
+        pDrv->pConnector = PDMIBASE_QUERY_INTERFACE(pDrvBase, PDMIAUDIOCONNECTOR);
+        AssertMsg(pDrv->pConnector != NULL, ("Configuration error: LUN #%u has no host audio interface, rc=%Rrc\n", uLUN, rc));
+        pDrv->pSB16State = pThis;
+        pDrv->uLUN       = uLUN;
+
+        /*
+         * For now we always set the driver at LUN 0 as our primary
+         * host backend. This might change in the future.
+         */
+        if (pDrv->uLUN == 0)
+            pDrv->fFlags |= PDMAUDIODRVFLAGS_PRIMARY;
+
+        LogFunc(("LUN#%u: pCon=%p, drvFlags=0x%x\n", uLUN, pDrv->pConnector, pDrv->fFlags));
+
+        /* Attach to driver list if not attached yet. */
+        if (!pDrv->fAttached)
         {
-            pDrv->pDrvBase   = pDrvBase;
-            pDrv->pConnector = PDMIBASE_QUERY_INTERFACE(pDrvBase, PDMIAUDIOCONNECTOR);
-            AssertMsg(pDrv->pConnector != NULL, ("Configuration error: LUN #%u has no host audio interface, rc=%Rrc\n", uLUN, rc));
-            pDrv->pSB16State = pThis;
-            pDrv->uLUN       = uLUN;
-
-            /*
-             * For now we always set the driver at LUN 0 as our primary
-             * host backend. This might change in the future.
-             */
-            if (pDrv->uLUN == 0)
-                pDrv->fFlags |= PDMAUDIODRVFLAGS_PRIMARY;
-
-            LogFunc(("LUN#%u: pCon=%p, drvFlags=0x%x\n", uLUN, pDrv->pConnector, pDrv->fFlags));
-
-            /* Attach to driver list if not attached yet. */
-            if (!pDrv->fAttached)
-            {
-                RTListAppend(&pThis->lstDrv, &pDrv->Node);
-                pDrv->fAttached = true;
-            }
-
-            if (ppDrv)
-                *ppDrv = pDrv;
+            RTListAppend(&pThis->lstDrv, &pDrv->Node);
+            pDrv->fAttached = true;
         }
-        else
-            rc = VERR_NO_MEMORY;
-    }
-    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
-        LogFunc(("No attached driver for LUN #%u\n", uLUN));
-
-    if (RT_FAILURE(rc))
-    {
-        /* Only free this string on failure;
-         * must remain valid for the live of the driver instance. */
-        RTStrFree(pszDesc);
+
+        if (ppDrv)
+            *ppDrv = pDrv;
+    }
+    else
+    {
+        if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+            LogFunc(("No attached driver for LUN #%u\n", uLUN));
+        RTMemFree(pDrv);
     }
 
@@ -2229 +2218 @@
     int rc2 = sb16AttachInternal(pThis, iLUN, fFlags, &pDrv);
     if (RT_SUCCESS(rc2))
-        rc2 = sb16CreateDrvStream(pThis, &pThis->Out.Cfg, pDrv);
+        rc2 = sb16CreateDrvStream(&pThis->Out.Cfg, pDrv);
 
     return VINF_SUCCESS;
@@ -2321 +2310 @@
     PSB16DRIVER pDrv;
     RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
+    {
         sb16DestroyDrvStream(pThis, pDrv);
+    }
 }