Changeset 56689 in vbox

Timestamp:

Jun 29, 2015 8:15:25 PM (10 years ago)

Author:

vboxsync

Message:

Audio: Volume control debugging aids.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.h (modified) (1 diff)
• DevIchHda.cpp (modified) (2 diffs)
• DevIchHdaCodec.cpp (modified) (2 diffs)

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

@@ -107 +107 @@
 int AudioMixerSetMasterVolume(PAUDIOMIXER pMixer, PPDMAUDIOVOLUME pVol);
 int AudioMixerSetSinkVolume(PAUDMIXSINK pSink, PPDMAUDIOVOLUME pVol);
+void AudioMixerDebug(PAUDIOMIXER pMixer, PCDBGFINFOHLP pHlp, const char *pszArgs);
 
 #endif /* AUDIO_MIXER_H */

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

@@ -3321 +3321 @@
 
 
+/**
+ * @callback_method_impl{FNDBGFHANDLERDEV}
+ */
+static DECLCALLBACK(void) hdaInfoMixer(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
+
+    if (pThis->pMixer)
+        AudioMixerDebug(pThis->pMixer, pHlp, pszArgs);
+    else
+        pHlp->pfnPrintf(pHlp, "Mixer not available\n");
+}
+
+
 /* PDMIBASE */
 
@@ -3785 +3799 @@
         PDMDevHlpDBGFInfoRegister(pDevIns, "hdcnodes",    "HDA codec nodes.",                               hdaInfoCodecNodes);
         PDMDevHlpDBGFInfoRegister(pDevIns, "hdcselector", "HDA codec's selector states [node number].",     hdaInfoCodecSelector);
+        PDMDevHlpDBGFInfoRegister(pDevIns, "hdamixer",    "HDA mixer state.",                               hdaInfoMixer);
 
         rc = RTStrFormatTypeRegister("sdctl",   hdaFormatStrmCtl,   NULL);

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

@@ -741 +741 @@
 
 
+
+
+static DECLCALLBACK(void) stac9220DbgNodes(PHDACODEC pThis, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    for (int i = 1; i < 12; i++)
+    {
+        PCODECNODE pNode = &pThis->paNodes[i];
+        AMPLIFIER *pAmp = &pNode->dac.B_params;
+
+        uint8_t lVol = AMPLIFIER_REGISTER(*pAmp, AMPLIFIER_OUT, AMPLIFIER_LEFT, 0) & 0x7f;
+        uint8_t rVol = AMPLIFIER_REGISTER(*pAmp, AMPLIFIER_OUT, AMPLIFIER_RIGHT, 0) & 0x7f;
+
+        pHlp->pfnPrintf(pHlp, "0x%x: lVol=%RU8, rVol=%RU8\n", i, lVol, rVol);
+    }
+}
 
 
@@ -1088 +1103 @@
     unconst(pThis->cTotalNodes) = 0x1C;
     pThis->pfnCodecNodeReset = stac9220ResetNode;
+    pThis->pfnCodecDbgListNodes = stac9220DbgNodes;
     pThis->u16VendorId = 0x8384;
     pThis->u16DeviceId = 0x7680;