Changeset 88958 in vbox for trunk

Timestamp:

May 10, 2021 6:57:45 AM (4 years ago)

Author:

vboxsync

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

144294

Message:

Audio/VaKit: Use the full (but mocked) version of PDMDRVREG. bugref:10008

Location:

trunk/src/VBox

Files:

• Devices/Audio/DrvHostAudioAlsa.cpp (modified) (2 diffs)
• Devices/Audio/DrvHostAudioOss.cpp (modified) (2 diffs)
• Devices/Audio/DrvHostAudioPulseAudio.cpp (modified) (2 diffs)
• Devices/Audio/VBoxDDVKAT.h (modified) (2 diffs)
• ValidationKit/utils/audio/vkat.cpp (modified) (2 diffs)

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

@@ -1454 +1454 @@
 
 
-#ifndef VBOX_AUDIO_VKAT
 /**
  * ALSA audio driver registration record.
@@ -1505 +1504 @@
     PDM_DRVREG_VERSION
 };
-#else /* VBOX_AUDIO_VKAT */
-const PDMDRVREG g_DrvVKATAlsa =
-{
-    /* szName */
-    "ALSAAudio",
-    /* cbInstance */
-    sizeof(DRVHOSTALSAAUDIO),
-    drvHostAlsaAudioConstruct,
-    /* pfnDestruct */
-    NULL
-};
-#endif /* VBOX_AUDIO_VKAT */
-
+

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

@@ -885 +885 @@
 }
 
-#ifndef VBOX_AUDIO_VKAT
+
 /**
  * Char driver registration record.
@@ -936 +936 @@
     PDM_DRVREG_VERSION
 };
-#else
-const PDMDRVREG g_DrvVKATOss =
-{
-    /* szName */
-    "OSSAudio",
-    /* cbInstance */
-    sizeof(DRVHOSTOSSAUDIO),
-    drvHostOSSAudioConstruct,
-    /* pfnDestruct */
-    NULL
-};
-#endif
-
+

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

@@ -2015 +2015 @@
 }
 
-#ifndef VBOX_AUDIO_VKAT
+
 /**
  * Pulse audio driver registration record.
@@ -2066 +2066 @@
     PDM_DRVREG_VERSION
 };
-#else /* VBOX_AUDIO_VKAT */
-const PDMDRVREG g_DrvVKATPulseAudio =
-{
-    /* szName */
-    "PulseAudio",
-    /* cbInstance */
-    sizeof(DRVHOSTPULSEAUDIO),
-    drvHostAudioPaConstruct,
-    /* pfnDestruct */
-    drvHostAudioPaDestruct
-};
-#endif /* VBOX_AUDIO_VKAT */
+

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

@@ -70 +70 @@
 typedef FNPDMDRVDESTRUCT *PFNPDMDRVDESTRUCT;
 
+#define PDM_DRVREG_VERSION                 0x0
+#define PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT 0x0
+#define PDM_DRVREG_CLASS_AUDIO             0x0
+
 typedef struct PDMDRVREG
 {
+    /** Structure version. PDM_DRVREG_VERSION defines the current version. */
+    uint32_t            u32Version;
     /** Driver name. */
     char                szName[32];
+    /** Name of the raw-mode context module (no path).
+     * Only evalutated if PDM_DRVREG_FLAGS_RC is set. */
+    char                szRCMod[32];
+    /** Name of the ring-0 module (no path).
+     * Only evalutated if PDM_DRVREG_FLAGS_R0 is set. */
+    char                szR0Mod[32];
+    /** The description of the driver. The UTF-8 string pointed to shall, like this structure,
+     * remain unchanged from registration till VM destruction. */
+    const char         *pszDescription;
+
+    /** Flags, combination of the PDM_DRVREG_FLAGS_* \#defines. */
+    uint32_t            fFlags;
+    /** Driver class(es), combination of the PDM_DRVREG_CLASS_* \#defines. */
+    uint32_t            fClass;
+    /** Maximum number of instances (per VM). */
+    uint32_t            cMaxInstances;
     /** Size of the instance data. */
     uint32_t            cbInstance;
+
     /** Construct instance - required. */
     PFNPDMDRVCONSTRUCT  pfnConstruct;
     /** Destruct instance - optional. */
     PFNPDMDRVDESTRUCT   pfnDestruct;
+    /** Relocation command - optional. */
+    PFNRT               pfnRelocate;
+    /** I/O control - optional. */
+    PFNRT               pfnIOCtl;
+    /** Power on notification - optional. */
+    PFNRT               pfnPowerOn;
+    /** Reset notification - optional. */
+    PFNRT               pfnReset;
+    /** Suspend notification  - optional. */
+    PFNRT               pfnSuspend;
+    /** Resume notification - optional. */
+    PFNRT               pfnResume;
+    /** Attach command - optional. */
+    PFNRT               pfnAttach;
+    /** Detach notification - optional. */
+    PFNRT               pfnDetach;
+    /** Power off notification - optional. */
+    PFNRT               pfnPowerOff;
+    /** @todo */
+    PFNRT               pfnSoftReset;
+    /** Initialization safty marker. */
+    uint32_t            u32VersionEnd;
 } PDMDRVREG;
 /** Pointer to a PDM Driver Structure. */
@@ -96 +141 @@
 }
 
-extern const PDMDRVREG g_DrvVKATPulseAudio;
-extern const PDMDRVREG g_DrvVKATAlsa;
-extern const PDMDRVREG g_DrvVKATOss;
+#ifdef VBOX_WITH_AUDIO_PULSE
+extern const PDMDRVREG g_DrvHostPulseAudio;
+#endif
+#ifdef VBOX_WITH_AUDIO_ALSA
+extern const PDMDRVREG g_DrvHostALSAAudio;
+#endif
+#ifdef VBOX_WITH_AUDIO_OSS
+extern const PDMDRVREG g_DrvHostOSSAudio;
+#endif
 
 #endif /* !VBOX_INCLUDED_SRC_Audio_VBoxDDVKAT_h */

trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp

@@ -493 +493 @@
                 if (   !RTStrICmp(ValueUnion.psz, "pulseaudio")
                     || !RTStrICmp(ValueUnion.psz, "pa"))
-                    pDrvReg = &g_DrvVKATPulseAudio;
+                    pDrvReg = &g_DrvHostPulseAudio;
 #endif
 #ifdef VBOX_WITH_AUDIO_ALSA
                 if (   !RTStrICmp(ValueUnion.psz, "alsa"))
-                    pDrvReg = &g_DrvVKATAlsa;
+                    pDrvReg = &g_DrvHostALSAAudio;
 #endif
 #ifdef VBOX_WITH_AUDIO_OSS
                 if (   !RTStrICmp(ValueUnion.psz, "oss"))
-                    pDrvReg = &g_DrvVKATOss;
+                    pDrvReg = &g_DrvHostOSSAudio;
 #endif
                 /** @todo Add more backends here. */
@@ -587 +587 @@
     /* If no backend is specified, go with the ALSA one by default. */
     if (pDrvReg == NULL)
-        pDrvReg = &g_DrvVKATAlsa;
+        pDrvReg = &g_DrvHostALSAAudio;
 
     PPDMIHOSTAUDIO pDrvAudio;