Changeset 90141 in vbox

Timestamp:

Jul 9, 2021 10:41:57 PM (4 years ago)

Author:

vboxsync

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

145643

Message:

DevHdaCodec: Corrected some member names. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

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

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

@@ -798 +798 @@
     pThis->fInReset = false;
 
-#define STAC9220WIDGET(type) memcpy(&pThis->au8##type##s, &g_abStac9220##type##s, sizeof(uint8_t) * RT_ELEMENTS(g_abStac9220##type##s));
+#define STAC9220WIDGET(a_Type) do { \
+            AssertCompile(RT_ELEMENTS(g_abStac9220##a_Type##s) <= RT_ELEMENTS(pThis->ab##a_Type##s)); \
+            memcpy(&pThis->ab##a_Type##s, &g_abStac9220##a_Type##s, sizeof(uint8_t) * RT_ELEMENTS(g_abStac9220##a_Type##s)); \
+        } while (0)
     STAC9220WIDGET(Port);
     STAC9220WIDGET(Dac);
@@ -849 +852 @@
 
 /*
- * Some generic predicate functions.
- */
+ * Some generic predicate functions. 
+ */
+/** @todo r=bird: we could use memchr here if we knew the array always ended with zeros */
 #define HDA_CODEC_IS_NODE_OF_TYPE_FUNC(a_Type) \
     DECLINLINE(bool) hdaCodecIs##a_Type##Node(PHDACODECR3 pThis, uint8_t idNode) \
     { \
-        Assert(pThis->au8##a_Type##s); \
-        for (uintptr_t i = 0; i < RT_ELEMENTS(pThis->au8##a_Type##s) && pThis->au8##a_Type##s[i] != 0; i++) \
-            if (pThis->au8##a_Type##s[i] == idNode) \
+        Assert(pThis->ab##a_Type##s); \
+        for (uintptr_t i = 0; i < RT_ELEMENTS(pThis->ab##a_Type##s) && pThis->ab##a_Type##s[i] != 0; i++) \
+            if (pThis->ab##a_Type##s[i] == idNode) \
                 return true; \
         return false; \
@@ -1564 +1568 @@
         } while (0)
 
-        PROPAGATE_PWR_STATE(pThis->au8Dacs,       dac);
-        PROPAGATE_PWR_STATE(pThis->au8Adcs,       adc);
-        PROPAGATE_PWR_STATE(pThis->au8DigInPins,  digin);
-        PROPAGATE_PWR_STATE(pThis->au8DigOutPins, digout);
-        PROPAGATE_PWR_STATE(pThis->au8SpdifIns,   spdifin);
-        PROPAGATE_PWR_STATE(pThis->au8SpdifOuts,  spdifout);
-        PROPAGATE_PWR_STATE(pThis->au8Reserveds,  reserved);
+        PROPAGATE_PWR_STATE(pThis->abDacs,       dac);
+        PROPAGATE_PWR_STATE(pThis->abAdcs,       adc);
+        PROPAGATE_PWR_STATE(pThis->abDigInPins,  digin);
+        PROPAGATE_PWR_STATE(pThis->abDigOutPins, digout);
+        PROPAGATE_PWR_STATE(pThis->abSpdifIns,   spdifin);
+        PROPAGATE_PWR_STATE(pThis->abSpdifOuts,  spdifout);
+        PROPAGATE_PWR_STATE(pThis->abReserveds,  reserved);
 
 #undef PROPAGATE_PWR_STATE
@@ -1659 +1663 @@
         {
             /* now we're powered on AFG and may propogate power states on nodes */
-            const uint8_t *pu8NodeIndex = &pThis->au8Dacs[0];
+            const uint8_t *pu8NodeIndex = &pThis->abDacs[0];
             while (*(++pu8NodeIndex))
                 codecPropogatePowerState(&pThis->aNodes[*pu8NodeIndex].dac.u32F05_param);
 
-            pu8NodeIndex = &pThis->au8Adcs[0];
+            pu8NodeIndex = &pThis->abAdcs[0];
             while (*(++pu8NodeIndex))
                 codecPropogatePowerState(&pThis->aNodes[*pu8NodeIndex].adc.u32F05_param);
 
-            pu8NodeIndex = &pThis->au8DigInPins[0];
+            pu8NodeIndex = &pThis->abDigInPins[0];
             while (*(++pu8NodeIndex))
                 codecPropogatePowerState(&pThis->aNodes[*pu8NodeIndex].digin.u32F05_param);
@@ -2329 +2333 @@
     uint8_t         uLevel;
     /** Pointer to codec state. */
-    PHDACODECR3       pThis;
+    PHDACODECR3     pThis;
 } CODECDEBUG;
 /** Pointer to the debug info item printing state for the codec. */

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

@@ -816 +816 @@
     uint8_t     abPadding1[CODEC_NODES_MAX - 20];
 
-    uint8_t     au8Ports[CODEC_NODES_MAX];
-    uint8_t     au8Dacs[CODEC_NODES_MAX];
-    uint8_t     au8AdcVols[CODEC_NODES_MAX];
-    uint8_t     au8Adcs[CODEC_NODES_MAX];
-    uint8_t     au8AdcMuxs[CODEC_NODES_MAX];
-    uint8_t     au8Pcbeeps[CODEC_NODES_MAX];
-    uint8_t     au8SpdifIns[CODEC_NODES_MAX];
-    uint8_t     au8SpdifOuts[CODEC_NODES_MAX];
-    uint8_t     au8DigInPins[CODEC_NODES_MAX];
-    uint8_t     au8DigOutPins[CODEC_NODES_MAX];
-    uint8_t     au8Cds[CODEC_NODES_MAX];
-    uint8_t     au8VolKnobs[CODEC_NODES_MAX];
-    uint8_t     au8Reserveds[CODEC_NODES_MAX];
+    uint8_t     abPorts[CODEC_NODES_MAX];
+    uint8_t     abDacs[CODEC_NODES_MAX];
+    uint8_t     abAdcVols[CODEC_NODES_MAX];
+    uint8_t     abAdcs[CODEC_NODES_MAX];
+    uint8_t     abAdcMuxs[CODEC_NODES_MAX];
+    uint8_t     abPcbeeps[CODEC_NODES_MAX];
+    uint8_t     abSpdifIns[CODEC_NODES_MAX];
+    uint8_t     abSpdifOuts[CODEC_NODES_MAX];
+    uint8_t     abDigInPins[CODEC_NODES_MAX];
+    uint8_t     abDigOutPins[CODEC_NODES_MAX];
+    uint8_t     abCds[CODEC_NODES_MAX];
+    uint8_t     abVolKnobs[CODEC_NODES_MAX];
+    uint8_t     abReserveds[CODEC_NODES_MAX];
 
     /** Safty zero padding before the nodes start. */
@@ -839 +839 @@
 } HDACODECR3;
 AssertCompile(RT_IS_POWER_OF_TWO(CODEC_NODES_MAX));
-AssertCompileMemberAlignment(HDACODECR3, au8Ports, CODEC_NODES_MAX);
+AssertCompileMemberAlignment(HDACODECR3, abPorts, CODEC_NODES_MAX);
 AssertCompileMemberAlignment(HDACODECR3, aNodes, 64);
 AssertCompileSizeAlignment(HDACODECR3, 8);