Changeset 90142 in vbox for trunk/src

Timestamp:

Jul 9, 2021 10:46:06 PM (4 years ago)

Author:

vboxsync

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

145644

Message:

DevHdaCodec: Renamed some more member names. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHda.cpp (modified) (1 diff)
• DevHdaCodec.cpp (modified) (5 diffs)
• DevHdaCodec.h (modified) (1 diff)

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

@@ -4991 +4991 @@
     /* ICH6 datasheet defines 0 values for SVID and SID (18.1.14-15), which together with values returned for
        verb F20 should provide device/codec recognition. */
-    Assert(pThisCC->Codec.u16VendorId);
-    Assert(pThisCC->Codec.u16DeviceId);
-    PDMPciDevSetSubSystemVendorId(pPciDev, pThisCC->Codec.u16VendorId); /* 2c ro - intel.) */
-    PDMPciDevSetSubSystemId(      pPciDev, pThisCC->Codec.u16DeviceId); /* 2e ro. */
+    Assert(pThisCC->Codec.idVendor);
+    Assert(pThisCC->Codec.idDevice);
+    PDMPciDevSetSubSystemVendorId(pPciDev, pThisCC->Codec.idVendor); /* 2c ro - intel.) */
+    PDMPciDevSetSubSystemId(      pPciDev, pThisCC->Codec.idDevice); /* 2e ro. */
 
     /*

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

@@ -786 +786 @@
 static int stac9220Construct(PHDACODECR3 pThis)
 {
-    pThis->u16VendorId  = 0x8384; /* SigmaTel */
+    pThis->idVendor     = 0x8384; /* SigmaTel */
     /*
      * Note: The Linux kernel uses "patch_stac922x" for the fixups,
@@ -792 +792 @@
      *       defaults tweaking in sound/pci/hda/patch_sigmatel.c.
      */
-    pThis->u16DeviceId  = 0x7680; /* STAC9221 A1 */
-    pThis->u8BSKU       = 0x76;
-    pThis->u8AssemblyId = 0x80;
+    pThis->idDevice     = 0x7680; /* STAC9221 A1 */
+    pThis->bBSKU        = 0x76;
+    pThis->idAssembly   = 0x80;
 
     pThis->fInReset = false;
@@ -834 +834 @@
 
     /* Common root node initializers. */
-    pThis->aNodes[STAC9220_NID_ROOT].root.node.au32F00_param[0] = CODEC_MAKE_F00_00(pThis->u16VendorId, pThis->u16DeviceId);
+    pThis->aNodes[STAC9220_NID_ROOT].root.node.au32F00_param[0] = CODEC_MAKE_F00_00(pThis->idVendor, pThis->idDevice);
     pThis->aNodes[STAC9220_NID_ROOT].root.node.au32F00_param[4] = CODEC_MAKE_F00_04(0x1, 0x1);
 
@@ -841 +841 @@
     pThis->aNodes[STAC9220_NID_AFG].afg.node.au32F00_param[0x5] = CODEC_MAKE_F00_05(1, CODEC_F00_05_AFG);
     pThis->aNodes[STAC9220_NID_AFG].afg.node.au32F00_param[0xA] = CODEC_F00_0A_44_1KHZ | CODEC_F00_0A_16_BIT;
-    pThis->aNodes[STAC9220_NID_AFG].afg.u32F20_param = CODEC_MAKE_F20(pThis->u16VendorId, pThis->u8BSKU, pThis->u8AssemblyId);
+    pThis->aNodes[STAC9220_NID_AFG].afg.u32F20_param = CODEC_MAKE_F20(pThis->idVendor, pThis->bBSKU, pThis->idAssembly);
 
     return VINF_SUCCESS;
@@ -852 +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 */

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

@@ -799 +799 @@
     /** Codec ID. */
     uint16_t    id;
-    uint16_t    u16VendorId;
-    uint16_t    u16DeviceId;
-    uint8_t     u8BSKU;
-    uint8_t     u8AssemblyId;
+    uint16_t    idVendor;
+    uint16_t    idDevice;
+    uint8_t     bBSKU;
+    uint8_t     idAssembly;
 
     bool        fInReset;