Changeset 89479 in vbox for trunk/src/VBox/Devices/Audio/DrvHostAudioOss.cpp

Timestamp:

Jun 3, 2021 12:35:28 PM (4 years ago)

Author:

vboxsync

Message:

DrvHostAudioOss: Don't refuse to pre-buffer input streams. Cleaned up function prefix and struct names. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioOss.cpp (modified) (34 diffs)

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

@@ -53 +53 @@
 *********************************************************************************************************************************/
 /**
- * OSS host audio driver instance data.
- * @implements PDMIAUDIOCONNECTOR
- */
-typedef struct DRVHOSTOSSAUDIO
-{
-    /** Pointer to the driver instance structure. */
-    PPDMDRVINS          pDrvIns;
-    /** Pointer to host audio interface. */
-    PDMIHOSTAUDIO       IHostAudio;
-    /** Error count for not flooding the release log.
-     *  UINT32_MAX for unlimited logging. */
-    uint32_t            cLogErrors;
-} DRVHOSTOSSAUDIO;
-/** Pointer to the instance data for an OSS host audio driver. */
-typedef DRVHOSTOSSAUDIO *PDRVHOSTOSSAUDIO;
-
-/**
  * OSS audio stream configuration.
  */
-typedef struct OSSAUDIOSTREAMCFG
+typedef struct DRVHSTAUDOSSSTREAMCFG
 {
     PDMAUDIOPCMPROPS    Props;
@@ -79 +62 @@
     uint16_t            cbFragmentLog2;
     uint32_t            cbFragment;
-} OSSAUDIOSTREAMCFG;
+} DRVHSTAUDOSSSTREAMCFG;
 /** Pointer to an OSS audio stream configuration. */
-typedef OSSAUDIOSTREAMCFG *POSSAUDIOSTREAMCFG;
+typedef DRVHSTAUDOSSSTREAMCFG *PDRVHSTAUDOSSSTREAMCFG;
 
 /**
  * OSS audio stream.
  */
-typedef struct OSSAUDIOSTREAM
+typedef struct DRVHSTAUDOSSSTREAM
 {
     /** Common part. */
@@ -101 +84 @@
     PDMAUDIOSTREAMCFG       Cfg;
     /** The acquired OSS configuration. */
-    OSSAUDIOSTREAMCFG       OssCfg;
+    DRVHSTAUDOSSSTREAMCFG   OssCfg;
     /** Handle to the thread draining output streams. */
     RTTHREAD                hThreadDrain;
-} OSSAUDIOSTREAM;
+} DRVHSTAUDOSSSTREAM;
 /** Pointer to an OSS audio stream. */
