Changeset 89341 in vbox

Timestamp:

May 28, 2021 10:19:50 AM (4 years ago)

Author:

vboxsync

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

144690

Message:

Audio: Removed PDMAUDIODRVFLAGS (no longer needed when we're mixing inputs). bugref:9890

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (2 diffs)
• src/VBox/Devices/Audio/DevHda.cpp (modified) (3 diffs)
• src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (3 diffs)
• src/VBox/Devices/Audio/DevSB16.cpp (modified) (4 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -253 +253 @@
 #endif
 
-/** PDM audio driver instance flags. */
-typedef uint32_t PDMAUDIODRVFLAGS;
-
-/** No flags set. */
-#define PDMAUDIODRVFLAGS_NONE       0
-/** Marks a primary audio driver which is critical
- *  when running the VM. */
-#define PDMAUDIODRVFLAGS_PRIMARY    RT_BIT(0)
-
 /**
  * Audio format in signed or unsigned variants.
@@ -698 +689 @@
     /** Whether the endianness is swapped or not. */
     bool        fSwapEndian : 1;
-    /** Raw mixer frames, only applicable for signed 64-bit samples. */
+    /** Raw mixer frames, only applicable for signed 64-bit samples.
+     * The raw mixer samples are really just signed 32-bit samples stored as 64-bit
+     * integers without any change in the value.
+     *
+     * @todo Get rid of this, only VRDE needs it an it should use the common
+     *       mixer code rather than cooking its own stuff. */
     bool        fRaw : 1;
     /** Sample frequency in Hertz (Hz). */

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

@@ -222 +222 @@
     /** Pointer to the ring-3 HDA device state. */
     R3PTRTYPE(PHDASTATER3)             pHDAStateR3;
-    /** Driver flags. */
-    PDMAUDIODRVFLAGS                   fFlags;
-    uint8_t                            u32Padding0[2];
     /** LUN to which this driver has been assigned. */
     uint8_t                            uLUN;
     /** Whether this driver is in an attached state or not. */
     bool                               fAttached;
+    uint8_t                            u32Padding0[6];
     /** Pointer to attached driver base interface. */
     R3PTRTYPE(PPDMIBASE)               pDrvBase;
@@ -4380 +4378 @@
                 pDrv->pHDAStateR3       = pThisCC;
                 pDrv->uLUN              = uLUN;
-                AssertMsg(pDrv->pConnector != NULL, ("Configuration error: LUN#%u has no host audio interface, rc=%Rrc\n", uLUN, rc));
-
-                /*
-                 * 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. */
@@ -4422 +4410 @@
                 }
 
-                LogFunc(("LUN#%u: VINF_SUCCESS\n", uLUN));
+                LogFunc(("LUN#%u: returns VINF_SUCCESS (pCon=%p)\n", uLUN, pDrv->pConnector));
                 return VINF_SUCCESS;
             }

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

@@ -457 +457 @@
     /** Node for storing this driver in our device driver list of AC97STATE. */
     RTLISTNODER3                    Node;
-    /** Driver flags. */
-    PDMAUDIODRVFLAGS                fFlags;
     /** LUN # to which this driver has been assigned. */
     uint8_t                         uLUN;
     /** Whether this driver is in an attached state or not. */
     bool                            fAttached;
-    uint8_t                         abPadding[2];
+    uint8_t                         abPadding[6];
     /** Pointer to the description string passed to PDMDevHlpDriverAttach(). */
     R3PTRTYPE(char *)               pszDesc;
@@ -3537 +3535 @@
             pDrv->pConnector = PDMIBASE_QUERY_INTERFACE(pDrvBase, PDMIAUDIOCONNECTOR);
             AssertPtr(pDrv->pConnector);
-            if (pDrv->pConnector)
+            if (RT_VALID_PTR(pDrv->pConnector))
             {
                 pDrv->pDrvBase   = pDrvBase;
                 pDrv->uLUN       = iLun;
                 pDrv->pszDesc    = pszDesc;
-
-                /*
-                 * For now we always set the driver at LUN 0 as our primary
-                 * host backend. This might change in the future.
-                 */
-                if (iLun == 0)
-                    pDrv->fFlags |= PDMAUDIODRVFLAGS_PRIMARY;
-
-                LogFunc(("LUN#%u: pCon=%p, drvFlags=0x%x\n", iLun, pDrv->pConnector, pDrv->fFlags));
 
                 /* Attach to driver list if not attached yet. */
@@ -3561 +3550 @@
                 if (ppDrv)
                     *ppDrv = pDrv;
-                LogFunc(("LUN#%u: VINF_SUCCESS\n", iLun));
+                LogFunc(("LUN#%u: returns VINF_SUCCESS (pCon=%p)\n", iLun, pDrv->pConnector));
                 return VINF_SUCCESS;
             }

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

@@ -147 +147 @@
     /** Stream for output. */
     SB16DRIVERSTREAM                Out;
-    /** Driver flags. */
-    PDMAUDIODRVFLAGS                fFlags;
     /** LUN # to which this driver has been assigned. */
     uint8_t                         uLUN;
@@ -154 +152 @@
     bool                            fAttached;
     /** The LUN description. */
-    char                            szDesc[2+48];
+    char                            szDesc[48 - 2];
 } SB16DRIVER;
 /** Pointer to the per-LUN data. */
@@ -2694 +2692 @@
             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)
@@ -2712 +2701 @@
             if (ppDrv)
                 *ppDrv = pDrv;
-            LogFunc(("LUN#%u: VINF_SUCCESS\n", uLUN));
+            LogFunc(("LUN#%u: returns VINF_SUCCESS (pCon=%p)\n", uLUN, pDrv->pConnector));
             return VINF_SUCCESS;
         }