Changeset 90138 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jul 9, 2021 9:02:07 PM (4 years ago)

Author:

vboxsync

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

145640

Message:

DevHda: Only HDACODECR3, no HDACODEC structure any more. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

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

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.State.u16VendorId);
-    Assert(pThisCC->Codec.State.u16DeviceId);
-    PDMPciDevSetSubSystemVendorId(pPciDev, pThisCC->Codec.State.u16VendorId); /* 2c ro - intel.) */
-    PDMPciDevSetSubSystemId(      pPciDev, pThisCC->Codec.State.u16DeviceId); /* 2e ro. */
+    Assert(pThisCC->Codec.u16VendorId);
+    Assert(pThisCC->Codec.u16DeviceId);
+    PDMPciDevSetSubSystemVendorId(pPciDev, pThisCC->Codec.u16VendorId); /* 2c ro - intel.) */
+    PDMPciDevSetSubSystemId(      pPciDev, pThisCC->Codec.u16DeviceId); /* 2e ro. */
 
     /*

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

@@ -806 +806 @@
 
 
-/** @name DevHDA.cpp functions used by the codec.
+/** @name HDA device functions used by the codec.
  * @{ */
 DECLHIDDEN(int)     hdaR3MixerAddStream(PHDACODECR3 pCodec, PDMAUDIOMIXERCTL enmMixerCtl, PCPDMAUDIOSTREAMCFG pCfg);

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

@@ -119 +119 @@
      *
      * @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.
@@ -125 +124 @@
      * @thread  EMT or task worker thread (see HDASTATE::hCorbDmaTask).
      */
-    DECLCALLBACKMEMBER(int,    pfn, (PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp));
+    DECLCALLBACKMEMBER(int,    pfn, (PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp));
     /** Friendly name, for debugging. */
     const char                *pszName;
@@ -197 +196 @@
  * @param   pNode               Node to reset.
  */
