Changeset 90128 in vbox for trunk/src

Timestamp:

Jul 9, 2021 2:27:52 PM (4 years ago)

Author:

vboxsync

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

145630

Message:

DevHdaCodec: Moved CODECVERB to the .cpp file as it does not to be exposed. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHdaCodec.cpp (modified) (3 diffs)
• DevHdaCodec.h (modified) (2 diffs)

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

@@ -46 +46 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
-
-
 #define AMPLIFIER_IN    0
 #define AMPLIFIER_OUT   1
@@ -55 +53 @@
 
 
-/*********************************************************************************************************************************
-*   Global Variables                                                                                                             *
-*********************************************************************************************************************************/
 /* STAC9220 - Nodes IDs / names. */
 #define STAC9220_NID_ROOT                                  0x0  /* Root node */
@@ -95 +90 @@
 /** Number of total nodes emulated. */
 #define STAC9221_NUM_NODES                                 0x1C
+
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+/**
+ * A codec verb descriptor.
+ */
+typedef struct CODECVERB
+{
+    /** Verb. */
+    uint32_t                   uVerb;
+    /** Verb mask. */
+    uint32_t                   fMask;
+    /**
+     * Function pointer for implementation callback.
+     *
+     * This is always a valid pointer in ring-3, while elsewhere a NULL indicates
+     * that we must return to ring-3 to process it.
+     *
+     * @returns VINF_SUCCESS
+     * @todo    r=bird: I couldn't spot a single handler not returning VINF_SUCCESS,
+     *          nor could I see what purpose the return code would have other than
+     *          maybe something in VERR_INTERNAL_ERROR area...  Get rid of it and
+     *          make it return @a *puResp instead?
+     *
+     * @param   pThis   The shared codec intance data.
+     * @param   pThisCC The codec instance data for the current context (ring-3).
+     * @param   uCmd    The command.
+     * @param   puResp  Where to return the response value.
+     *
+     * @thread  EMT or task worker thread (see HDASTATE::hCorbDmaTask).
+     */
+    DECLCALLBACKMEMBER(int,    pfn, (PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp));
+    /** Friendly name, for debugging. */
+    const char                *pszName;
+} CODECVERB;
+/** Pointer to a const codec verb descriptor. */
+typedef CODECVERB const *PCCODECVERB;
 
 

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

@@ -49 +49 @@
     CODEC_TYPE_STAC9220,
     /** Hack to blow the type up to 32-bit. */
-    CODEC_TYPE__32BIT_HACK = 0x7fffffff
+    CODEC_TYPE_32BIT_HACK = 0x7fffffff
 } CODEC_TYPE;
 
@@ -558 +558 @@
 /* PRM 5.3.1 */
 #define CODEC_RESPONSE_UNSOLICITED RT_BIT_64(34)
-
-/**
- * A codec verb descriptor.
- */
-typedef struct CODECVERB
-{
-    /** Verb. */
-    uint32_t                   uVerb;
-    /** Verb mask. */
-    uint32_t                   fMask;
-    /**
-     * Function pointer for implementation callback.
-     *
-     * This is always a valid pointer in ring-3, while elsewhere a NULL indicates
-     * that we must return to ring-3 to process it.
-     *
-     * @returns VINF_SUCCESS
-     * @todo    r=bird: I couldn't spot a single handler not returning VINF_SUCCESS,
-     *          nor could I see what purpose the return code would have other than
-     *          maybe something in VERR_INTERNAL_ERROR area...  Get rid of it and
-     *          make it return @a *puResp instead?
-     *
-     * @param   pThis   The shared codec intance data.
-     * @param   pThisCC The codec instance data for the current context (ring-3).
-     * @param   uCmd    The command.
-     * @param   puResp  Where to return the response value.
-     *
-     * @thread  EMT or task worker thread (see HDASTATE::hCorbDmaTask).
-     */
-    DECLCALLBACKMEMBER(int,    pfn, (PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp));
-    /** Friendly name, for debugging. */
-    const char                *pszName;
-} CODECVERB;
-/** Pointer to a const codec verb descriptor. */
-typedef CODECVERB const *PCCODECVERB;
-
 
 #define AMPLIFIER_SIZE 60