Changeset 90148 in vbox for trunk

Timestamp:

Jul 10, 2021 12:40:31 AM (4 years ago)

Author:

vboxsync

Message:

DevHdaCodec: Renamed a couple of variables. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHdaCodec.cpp (modified) (4 diffs)
• DevHdaCodec.h (modified) (5 diffs)

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

@@ -796 +796 @@
     AssertCompile(STAC9221_NUM_NODES <= RT_ELEMENTS(pThis->aNodes));
     pCfg->cTotalNodes       = STAC9221_NUM_NODES;
-    pCfg->u8AdcVolsLineIn   = STAC9220_NID_AMP_ADC0;
-    pCfg->u8DacLineOut      = STAC9220_NID_DAC1;
+    pCfg->idxAdcVolsLineIn  = STAC9220_NID_AMP_ADC0;
+    pCfg->idxDacLineOut     = STAC9220_NID_DAC1;
 
     /* Copy over the node class lists and popuplate afNodeClassifications. */
@@ -2108 +2108 @@
             hdaCodecSetRegisterU8(&AMPLIFIER_REGISTER(*pAmplifier, AMPLIFIER_OUT, AMPLIFIER_RIGHT, u8Index), uCmd, 0);
 
-        if (CODEC_NID(uCmd) == pThis->Cfg.u8DacLineOut)
+        if (CODEC_NID(uCmd) == pThis->Cfg.idxDacLineOut)
             hdaR3CodecToAudVolume(pThis, pNode, pAmplifier, PDMAUDIOMIXERCTL_FRONT);
     }
@@ -2725 +2725 @@
      */
     PCODECNODE pNode;
-    if (hdaCodecIsDacNode(pThis, pThis->Cfg.u8DacLineOut))
-    {
-        pNode = &pThis->aNodes[pThis->Cfg.u8DacLineOut];
+    if (hdaCodecIsDacNode(pThis, pThis->Cfg.idxDacLineOut))
+    {
+        pNode = &pThis->aNodes[pThis->Cfg.idxDacLineOut];
         hdaR3CodecToAudVolume(pThis, pNode, &pNode->dac.B_params, PDMAUDIOMIXERCTL_FRONT);
     }
-    else if (hdaCodecIsSpdifOutNode(pThis, pThis->Cfg.u8DacLineOut))
-    {
-        pNode = &pThis->aNodes[pThis->Cfg.u8DacLineOut];
+    else if (hdaCodecIsSpdifOutNode(pThis, pThis->Cfg.idxDacLineOut))
+    {
+        pNode = &pThis->aNodes[pThis->Cfg.idxDacLineOut];
         hdaR3CodecToAudVolume(pThis, pNode, &pNode->spdifout.B_params, PDMAUDIOMIXERCTL_FRONT);
     }
 
-    pNode = &pThis->aNodes[pThis->Cfg.u8AdcVolsLineIn];
+    pNode = &pThis->aNodes[pThis->Cfg.idxAdcVolsLineIn];
     hdaR3CodecToAudVolume(pThis, pNode, &pNode->adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
 
@@ -2810 +2810 @@
      * Set initial volume.
      */
-    PCODECNODE pNode = &pThis->aNodes[pCodecCfg->u8DacLineOut];
+    PCODECNODE pNode = &pThis->aNodes[pCodecCfg->idxDacLineOut];
     rc = hdaR3CodecToAudVolume(pThis, pNode, &pNode->dac.B_params, PDMAUDIOMIXERCTL_FRONT);
     AssertRCReturn(rc, rc);
 
-    pNode = &pThis->aNodes[pCodecCfg->u8AdcVolsLineIn];
+    pNode = &pThis->aNodes[pCodecCfg->idxAdcVolsLineIn];
     rc = hdaR3CodecToAudVolume(pThis, pNode, &pNode->adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
     AssertRCReturn(rc, rc);

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

@@ -808 +808 @@
 
 /**
- * Code configuration.
+ * Codec configuration.
  *
  * This will not change after construction and is therefore kept in a const
@@ -826 +826 @@
 
     uint8_t         cTotalNodes;
-    uint8_t         u8AdcVolsLineIn;
-    uint8_t         u8DacLineOut;
+    uint8_t         idxAdcVolsLineIn;
+    uint8_t         idxDacLineOut;
 
     /** Align the lists below so they don't cross cache lines (assumes
@@ -857 +857 @@
 } HDACODECCFG;
 AssertCompileMemberAlignment(HDACODECCFG, abPorts, CODEC_NODES_MAX);
+AssertCompileSizeAlignment(HDACODECCFG, 64);
 
 
@@ -866 +867 @@
     /** The codec configuration - initialized at construction time. */
     HDACODECCFG const   Cfg;
-    /** The node data. */
+    /** The state data for each node. */
     CODECNODE           aNodes[CODEC_NODES_MAX];
     /** Statistics. */
@@ -875 +876 @@
 AssertCompile(RT_IS_POWER_OF_TWO(CODEC_NODES_MAX));
 AssertCompileMemberAlignment(HDACODECR3, aNodes, 64);
-AssertCompileSizeAlignment(HDACODECR3, 8);
-AssertCompileSizeAlignment(HDACODECR3, 16);
-AssertCompileSizeAlignment(HDACODECR3, 32);
 AssertCompileSizeAlignment(HDACODECR3, 64);