-static void stac9220NodeReset(PHDACODEC pThis, uint8_t uNID, PCODECNODE pNode)
+static void stac9220NodeReset(PHDACODECR3 pThis, uint8_t uNID, PCODECNODE pNode)
 {
     LogFlowFunc(("NID=0x%x (%RU8)\n", uNID, uNID));
@@ -772 +771 @@
  * @param   pThis               HDA codec to reset.
  */
-static DECLCALLBACK(void) stac9220Reset(PHDACODEC pThis)
+static void stac9220Reset(PHDACODECR3 pThis)
 {
     AssertPtrReturnVoid(pThis->aNodes);
@@ -788 +787 @@
 
 
-static int stac9220Construct(PHDACODEC pThis)
+static int stac9220Construct(PHDACODECR3 pThis)
 {
     pThis->u16VendorId  = 0x8384; /* SigmaTel */
@@ -856 +855 @@
  */
 #define HDA_CODEC_IS_NODE_OF_TYPE_FUNC(a_Type) \
-    DECLINLINE(bool) hdaCodecIs##a_Type##Node(PHDACODEC pThis, uint8_t idNode) \
+    DECLINLINE(bool) hdaCodecIs##a_Type##Node(PHDACODECR3 pThis, uint8_t idNode) \
     { \
         Assert(pThis->au8##a_Type##s); \
@@ -895 +894 @@
  * Misc helpers.
  */
-static int hdaR3CodecToAudVolume(PHDACODECR3 pThisCC, PCODECNODE pNode, AMPLIFIER *pAmp, PDMAUDIOMIXERCTL enmMixerCtl)
+static int hdaR3CodecToAudVolume(PHDACODECR3 pThis, PCODECNODE pNode, AMPLIFIER *pAmp, PDMAUDIOMIXERCTL enmMixerCtl)
 {
     RT_NOREF(pNode);
@@ -940 +939 @@
              PDMAudioMixerCtlGetName(enmMixerCtl), bLeft, bRight, Vol.fMuted ? "- Muted!" : ""));
 
-    return hdaR3MixerSetVolume(pThisCC, enmMixerCtl, &Vol);
+    return hdaR3MixerSetVolume(pThis, enmMixerCtl, &Vol);
 }
 
@@ -970 +969 @@
  * @interface_method_impl{CODECVERB,pfn, Unimplemented}
  */
-static DECLCALLBACK(int) vrbProcUnimplemented(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThis, pThisCC, uCmd);
+static DECLCALLBACK(int) vrbProcUnimplemented(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
+    RT_NOREF(pThis, uCmd);
     LogFlowFunc(("uCmd(raw:%x: cad:%x, d:%c, nid:%x, verb:%x)\n", uCmd,
                  CODEC_CAD(uCmd), CODEC_DIRECT(uCmd) ? 'N' : 'Y', CODEC_NID(uCmd), CODEC_VERBDATA(uCmd)));
@@ -983 +982 @@
  * @interface_method_impl{CODECVERB,pfn, ??? }
  */
-static DECLCALLBACK(int) vrbProcBreak(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
+static DECLCALLBACK(int) vrbProcBreak(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
 {
     int rc;
-    rc = vrbProcUnimplemented(pThis, pThisCC, uCmd, puResp);
+    rc = vrbProcUnimplemented(pThis, uCmd, puResp);
     *puResp |= CODEC_RESPONSE_UNSOLICITED;
     return rc;
@@ -996 +995 @@
  * @interface_method_impl{CODECVERB,pfn, b-- }
  */
-static DECLCALLBACK(int) vrbProcGetAmplifier(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetAmplifier(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1046 +1044 @@
  * @interface_method_impl{CODECVERB,pfn, ??? }
  */
-static DECLCALLBACK(int) vrbProcGetParameter(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetParameter(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     Assert((uCmd & CODEC_VERB_8BIT_DATA) < CODECNODE_F00_PARAM_LENGTH);
     if ((uCmd & CODEC_VERB_8BIT_DATA) >= CODECNODE_F00_PARAM_LENGTH)
@@ -1066 +1063 @@
  * @interface_method_impl{CODECVERB,pfn, f01 }
  */
-static DECLCALLBACK(int) vrbProcGetConSelectCtrl(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetConSelectCtrl(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1091 +1087 @@
  * @interface_method_impl{CODECVERB,pfn, 701 }
  */
-static DECLCALLBACK(int) vrbProcSetConSelectCtrl(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetConSelectCtrl(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1120 +1115 @@
  * @interface_method_impl{CODECVERB,pfn, f07 }
  */
-static DECLCALLBACK(int) vrbProcGetPinCtrl(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetPinCtrl(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1147 +1141 @@
  * @interface_method_impl{CODECVERB,pfn, 707 }
  */
-static DECLCALLBACK(int) vrbProcSetPinCtrl(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetPinCtrl(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1179 +1172 @@
  * @interface_method_impl{CODECVERB,pfn, f08 }
  */
-static DECLCALLBACK(int) vrbProcGetUnsolicitedEnabled(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetUnsolicitedEnabled(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1206 +1198 @@
  * @interface_method_impl{CODECVERB,pfn, 708 }
  */
-static DECLCALLBACK(int) vrbProcSetUnsolicitedEnabled(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetUnsolicitedEnabled(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1237 +1228 @@
  * @interface_method_impl{CODECVERB,pfn, f09 }
  */
-static DECLCALLBACK(int) vrbProcGetPinSense(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetPinSense(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1259 +1249 @@
  * @interface_method_impl{CODECVERB,pfn, 709 }
  */
-static DECLCALLBACK(int) vrbProcSetPinSense(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetPinSense(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1282 +1271 @@
  * @interface_method_impl{CODECVERB,pfn, ??? }
  */
-static DECLCALLBACK(int) vrbProcGetConnectionListEntry(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetConnectionListEntry(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1301 +1289 @@
  * @interface_method_impl{CODECVERB,pfn, f03 }
  */
-static DECLCALLBACK(int) vrbProcGetProcessingState(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetProcessingState(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1316 +1303 @@
  * @interface_method_impl{CODECVERB,pfn, 703 }
  */
-static DECLCALLBACK(int) vrbProcSetProcessingState(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetProcessingState(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1330 +1316 @@
  * @interface_method_impl{CODECVERB,pfn, f0d }
  */
-static DECLCALLBACK(int) vrbProcGetDigitalConverter(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetDigitalConverter(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1343 +1328 @@
 
 
-static int codecSetDigitalConverter(PHDACODEC pThis, uint32_t uCmd, uint8_t u8Offset, uint64_t *puResp)
+static int codecSetDigitalConverter(PHDACODECR3 pThis, uint32_t uCmd, uint8_t u8Offset, uint64_t *puResp)
 {
     *puResp = 0;
@@ -1358 +1343 @@
  * @interface_method_impl{CODECVERB,pfn, 70d }
  */
-static DECLCALLBACK(int) vrbProcSetDigitalConverter1(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetDigitalConverter1(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     return codecSetDigitalConverter(pThis, uCmd, 0, puResp);
 }
@@ -1368 +1352 @@
  * @interface_method_impl{CODECVERB,pfn, 70e }
  */
-static DECLCALLBACK(int) vrbProcSetDigitalConverter2(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetDigitalConverter2(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     return codecSetDigitalConverter(pThis, uCmd, 8, puResp);
 }
@@ -1378 +1361 @@
  * @interface_method_impl{CODECVERB,pfn, f20 }
  */
-static DECLCALLBACK(int) vrbProcGetSubId(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetSubId(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     Assert(CODEC_CAD(uCmd) == pThis->id);
     uint8_t const cTotalNodes = (uint8_t)RT_MIN(pThis->cTotalNodes, RT_ELEMENTS(pThis->aNodes));
@@ -1398 +1380 @@
 
 
-static int codecSetSubIdX(PHDACODEC pThis, uint32_t uCmd, uint8_t u8Offset)
+static int codecSetSubIdX(PHDACODECR3 pThis, uint32_t uCmd, uint8_t u8Offset)
 {
     Assert(CODEC_CAD(uCmd) == pThis->id);
@@ -1421 +1403 @@
  * @interface_method_impl{CODECVERB,pfn, 720 }
  */
-static DECLCALLBACK(int) vrbProcSetSubId0(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetSubId0(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
     return codecSetSubIdX(pThis, uCmd, 0);
@@ -1432 +1413 @@
  * @interface_method_impl{CODECVERB,pfn, 721 }
  */
-static DECLCALLBACK(int) vrbProcSetSubId1(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetSubId1(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
     return codecSetSubIdX(pThis, uCmd, 8);
@@ -1443 +1423 @@
  * @interface_method_impl{CODECVERB,pfn, 722 }
  */
-static DECLCALLBACK(int) vrbProcSetSubId2(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetSubId2(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
     return codecSetSubIdX(pThis, uCmd, 16);
@@ -1454 +1433 @@
  * @interface_method_impl{CODECVERB,pfn, 723 }
  */
-static DECLCALLBACK(int) vrbProcSetSubId3(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetSubId3(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
     return codecSetSubIdX(pThis, uCmd, 24);
@@ -1465 +1443 @@
  * @interface_method_impl{CODECVERB,pfn, ??? }
  */
-static DECLCALLBACK(int) vrbProcReset(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcReset(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     Assert(CODEC_CAD(uCmd) == pThis->id);
 
@@ -1488 +1465 @@
  * @interface_method_impl{CODECVERB,pfn, f05 }
  */
-static DECLCALLBACK(int) vrbProcGetPowerState(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetPowerState(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1522 +1498 @@
  * @interface_method_impl{CODECVERB,pfn, 705 }
  */
-static DECLCALLBACK(int) vrbProcSetPowerState(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetPowerState(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1635 +1610 @@
  * @interface_method_impl{CODECVERB,pfn, 705 }
  */
-static DECLCALLBACK(int) vrbProcSetPowerState(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetPowerState(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     Assert(CODEC_CAD(uCmd) == pThis->id);
     uint8_t const cTotalNodes = (uint8_t)RT_MIN(pThis->cTotalNodes, RT_ELEMENTS(pThis->aNodes));
@@ -1709 +1683 @@
  * @interface_method_impl{CODECVERB,pfn, f06 }
  */
-static DECLCALLBACK(int) vrbProcGetStreamId(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetStreamId(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1737 +1710 @@
  * @interface_method_impl{CODECVERB,pfn, a0 }
  */
-static DECLCALLBACK(int) vrbProcGetConverterFormat(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetConverterFormat(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1762 +1734 @@
  * @interface_method_impl{CODECVERB,pfn, ??? - Also see section 3.7.1. }
  */
-static DECLCALLBACK(int) vrbProcSetConverterFormat(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetConverterFormat(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1785 +1756 @@
  * @interface_method_impl{CODECVERB,pfn, f0c }
  */
-static DECLCALLBACK(int) vrbProcGetEAPD_BTLEnabled(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetEAPD_BTLEnabled(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1806 +1776 @@
  * @interface_method_impl{CODECVERB,pfn, 70c }
  */
-static DECLCALLBACK(int) vrbProcSetEAPD_BTLEnabled(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetEAPD_BTLEnabled(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1831 +1800 @@
  * @interface_method_impl{CODECVERB,pfn, f0f }
  */
-static DECLCALLBACK(int) vrbProcGetVolumeKnobCtrl(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetVolumeKnobCtrl(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1848 +1816 @@
  * @interface_method_impl{CODECVERB,pfn, 70f }
  */
-static DECLCALLBACK(int) vrbProcSetVolumeKnobCtrl(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetVolumeKnobCtrl(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1869 +1836 @@
  * @interface_method_impl{CODECVERB,pfn, f15 }
  */
-static DECLCALLBACK(int) vrbProcGetGPIOData(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThis, pThisCC, uCmd);
+static DECLCALLBACK(int) vrbProcGetGPIOData(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
+    RT_NOREF(pThis, uCmd);
     *puResp = 0;
     return VINF_SUCCESS;
@@ -1880 +1847 @@
  * @interface_method_impl{CODECVERB,pfn, 715 }
  */
-static DECLCALLBACK(int) vrbProcSetGPIOData(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThis, pThisCC, uCmd);
+static DECLCALLBACK(int) vrbProcSetGPIOData(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
+    RT_NOREF(pThis, uCmd);
     *puResp = 0;
     return VINF_SUCCESS;
@@ -1891 +1858 @@
  * @interface_method_impl{CODECVERB,pfn, f16 }
  */
-static DECLCALLBACK(int) vrbProcGetGPIOEnableMask(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThis, pThisCC, uCmd);
+static DECLCALLBACK(int) vrbProcGetGPIOEnableMask(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
+    RT_NOREF(pThis, uCmd);
     *puResp = 0;
     return VINF_SUCCESS;
@@ -1902 +1869 @@
  * @interface_method_impl{CODECVERB,pfn, 716 }
  */
-static DECLCALLBACK(int) vrbProcSetGPIOEnableMask(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThis, pThisCC, uCmd);
+static DECLCALLBACK(int) vrbProcSetGPIOEnableMask(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
+    RT_NOREF(pThis, uCmd);
     *puResp = 0;
     return VINF_SUCCESS;
@@ -1913 +1880 @@
  * @interface_method_impl{CODECVERB,pfn, f17 }
  */
-static DECLCALLBACK(int) vrbProcGetGPIODirection(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetGPIODirection(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1931 +1897 @@
  * @interface_method_impl{CODECVERB,pfn, 717 }
  */
-static DECLCALLBACK(int) vrbProcSetGPIODirection(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetGPIODirection(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1952 +1917 @@
  * @interface_method_impl{CODECVERB,pfn, f1c }
  */
-static DECLCALLBACK(int) vrbProcGetConfig(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetConfig(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -1975 +1939 @@
 }
 
-static int codecSetConfigX(PHDACODEC pThis, uint32_t uCmd, uint8_t u8Offset)
+static int codecSetConfigX(PHDACODECR3 pThis, uint32_t uCmd, uint8_t u8Offset)
 {
     uint32_t *pu32Reg = NULL;
@@ -2003 +1967 @@
  * @interface_method_impl{CODECVERB,pfn, 71c }
  */
-static DECLCALLBACK(int) vrbProcSetConfig0(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetConfig0(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
     return codecSetConfigX(pThis, uCmd, 0);
@@ -2014 +1977 @@
  * @interface_method_impl{CODECVERB,pfn, 71d }
  */
-static DECLCALLBACK(int) vrbProcSetConfig1(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetConfig1(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
     return codecSetConfigX(pThis, uCmd, 8);
@@ -2025 +1987 @@
  * @interface_method_impl{CODECVERB,pfn, 71e }
  */
-static DECLCALLBACK(int) vrbProcSetConfig2(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetConfig2(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
     return codecSetConfigX(pThis, uCmd, 16);
@@ -2036 +1997 @@
  * @interface_method_impl{CODECVERB,pfn, 71e }
  */
-static DECLCALLBACK(int) vrbProcSetConfig3(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetConfig3(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
     return codecSetConfigX(pThis, uCmd, 24);
@@ -2047 +2007 @@
  * @interface_method_impl{CODECVERB,pfn, f04 }
  */
-static DECLCALLBACK(int) vrbProcGetSDISelect(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcGetSDISelect(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -2064 +2023 @@
  * @interface_method_impl{CODECVERB,pfn, 704 }
  */
-static DECLCALLBACK(int) vrbProcSetSDISelect(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    RT_NOREF(pThisCC);
+static DECLCALLBACK(int) vrbProcSetSDISelect(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     *puResp = 0;
 
@@ -2085 +2043 @@
  * @interface_method_impl{CODECVERB,pfn, 3-- }
  */
-static DECLCALLBACK(int) vrbProcR3SetAmplifier(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
+static DECLCALLBACK(int) vrbProcR3SetAmplifier(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
 {
     *puResp = 0;
@@ -2132 +2090 @@
     //    if (CODEC_NID(uCmd) == pThis->u8AdcVolsLineIn)
     //    {
-            hdaR3CodecToAudVolume(pThisCC, pNode, pAmplifier, PDMAUDIOMIXERCTL_LINE_IN);
+            hdaR3CodecToAudVolume(pThis, pNode, pAmplifier, PDMAUDIOMIXERCTL_LINE_IN);
     //    }
     }
@@ -2143 +2101 @@
 
         if (CODEC_NID(uCmd) == pThis->u8DacLineOut)
-            hdaR3CodecToAudVolume(pThisCC, pNode, pAmplifier, PDMAUDIOMIXERCTL_FRONT);
+            hdaR3CodecToAudVolume(pThis, pNode, pAmplifier, PDMAUDIOMIXERCTL_FRONT);
     }
 
@@ -2153 +2111 @@
  * @interface_method_impl{CODECVERB,pfn, 706 }
  */
-static DECLCALLBACK(int) vrbProcR3SetStreamId(PHDACODEC pThis, PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
+static DECLCALLBACK(int) vrbProcR3SetStreamId(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
 {
     *puResp = 0;
@@ -2204 +2162 @@
 
         /* Propagate to the controller. */
-        hdaR3MixerControl(pThisCC, PDMAUDIOMIXERCTL_FRONT,      uSD, uChannel);
+        hdaR3MixerControl(pThis, PDMAUDIOMIXERCTL_FRONT,      uSD, uChannel);
 # ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
-        hdaR3MixerControl(pThisCC, PDMAUDIOMIXERCTL_CENTER_LFE, uSD, uChannel);
-        hdaR3MixerControl(pThisCC, PDMAUDIOMIXERCTL_REAR,       uSD, uChannel);
+        hdaR3MixerControl(pThis, PDMAUDIOMIXERCTL_CENTER_LFE, uSD, uChannel);
+        hdaR3MixerControl(pThis, PDMAUDIOMIXERCTL_REAR,       uSD, uChannel);
 # endif
     }
     else if (enmDir == PDMAUDIODIR_IN)
     {
-        hdaR3MixerControl(pThisCC, PDMAUDIOMIXERCTL_LINE_IN,    uSD, uChannel);
+        hdaR3MixerControl(pThis, PDMAUDIOMIXERCTL_LINE_IN,    uSD, uChannel);
 # ifdef VBOX_WITH_AUDIO_HDA_MIC_IN
-        hdaR3MixerControl(pThisCC, PDMAUDIOMIXERCTL_MIC_IN,     uSD, uChannel);
+        hdaR3MixerControl(pThis, PDMAUDIOMIXERCTL_MIC_IN,     uSD, uChannel);
 # endif
     }
@@ -2290 +2248 @@
  * @returns VBox status code (not strict).
  */
-DECLHIDDEN(int) hdaR3CodecLookup(PHDACODECCC pThisCC, uint32_t uCmd, uint64_t *puResp)
-{
-    PHDACODEC pThis = &pThisCC->State;
-
+DECLHIDDEN(int) hdaR3CodecLookup(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp)
+{
     /*
      * Clear the return value and assert some sanity.
@@ -2299 +2255 @@
     AssertPtr(puResp);
     *puResp = 0;
-    AssertPtr(pThisCC);
+    AssertPtr(pThis);
     AssertMsgReturn(CODEC_CAD(uCmd) == pThis->id,
                     ("Unknown codec address 0x%x\n", CODEC_CAD(uCmd)),
@@ -2341 +2297 @@
             AssertPtrReturn(g_aCodecVerbs[iCur].pfn, VERR_INTERNAL_ERROR_5); /* Paranoia^2. */
 
-            int rc = g_aCodecVerbs[iCur].pfn(pThis, pThisCC, uCmd, puResp);
+            int rc = g_aCodecVerbs[iCur].pfn(pThis, uCmd, puResp);
             AssertRC(rc);
             Log3Func(("[NID0x%02x] (0x%x) %s: 0x%x -> 0x%x\n",
@@ -2376 +2332 @@
     uint8_t         uLevel;
     /** Pointer to codec state. */
-    PHDACODEC       pThis;
+    PHDACODECR3       pThis;
 } CODECDEBUG;
 /** Pointer to the debug info item printing state for the codec. */
@@ -2578 +2534 @@
  * Worker for hdaR3DbgInfoCodecNodes implementing the 'hdcnodes' info item.
  */
-DECLHIDDEN(void) hdaR3CodecDbgListNodes(PHDACODECR3 pThisCC, PCDBGFINFOHLP pHlp, const char *pszArgs)
-{
-    RT_NOREF(pThisCC, pszArgs);
+DECLHIDDEN(void) hdaR3CodecDbgListNodes(PHDACODECR3 pThis, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    RT_NOREF(pszArgs);
 
     pHlp->pfnPrintf(pHlp, "HDA LINK / INPUTS\n");
@@ -2586 +2542 @@
     CODECDEBUG DbgInfo;
     DbgInfo.pHlp    = pHlp;
-    DbgInfo.pThis   = &pThisCC->State;
+    DbgInfo.pThis   = pThis;
     DbgInfo.uLevel  = 0;
 
@@ -2592 +2548 @@
 
     CODECDBG_INDENT
-        for (uint8_t i = 0; i < pThisCC->State.cTotalNodes; i++)
-        {
-            PCODECNODE pNode = &pThisCC->State.aNodes[i];
+        for (uint8_t i = 0; i < pThis->cTotalNodes; i++)
+        {
+            PCODECNODE pNode = &pThis->aNodes[i];
 
             /* Start with all nodes which have connection entries set. */
@@ -2607 +2563 @@
  * Worker for hdaR3DbgInfoCodecSelector implementing the 'hdcselector' info item.
  */
-DECLHIDDEN(void) hdaR3CodecDbgSelector(PHDACODECR3 pThisCC, PCDBGFINFOHLP pHlp, const char *pszArgs)
-{
-    RT_NOREF(pThisCC, pHlp, pszArgs);
+DECLHIDDEN(void) hdaR3CodecDbgSelector(PHDACODECR3 pThis, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    RT_NOREF(pThis, pHlp, pszArgs);
 }
 
 
 #if 0 /* unused */
-static DECLCALLBACK(void) stac9220DbgNodes(PHDACODEC pThis, PCDBGFINFOHLP pHlp, const char *pszArgs)
+static DECLCALLBACK(void) stac9220DbgNodes(PHDACODECR3 pThis, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
     RT_NOREF(pszArgs);
@@ -2636 +2592 @@
 *********************************************************************************************************************************/
 
-int hdaR3CodecAddStream(PHDACODECR3 pThisCC, PDMAUDIOMIXERCTL enmMixerCtl, PPDMAUDIOSTREAMCFG pCfg)
-{
-    AssertPtrReturn(pThisCC, VERR_INVALID_POINTER);
+int hdaR3CodecAddStream(PHDACODECR3 pThis, PDMAUDIOMIXERCTL enmMixerCtl, PPDMAUDIOSTREAMCFG pCfg)
+{
+    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
     AssertPtrReturn(pCfg,  VERR_INVALID_POINTER);
 
@@ -2666 +2622 @@
 
     if (RT_SUCCESS(rc))
-        rc = hdaR3MixerAddStream(pThisCC, enmMixerCtl, pCfg);
+        rc = hdaR3MixerAddStream(pThis, enmMixerCtl, pCfg);
 
     LogFlowFuncLeaveRC(rc);
@@ -2673 +2629 @@
 
 
-int hdaR3CodecRemoveStream(PHDACODECR3 pThisCC, PDMAUDIOMIXERCTL enmMixerCtl, bool fImmediate)
-{
-    AssertPtrReturn(pThisCC, VERR_INVALID_POINTER);
-
-    int rc = hdaR3MixerRemoveStream(pThisCC, enmMixerCtl, fImmediate);
+int hdaR3CodecRemoveStream(PHDACODECR3 pThis, PDMAUDIOMIXERCTL enmMixerCtl, bool fImmediate)
+{
+    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
+
+    int rc = hdaR3MixerRemoveStream(pThis, enmMixerCtl, fImmediate);
 
     LogFlowFuncLeaveRC(rc);
@@ -2689 +2645 @@
  * @returns VBox status code.
  * @param   pDevIns             The device instance of the HDA device.
- * @param   pThisCC             The codec instance data.
+ * @param   pThis               The codec instance data.
  * @param   pSSM                The saved state handle.
  */
-int hdaCodecSaveState(PPDMDEVINS pDevIns, PHDACODECR3 pThisCC, PSSMHANDLE pSSM)
-{
-    PHDACODEC       pThis   = &pThisCC->State;
-    PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
+int hdaCodecSaveState(PPDMDEVINS pDevIns, PHDACODECR3 pThis, PSSMHANDLE pSSM)
+{
+    PCPDMDEVHLPR3 pHlp = pDevIns->pHlpR3;
     AssertLogRelMsgReturn(pThis->cTotalNodes == STAC9221_NUM_NODES, ("cTotalNodes=%#x, should be 0x1c", pThis->cTotalNodes),
                           VERR_INTERNAL_ERROR);
@@ -2711 +2666 @@
  * @returns VBox status code.
  * @param   pDevIns             The device instance of the HDA device.
- * @param   pThisCC             The codec instance data.
+ * @param   pThis               The codec instance data.
  * @param   pSSM                The saved state handle.
  * @param   uVersion            The state version.
  */
-int hdaR3CodecLoadState(PPDMDEVINS pDevIns, PHDACODECR3 pThisCC, PSSMHANDLE pSSM, uint32_t uVersion)
-{
-    PHDACODEC       pThis   = &pThisCC->State;
+int hdaR3CodecLoadState(PPDMDEVINS pDevIns, PHDACODECR3 pThis, PSSMHANDLE pSSM, uint32_t uVersion)
+{
     PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
     PCSSMFIELD      pFields = NULL;
@@ -2766 +2720 @@
     {
         pNode = &pThis->aNodes[pThis->u8DacLineOut];
-        hdaR3CodecToAudVolume(pThisCC, pNode, &pNode->dac.B_params, PDMAUDIOMIXERCTL_FRONT);
+        hdaR3CodecToAudVolume(pThis, pNode, &pNode->dac.B_params, PDMAUDIOMIXERCTL_FRONT);
     }
     else if (hdaCodecIsSpdifOutNode(pThis, pThis->u8DacLineOut))
     {
         pNode = &pThis->aNodes[pThis->u8DacLineOut];
-        hdaR3CodecToAudVolume(pThisCC, pNode, &pNode->spdifout.B_params, PDMAUDIOMIXERCTL_FRONT);
+        hdaR3CodecToAudVolume(pThis, pNode, &pNode->spdifout.B_params, PDMAUDIOMIXERCTL_FRONT);
     }
 
     pNode = &pThis->aNodes[pThis->u8AdcVolsLineIn];
-    hdaR3CodecToAudVolume(pThisCC, pNode, &pNode->adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
+    hdaR3CodecToAudVolume(pThis, pNode, &pNode->adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
 
     LogFlowFuncLeaveRC(VINF_SUCCESS);
@@ -2785 +2739 @@
  * Powers off the codec (ring-3).
  *
- * @param   pThisCC     The codec data.
- */
-void hdaR3CodecPowerOff(PHDACODECR3 pThisCC)
+ * @param   pThis       The codec data.
+ */
+void hdaR3CodecPowerOff(PHDACODECR3 pThis)
 {
     LogFlowFuncEnter();
     LogRel2(("HDA: Powering off codec ...\n"));
 
-    int rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_FRONT, true /*fImmediate*/);
+    int rc2 = hdaR3CodecRemoveStream(pThis, PDMAUDIOMIXERCTL_FRONT, true /*fImmediate*/);
     AssertRC(rc2);
 #ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
-    rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_CENTER_LFE, true /*fImmediate*/);
+    rc2 = hdaR3CodecRemoveStream(pThis, PDMAUDIOMIXERCTL_CENTER_LFE, true /*fImmediate*/);
     AssertRC(rc2);
-    rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_REAR, true /*fImmediate*/);
+    rc2 = hdaR3CodecRemoveStream(pThis, PDMAUDIOMIXERCTL_REAR, true /*fImmediate*/);
     AssertRC(rc2);
 #endif
 
 #ifdef VBOX_WITH_AUDIO_HDA_MIC_IN
-    rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_MIC_IN, true /*fImmediate*/);
+    rc2 = hdaR3CodecRemoveStream(pThis, PDMAUDIOMIXERCTL_MIC_IN, true /*fImmediate*/);
     AssertRC(rc2);
 #endif
-    rc2 = hdaR3CodecRemoveStream(pThisCC, PDMAUDIOMIXERCTL_LINE_IN, true /*fImmediate*/);
+    rc2 = hdaR3CodecRemoveStream(pThis, PDMAUDIOMIXERCTL_LINE_IN, true /*fImmediate*/);
     AssertRC(rc2);
 }
@@ -2815 +2769 @@
  * @returns VBox status code.
  * @param   pDevIns     The associated device instance.
- * @param   pThisCC     The codec data.
+ * @param   pThis       The codec data.
  * @param   uLUN        Device LUN to assign.
  * @param   pCfg        CFGM node to use for configuration.
  */
-int hdaR3CodecConstruct(PPDMDEVINS pDevIns, PHDACODECR3 pThisCC, uint16_t uLUN, PCFGMNODE pCfg)
+int hdaR3CodecConstruct(PPDMDEVINS pDevIns, PHDACODECR3 pThis, uint16_t uLUN, PCFGMNODE pCfg)
 {
     AssertPtrReturn(pDevIns, VERR_INVALID_POINTER);
-    AssertPtrReturn(pThisCC, VERR_INVALID_POINTER);
+    AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
     AssertPtrReturn(pCfg,    VERR_INVALID_POINTER);
-    PHDACODEC pThis = &pThisCC->State;
 
     pThis->id      = uLUN;
@@ -2849 +2802 @@
      */
     PCODECNODE pNode = &pThis->aNodes[pThis->u8DacLineOut];
-    rc = hdaR3CodecToAudVolume(pThisCC, pNode, &pNode->dac.B_params, PDMAUDIOMIXERCTL_FRONT);
+    rc = hdaR3CodecToAudVolume(pThis, pNode, &pNode->dac.B_params, PDMAUDIOMIXERCTL_FRONT);
     AssertRCReturn(rc, rc);
 
     pNode = &pThis->aNodes[pThis->u8AdcVolsLineIn];
-    rc = hdaR3CodecToAudVolume(pThisCC, pNode, &pNode->adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
+    rc = hdaR3CodecToAudVolume(pThis, pNode, &pNode->adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
     AssertRCReturn(rc, rc);
 
@@ -2875 +2828 @@
  * Destructs a codec.
  *
- * @param   pThisCC     Codec to destruct.
- */
-void hdaCodecDestruct(PHDACODECR3 pThisCC)
+ * @param   pThis       Codec to destruct.
+ */
+void hdaCodecDestruct(PHDACODECR3 pThis)
 {
     LogFlowFuncEnter();
 
     /* Nothing to do here atm. */
-    RT_NOREF(pThisCC);
+    RT_NOREF(pThis);
 }
 
@@ -2889 +2842 @@
  * Resets a codec.
  *
- * @param   pThisCC     Codec to reset.
- */
-void hdaCodecReset(PHDACODECR3 pThisCC)
-{
-    switch (pThisCC->State.enmType)
+ * @param   pThis       Codec to reset.
+ */
+void hdaCodecReset(PHDACODECR3 pThis)
+{
+    switch (pThis->enmType)
     {
         case CODECTYPE_STAC9220:
-            stac9220Reset(&pThisCC->State);
+            stac9220Reset(pThis);
             break;
 

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

@@ -30 +30 @@
 
 
-/** The ICH HDA (Intel) common codec state. */
-typedef struct HDACODEC *PHDACODEC;
 /** The ICH HDA (Intel) ring-3 codec state. */
 typedef struct HDACODECR3 *PHDACODECR3;
-#ifdef IN_RING3 /* (A leftover from attempt at running the codec in ring-0.  Deemed unsafe
-                    and not a help with performance when it mattered.) */
-/** The ICH HDA (Intel) current context codec state. */
-typedef CTX_SUFF(PHDACODEC) PHDACODECCC;
-#endif
 
 /**
@@ -798 +791 @@
 
 /**
- * HDA codec state (shared).
+ * HDA codec state (ring-3, no shared state).
  */
-typedef struct HDACODEC
+typedef struct HDACODECR3
 {
     /** Codec implementation type. */
@@ -837 +830 @@
 
     STAMCOUNTER StatLookupsR3;
-#if 0 /* Codec is not yet kosher enough for ring-0.  @bugref{9890c64} */
-    STAMCOUNTER StatLookupsR0;
-#endif
-} HDACODEC;
-
-
-/**
- * HDA codec state (ring-3).
- */
-typedef struct HDACODECR3
-{
-    /** The state (was shared with ring-0 for a while). */
-    HDACODEC                State;
 } HDACODECR3;
+
 
 /** @name HDA Codec API used by the device emulation.
  * @{ */
-int     hdaR3CodecConstruct(PPDMDEVINS pDevIns, PHDACODECR3 pThisCC, uint16_t uLUN, PCFGMNODE pCfg);
-void    hdaR3CodecPowerOff(PHDACODECR3 pThisCC);
-int     hdaR3CodecLoadState(PPDMDEVINS pDevIns, PHDACODECR3 pThisCC, PSSMHANDLE pSSM, uint32_t uVersion);
-int     hdaR3CodecAddStream(PHDACODECR3 pThisCC, PDMAUDIOMIXERCTL enmMixerCtl, PPDMAUDIOSTREAMCFG pCfg);
-int     hdaR3CodecRemoveStream(PHDACODECR3 pThisCC, PDMAUDIOMIXERCTL enmMixerCtl, bool fImmediate);
-
-int     hdaCodecSaveState(PPDMDEVINS pDevIns, PHDACODECR3 pThisCC, PSSMHANDLE pSSM);
-void    hdaCodecDestruct(PHDACODECR3 pThisCC);
-void    hdaCodecReset(PHDACODECR3 pThisCC);
-
-DECLHIDDEN(int)  hdaR3CodecLookup(PHDACODECR3 pThisCC, uint32_t uCmd, uint64_t *puResp);
-DECLHIDDEN(void) hdaR3CodecDbgListNodes(PHDACODECR3 pThisCC, PCDBGFINFOHLP pHlp, const char *pszArgs);
-DECLHIDDEN(void) hdaR3CodecDbgSelector(PHDACODECR3 pThisCC, PCDBGFINFOHLP pHlp, const char *pszArgs);
+int     hdaR3CodecConstruct(PPDMDEVINS pDevIns, PHDACODECR3 pThis, uint16_t uLUN, PCFGMNODE pCfg);
+void    hdaR3CodecPowerOff(PHDACODECR3 pThis);
+int     hdaR3CodecLoadState(PPDMDEVINS pDevIns, PHDACODECR3 pThis, PSSMHANDLE pSSM, uint32_t uVersion);
+int     hdaR3CodecAddStream(PHDACODECR3 pThis, PDMAUDIOMIXERCTL enmMixerCtl, PPDMAUDIOSTREAMCFG pCfg);
+int     hdaR3CodecRemoveStream(PHDACODECR3 pThis, PDMAUDIOMIXERCTL enmMixerCtl, bool fImmediate);
+
+int     hdaCodecSaveState(PPDMDEVINS pDevIns, PHDACODECR3 pThis, PSSMHANDLE pSSM);
+void    hdaCodecDestruct(PHDACODECR3 pThis);
+void    hdaCodecReset(PHDACODECR3 pThis);
+
+DECLHIDDEN(int)  hdaR3CodecLookup(PHDACODECR3 pThis, uint32_t uCmd, uint64_t *puResp);
+DECLHIDDEN(void) hdaR3CodecDbgListNodes(PHDACODECR3 pThis, PCDBGFINFOHLP pHlp, const char *pszArgs);
+DECLHIDDEN(void) hdaR3CodecDbgSelector(PHDACODECR3 pThis, PCDBGFINFOHLP pHlp, const char *pszArgs);
 /** @} */