-typedef OSSAUDIOSTREAM *POSSAUDIOSTREAM;
+typedef DRVHSTAUDOSSSTREAM *PDRVHSTAUDOSSSTREAM;
+
+/**
+ * OSS host audio driver instance data.
+ * @implements PDMIAUDIOCONNECTOR
+ */
+typedef struct DRVHSTAUDOSS
+{
+    /** Pointer to the driver instance structure. */
+    PPDMDRVINS          pDrvIns;
+    /** Pointer to host audio interface. */
+    PDMIHOSTAUDIO       IHostAudio;
+    /** Error count for not flooding the release log.
+     *  UINT32_MAX for unlimited logging. */
+    uint32_t            cLogErrors;
+} DRVHSTAUDOSS;
+/** Pointer to the instance data for an OSS host audio driver. */
+typedef DRVHSTAUDOSS *PDRVHSTAUDOSS;
 
 
@@ -119 +119 @@
 
 
-static int ossOSSToAudioProps(PPDMAUDIOPCMPROPS pProps, int fmt, int cChannels, int uHz)
+static int drvHstAudOssToPdmAudioProps(PPDMAUDIOPCMPROPS pProps, int fmt, int cChannels, int uHz)
 {
     switch (fmt)
@@ -155 +155 @@
 
 
-static int ossStreamClose(int *phFile)
+static int drvHstAudOssStreamClose(int *phFile)
 {
     if (!phFile || !*phFile || *phFile == -1)
@@ -179 +179 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
  */
-static DECLCALLBACK(int) drvHostOssAudioHA_GetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
+static DECLCALLBACK(int) drvHstAudOssHA_GetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
 {
     RT_NOREF(pInterface);
@@ -187 +187 @@
      */
     RTStrCopy(pBackendCfg->szName, sizeof(pBackendCfg->szName), "OSS");
-    pBackendCfg->cbStream       = sizeof(OSSAUDIOSTREAM);
+    pBackendCfg->cbStream       = sizeof(DRVHSTAUDOSSSTREAM);
     pBackendCfg->fFlags         = 0;
     pBackendCfg->cMaxStreamsIn  = 0;
@@ -242 +242 @@
 
 
-
-
 /**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
  */
-static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvHostOssAudioHA_GetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
+static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvHstAudOssHA_GetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
 {
     AssertPtrReturn(pInterface, PDMAUDIOBACKENDSTS_UNKNOWN);
@@ -256 +254 @@
 
 
-static int ossStreamConfigure(int hFile, bool fInput, POSSAUDIOSTREAMCFG pOSSReq, POSSAUDIOSTREAMCFG pOSSAcq)
+static int drvHstAudOssStreamConfigure(int hFile, bool fInput, PDRVHSTAUDOSSSTREAMCFG pOSSReq, PDRVHSTAUDOSSSTREAMCFG pOSSAcq)
 {
     /*
@@ -334 +332 @@
                           RTErrConvertFromErrno(errno));
 
-    int rc = ossOSSToAudioProps(&pOSSAcq->Props, iFormat, cChannels, iFrequenc);
+    int rc = drvHstAudOssToPdmAudioProps(&pOSSAcq->Props, iFormat, cChannels, iFrequenc);
     if (RT_SUCCESS(rc))
     {
@@ -353 +351 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvHostOssAudioHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                        PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+static DECLCALLBACK(int) drvHstAudOssHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                     PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     AssertPtr(pInterface); RT_NOREF(pInterface);
-    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
+    PDRVHSTAUDOSSSTREAM pStreamOSS = (PDRVHSTAUDOSSSTREAM)pStream;
     AssertPtrReturn(pStreamOSS, VERR_INVALID_POINTER);
     AssertPtrReturn(pCfgReq, VERR_INVALID_POINTER);
@@ -383 +381 @@
          *       channel mappings and whatnot.
          */
-        OSSAUDIOSTREAMCFG ReqOssCfg;
+        DRVHSTAUDOSSSTREAMCFG ReqOssCfg;
         RT_ZERO(ReqOssCfg);
 
@@ -399 +397 @@
         AssertLogRelStmt(cbBuffer < ((uint32_t)0x7ffe << ReqOssCfg.cbFragmentLog2), ReqOssCfg.cFragments = 0x7ffe);
 
-        rc = ossStreamConfigure(pStreamOSS->hFile, pCfgReq->enmDir == PDMAUDIODIR_IN, &ReqOssCfg, &pStreamOSS->OssCfg);
+        rc = drvHstAudOssStreamConfigure(pStreamOSS->hFile, pCfgReq->enmDir == PDMAUDIODIR_IN, &ReqOssCfg, &pStreamOSS->OssCfg);
         if (RT_SUCCESS(rc))
         {
@@ -412 +410 @@
 
             memcpy(&pCfgAcq->Props, &pStreamOSS->OssCfg.Props, sizeof(PDMAUDIOPCMPROPS));
-            pCfgAcq->Backend.cFramesPeriod     = PDMAudioPropsBytesToFrames(&pCfgAcq->Props, pStreamOSS->OssCfg.cbFragment);
-            pCfgAcq->Backend.cFramesBufferSize = pCfgAcq->Backend.cFramesPeriod * pStreamOSS->OssCfg.cFragments;
-            if (pCfgReq->enmDir == PDMAUDIODIR_OUT)
-                pCfgAcq->Backend.cFramesPreBuffering = (uint64_t)pCfgReq->Backend.cFramesPreBuffering
-                                                     * pCfgAcq->Backend.cFramesBufferSize
-                                                     / RT_MAX(pCfgReq->Backend.cFramesBufferSize, 1);
-            else
-                pCfgAcq->Backend.cFramesPreBuffering = 0; /** @todo is this sane? */
+            pCfgAcq->Backend.cFramesPeriod       = PDMAudioPropsBytesToFrames(&pCfgAcq->Props, pStreamOSS->OssCfg.cbFragment);
+            pCfgAcq->Backend.cFramesBufferSize   = pCfgAcq->Backend.cFramesPeriod * pStreamOSS->OssCfg.cFragments;
+            pCfgAcq->Backend.cFramesPreBuffering = (uint64_t)pCfgReq->Backend.cFramesPreBuffering
+                                                 * pCfgAcq->Backend.cFramesBufferSize
+                                                 / RT_MAX(pCfgReq->Backend.cFramesBufferSize, 1);
 
             /*
@@ -427 +422 @@
             return VINF_SUCCESS;
         }
-        ossStreamClose(&pStreamOSS->hFile);
+        drvHstAudOssStreamClose(&pStreamOSS->hFile);
     }
     else
@@ -442 +437 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostOssAudioHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                         bool fImmediate)
+static DECLCALLBACK(int) drvHstAudOssHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, bool fImmediate)
 {
     RT_NOREF(pInterface, fImmediate);
-    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
+    PDRVHSTAUDOSSSTREAM pStreamOSS = (PDRVHSTAUDOSSSTREAM)pStream;
     AssertPtrReturn(pStreamOSS, VERR_INVALID_POINTER);
 
-    ossStreamClose(&pStreamOSS->hFile);
+    drvHstAudOssStreamClose(&pStreamOSS->hFile);
 
     if (pStreamOSS->hThreadDrain != NIL_RTTHREAD)
@@ -465 +459 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamEnable}
  */
-static DECLCALLBACK(int) drvHostOssAudioHA_StreamEnable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHstAudOssHA_StreamEnable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
-    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
+    PDRVHSTAUDOSSSTREAM pStreamOSS = (PDRVHSTAUDOSSSTREAM)pStream;
 
     /** @todo this might be a little optimisitic...   */
@@ -496 +490 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamDisable}
  */
-static DECLCALLBACK(int) drvHostOssAudioHA_StreamDisable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHstAudOssHA_StreamDisable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
-    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
+    PDRVHSTAUDOSSSTREAM pStreamOSS = (PDRVHSTAUDOSSSTREAM)pStream;
 
     int rc;
@@ -548 +542 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamPause}
  */
-static DECLCALLBACK(int) drvHostOssAudioHA_StreamPause(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    return drvHostOssAudioHA_StreamDisable(pInterface, pStream);
+static DECLCALLBACK(int) drvHstAudOssHA_StreamPause(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    return drvHstAudOssHA_StreamDisable(pInterface, pStream);
 }
 
@@ -557 +551 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamResume}
  */
-static DECLCALLBACK(int) drvHostOssAudioHA_StreamResume(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    return drvHostOssAudioHA_StreamEnable(pInterface, pStream);
+static DECLCALLBACK(int) drvHstAudOssHA_StreamResume(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    return drvHstAudOssHA_StreamEnable(pInterface, pStream);
 }
 
@@ -567 +561 @@
  * Thread for calling SNDCTL_DSP_SYNC (blocking) on an output stream.}
  */
-static DECLCALLBACK(int) drvHostOssAudioDrainThread(RTTHREAD ThreadSelf, void *pvUser)
+static DECLCALLBACK(int) drvHstAudOssDrainThread(RTTHREAD ThreadSelf, void *pvUser)
 {
     RT_NOREF(ThreadSelf);
-    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pvUser;
+    PDRVHSTAUDOSSSTREAM pStreamOSS = (PDRVHSTAUDOSSSTREAM)pvUser;
     int rc;
 
@@ -609 +603 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamDisable}
  */
-static DECLCALLBACK(int) drvHostOssAudioHA_StreamDrain(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    PDRVHOSTOSSAUDIO pThis      = RT_FROM_MEMBER(pInterface, DRVHOSTOSSAUDIO, IHostAudio);
-    POSSAUDIOSTREAM  pStreamOSS = (POSSAUDIOSTREAM)pStream;
+static DECLCALLBACK(int) drvHstAudOssHA_StreamDrain(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    PDRVHSTAUDOSS       pThis      = RT_FROM_MEMBER(pInterface, DRVHSTAUDOSS, IHostAudio);
+    PDRVHSTAUDOSSSTREAM pStreamOSS = (PDRVHSTAUDOSSSTREAM)pStream;
     AssertReturn(pStreamOSS->Cfg.enmDir == PDMAUDIODIR_OUT, VERR_WRONG_ORDER);
 
@@ -638 +632 @@
     }
 
-    int rc = RTThreadCreateF(&pStreamOSS->hThreadDrain, drvHostOssAudioDrainThread, pStreamOSS, 0,
+    int rc = RTThreadCreateF(&pStreamOSS->hThreadDrain, drvHstAudOssDrainThread, pStreamOSS, 0,
                              RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "ossdrai%u", pThis->pDrvIns->iInstance);
     LogFunc(("Started drain thread: %Rrc\n", rc));
@@ -647 +641 @@
 
 
-
 /**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
  */
-static DECLCALLBACK(int) drvHostOssAudioHA_StreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                         PDMAUDIOSTREAMCMD enmStreamCmd)
+static DECLCALLBACK(int) drvHstAudOssHA_StreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                      PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     /** @todo r=bird: I'd like to get rid of this pfnStreamControl method,
@@ -661 +654 @@
     {
         case PDMAUDIOSTREAMCMD_ENABLE:
-            return drvHostOssAudioHA_StreamEnable(pInterface, pStream);
+            return drvHstAudOssHA_StreamEnable(pInterface, pStream);
         case PDMAUDIOSTREAMCMD_DISABLE:
-            return drvHostOssAudioHA_StreamDisable(pInterface, pStream);
+            return drvHstAudOssHA_StreamDisable(pInterface, pStream);
         case PDMAUDIOSTREAMCMD_PAUSE:
-            return drvHostOssAudioHA_StreamPause(pInterface, pStream);
+            return drvHstAudOssHA_StreamPause(pInterface, pStream);
         case PDMAUDIOSTREAMCMD_RESUME:
-            return drvHostOssAudioHA_StreamResume(pInterface, pStream);
+            return drvHstAudOssHA_StreamResume(pInterface, pStream);
         case PDMAUDIOSTREAMCMD_DRAIN:
-            return drvHostOssAudioHA_StreamDrain(pInterface, pStream);
+            return drvHstAudOssHA_StreamDrain(pInterface, pStream);
             /** @todo the drain call for OSS is SNDCTL_DSP_SYNC, however in the non-ALSA
              *        implementation of OSS it is probably blocking.  Also, it comes with
@@ -686 +679 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetReadable}
  */
-static DECLCALLBACK(uint32_t) drvHostOssAudioHA_StreamGetReadable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(uint32_t) drvHstAudOssHA_StreamGetReadable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface, pStream);
@@ -697 +690 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetWritable}
  */
-static DECLCALLBACK(uint32_t) drvHostOssAudioHA_StreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(uint32_t) drvHstAudOssHA_StreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
-    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
+    PDRVHSTAUDOSSSTREAM pStreamOSS = (PDRVHSTAUDOSSSTREAM)pStream;
     AssertPtr(pStreamOSS);
 
@@ -733 +726 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetState}
  */
-static DECLCALLBACK(PDMHOSTAUDIOSTREAMSTATE) drvHostOssAudioHA_StreamGetState(PPDMIHOSTAUDIO pInterface,
-                                                                              PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(PDMHOSTAUDIOSTREAMSTATE) drvHstAudOssHA_StreamGetState(PPDMIHOSTAUDIO pInterface,
+                                                                           PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
-    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
+    PDRVHSTAUDOSSSTREAM pStreamOSS = (PDRVHSTAUDOSSSTREAM)pStream;
     AssertPtrReturn(pStreamOSS, PDMHOSTAUDIOSTREAMSTATE_INVALID);
     if (!pStreamOSS->fDraining)
@@ -748 +741 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
  */
-static DECLCALLBACK(int) drvHostOssAudioHA_StreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                      const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+static DECLCALLBACK(int) drvHstAudOssHA_StreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                   const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
     RT_NOREF(pInterface);
-    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
+    PDRVHSTAUDOSSSTREAM pStreamOSS = (PDRVHSTAUDOSSSTREAM)pStream;
     AssertPtrReturn(pStreamOSS, VERR_INVALID_POINTER);
 
@@ -833 +826 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-static DECLCALLBACK(int) drvHostOssAudioHA_StreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                         void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+static DECLCALLBACK(int) drvHstAudOssHA_StreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                      void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     RT_NOREF(pInterface);
-    POSSAUDIOSTREAM pStreamOSS = (POSSAUDIOSTREAM)pStream;
+    PDRVHSTAUDOSSSTREAM pStreamOSS = (PDRVHSTAUDOSSSTREAM)pStream;
     AssertPtrReturn(pStreamOSS, VERR_INVALID_POINTER);
     Log3Func(("@%#RX64 cbBuf=%#x %s\n", pStreamOSS->offInternal, cbBuf, pStreamOSS->Cfg.szName));
@@ -876 +869 @@
 
 
-
 /**
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *) drvHostOSSAudioQueryInterface(PPDMIBASE pInterface, const char *pszIID)
-{
-    PPDMDRVINS       pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
-    PDRVHOSTOSSAUDIO pThis   = PDMINS_2_DATA(pDrvIns, PDRVHOSTOSSAUDIO);
+static DECLCALLBACK(void *) drvHstAudOssQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+{
+    PPDMDRVINS    pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
+    PDRVHSTAUDOSS pThis   = PDMINS_2_DATA(pDrvIns, PDRVHSTAUDOSS);
 
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
@@ -891 +883 @@
 }
 
-/**
- * Constructs an OSS audio driver instance.
- *
- * @copydoc FNPDMDRVCONSTRUCT
- */
-static DECLCALLBACK(int) drvHostOSSAudioConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
+
+/**
+ * @interface_method_impl{PDMDRVREG,pfnConstruct,
+ *      Constructs an OSS audio driver instance.}
+ */
+static DECLCALLBACK(int) drvHstAudOssConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
     RT_NOREF(pCfg, fFlags);
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
-    PDRVHOSTOSSAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTOSSAUDIO);
+    PDRVHSTAUDOSS pThis = PDMINS_2_DATA(pDrvIns, PDRVHSTAUDOSS);
     LogRel(("Audio: Initializing OSS driver\n"));
 
@@ -908 +900 @@
     pThis->pDrvIns                   = pDrvIns;
     /* IBase */
-    pDrvIns->IBase.pfnQueryInterface = drvHostOSSAudioQueryInterface;
+    pDrvIns->IBase.pfnQueryInterface = drvHstAudOssQueryInterface;
     /* IHostAudio */
-    pThis->IHostAudio.pfnGetConfig                  = drvHostOssAudioHA_GetConfig;
+    pThis->IHostAudio.pfnGetConfig                  = drvHstAudOssHA_GetConfig;
     pThis->IHostAudio.pfnGetDevices                 = NULL;
     pThis->IHostAudio.pfnSetDevice                  = NULL;
-    pThis->IHostAudio.pfnGetStatus                  = drvHostOssAudioHA_GetStatus;
+    pThis->IHostAudio.pfnGetStatus                  = drvHstAudOssHA_GetStatus;
     pThis->IHostAudio.pfnDoOnWorkerThread           = NULL;
     pThis->IHostAudio.pfnStreamConfigHint           = NULL;
-    pThis->IHostAudio.pfnStreamCreate               = drvHostOssAudioHA_StreamCreate;
+    pThis->IHostAudio.pfnStreamCreate               = drvHstAudOssHA_StreamCreate;
     pThis->IHostAudio.pfnStreamInitAsync            = NULL;
-    pThis->IHostAudio.pfnStreamDestroy              = drvHostOssAudioHA_StreamDestroy;
+    pThis->IHostAudio.pfnStreamDestroy              = drvHstAudOssHA_StreamDestroy;
     pThis->IHostAudio.pfnStreamNotifyDeviceChanged  = NULL;
-    pThis->IHostAudio.pfnStreamControl              = drvHostOssAudioHA_StreamControl;
-    pThis->IHostAudio.pfnStreamGetReadable          = drvHostOssAudioHA_StreamGetReadable;
-    pThis->IHostAudio.pfnStreamGetWritable          = drvHostOssAudioHA_StreamGetWritable;
+    pThis->IHostAudio.pfnStreamControl              = drvHstAudOssHA_StreamControl;
+    pThis->IHostAudio.pfnStreamGetReadable          = drvHstAudOssHA_StreamGetReadable;
+    pThis->IHostAudio.pfnStreamGetWritable          = drvHstAudOssHA_StreamGetWritable;
     pThis->IHostAudio.pfnStreamGetPending           = NULL;
-    pThis->IHostAudio.pfnStreamGetState             = drvHostOssAudioHA_StreamGetState;
-    pThis->IHostAudio.pfnStreamPlay                 = drvHostOssAudioHA_StreamPlay;
-    pThis->IHostAudio.pfnStreamCapture              = drvHostOssAudioHA_StreamCapture;
+    pThis->IHostAudio.pfnStreamGetState             = drvHstAudOssHA_StreamGetState;
+    pThis->IHostAudio.pfnStreamPlay                 = drvHstAudOssHA_StreamPlay;
+    pThis->IHostAudio.pfnStreamCapture              = drvHstAudOssHA_StreamCapture;
 
     return VINF_SUCCESS;
@@ -954 +946 @@
     ~0U,
     /* cbInstance */
-    sizeof(DRVHOSTOSSAUDIO),
+    sizeof(DRVHSTAUDOSS),
     /* pfnConstruct */
-    drvHostOSSAudioConstruct,
+    drvHstAudOssConstruct,
     /* pfnDestruct */
     NULL,