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

Timestamp:

Feb 11, 2013 8:07:44 PM (12 years ago)

Author:

vboxsync

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

83734

Message:

DevIchIntelHDA.cpp: Last batch of cleanups.

File:

• trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp (modified) (16 diffs)

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

@@ -435 +435 @@
 } HDASTREAMTRANSFERDESC, *PHDASTREAMTRANSFERDESC;
 
-typedef struct INTELHDLinkState
+/**
+ * ICH Intel HD Audio Controller state.
+ */
+typedef struct HDASTATE
 {
     /** The PCI device structure. */
@@ -471 +474 @@
     uint8_t                 u8Counter;
     uint64_t                u64BaseTS;
-} INTELHDLinkState, *PINTELHDLinkState;
-/** ICH Intel HD Audio Controller state. */
-typedef INTELHDLinkState HDASTATE;
+} HDASTATE;
 /** Pointer to the ICH Intel HD Audio Controller state. */
 typedef HDASTATE *PHDASTATE;
-
-#define ICH6_HDASTATE_2_DEVINS(pINTELHD)   ((pINTELHD)->pDevIns)
-#define PCIDEV_2_ICH6_HDASTATE(pPciDev) ((PHDASTATE)(pPciDev))
 
 #define ISD0FMT_TO_AUDIO_SELECTOR(pThis) \
@@ -720 +718 @@
 {
     if (pThis->u64DPBase & DPBASE_ENABLED)
-        PDMDevHlpPhysWrite(ICH6_HDASTATE_2_DEVINS(pThis),
+        PDMDevHlpPhysWrite(pThis->pDevIns,
                            (pThis->u64DPBase & DPBASE_ADDR_MASK) + pStreamDesc->u8Strm * 8,
                            pStreamDesc->pu32Lpib, sizeof(uint32_t));
@@ -758 +756 @@
     {
         Log(("hda: irq %s\n", fIrq ? "asserted" : "deasserted"));
-        PDMDevHlpPCISetIrq(ICH6_HDASTATE_2_DEVINS(pThis), 0 , fIrq);
+        PDMDevHlpPCISetIrq(pThis->pDevIns, 0 , fIrq);
     }
     return VINF_SUCCESS;
@@ -820 +818 @@
     {
         Assert((HDA_REG_FLAG_VALUE(pThis, CORBCTL, DMA)));
-        rc = PDMDevHlpPhysRead(ICH6_HDASTATE_2_DEVINS(pThis), pThis->u64CORBBase, pThis->pu32CorbBuf, pThis->cbCorbBuf);
+        rc = PDMDevHlpPhysRead(pThis->pDevIns, pThis->u64CORBBase, pThis->pu32CorbBuf, pThis->cbCorbBuf);
         if (RT_FAILURE(rc))
             AssertRCReturn(rc, rc);
@@ -849 +847 @@
     {
         Assert((HDA_REG_FLAG_VALUE(pThis, RIRBCTL, DMA)));
-        rc = PDMDevHlpPhysWrite(ICH6_HDASTATE_2_DEVINS(pThis), pThis->u64RIRBBase, pThis->pu64RirbBuf, pThis->cbRirbBuf);
+        rc = PDMDevHlpPhysWrite(pThis->pDevIns, pThis->u64RIRBBase, pThis->pu64RirbBuf, pThis->cbRirbBuf);
         if (RT_FAILURE(rc))
             AssertRCReturn(rc, rc);
@@ -1053 +1051 @@
                 HDA_REG_FLAG_VALUE(pThis, RIRBCTL, DMA) ? "on" : "off"));
         }
-        hdaReset(ICH6_HDASTATE_2_DEVINS(pThis));
+        hdaReset(pThis->pDevIns);
         GCTL(pThis) &= ~HDA_REG_FIELD_FLAG_MASK(GCTL, RST);
         pThis->fInReset = true;
@@ -1103 +1101 @@
 {
     /* HDA spec (1a): 3.3.16 WALCLK counter ticks with 24Mhz bitclock rate. */
-    *pu32Value = (uint32_t)ASMMultU64ByU32DivByU32(PDMDevHlpTMTimeVirtGetNano(ICH6_HDASTATE_2_DEVINS(pThis))
+    *pu32Value = (uint32_t)ASMMultU64ByU32DivByU32(PDMDevHlpTMTimeVirtGetNano(pThis->pDevIns)
                                                    - pThis->u64BaseTS, 24, 1000);
     return VINF_SUCCESS;
@@ -1530 +1528 @@
     for (i = 0; i <= pBdle->u32BdleMaxCvi; ++i)
     {
-        PDMDevHlpPhysRead(ICH6_HDASTATE_2_DEVINS(pThis), u64BaseDMA + i*16, bdle, 16);
+        PDMDevHlpPhysRead(pThis->pDevIns, u64BaseDMA + i*16, bdle, 16);
         addr = *(uint64_t *)bdle;
         len = *(uint32_t *)&bdle[8];
@@ -1540 +1538 @@
     for (i = 0; i < 8; ++i)
     {
-        PDMDevHlpPhysRead(ICH6_HDASTATE_2_DEVINS(pThis), (pThis->u64DPBase & DPBASE_ADDR_MASK) + i*8, &counter, sizeof(&counter));
+        PDMDevHlpPhysRead(pThis->pDevIns, (pThis->u64DPBase & DPBASE_ADDR_MASK) + i*8, &counter, sizeof(&counter));
         Log(("hda: %s stream[%d] counter=%x\n", i == SDCTL_NUM(pThis, 4) || i == SDCTL_NUM(pThis, 0)? "[C]": "   ",
              i , counter));
@@ -1554 +1552 @@
             && pBdle
             && pBdle->u32BdleMaxCvi));
-    PDMDevHlpPhysRead(ICH6_HDASTATE_2_DEVINS(pThis), pStreamDesc->u64BaseDMA + pBdle->u32BdleCvi*16, bdle, 16);
+    PDMDevHlpPhysRead(pThis->pDevIns, pStreamDesc->u64BaseDMA + pBdle->u32BdleCvi*16, bdle, 16);
     pBdle->u64BdleCviAddr = *(uint64_t *)bdle;
     pBdle->u32BdleCviLen = *(uint32_t *)&bdle[8];
@@ -1745 +1743 @@
      * write the HDA DMA buffer
      */
-    PDMDevHlpPhysWrite(ICH6_HDASTATE_2_DEVINS(pThis), pBdle->u64BdleCviAddr + pBdle->u32BdleCviPos, pBdle->au8HdaBuffer, cbBackendCopy);
+    PDMDevHlpPhysWrite(pThis->pDevIns, pBdle->u64BdleCviAddr + pBdle->u32BdleCviPos, pBdle->au8HdaBuffer, cbBackendCopy);
 
     /* Don't see any reason why cb2Copy would differ from cbBackendCopy */
@@ -1784 +1782 @@
     }
 
-    PDMDevHlpPhysRead(ICH6_HDASTATE_2_DEVINS(pThis), pBdle->u64BdleCviAddr + pBdle->u32BdleCviPos, pBdle->au8HdaBuffer + pBdle->cbUnderFifoW, cb2Copy);
+    PDMDevHlpPhysRead(pThis->pDevIns, pBdle->u64BdleCviAddr + pBdle->u32BdleCviPos, pBdle->au8HdaBuffer + pBdle->cbUnderFifoW, cb2Copy);
     /*
      * Write to audio backend. we should ensure that we have enough bytes to copy to the backend.
@@ -1814 +1812 @@
 DECLCALLBACK(int) hdaCodecReset(CODECState *pCodecState)
 {
-    PHDASTATE pThis = (INTELHDLinkState *)pCodecState->pvHDAState;
+    PHDASTATE pThis = (PHDASTATE)pCodecState->pvHDAState;
     return VINF_SUCCESS;
 }
@@ -1851 +1849 @@
 static DECLCALLBACK(void) hdaTransfer(CODECState *pCodecState, ENMSOUNDSOURCE src, int avail)
 {
-    PHDASTATE pThis = (INTELHDLinkState *)pCodecState->pvHDAState;
+    PHDASTATE pThis = (PHDASTATE)pCodecState->pvHDAState;
     uint8_t                 u8Strm = 0;
     PHDABDLEDESC            pBdle = NULL;
@@ -1995 +1993 @@
                                            PCIADDRESSSPACE enmType)
 {
+    PPDMDEVINS  pDevIns = pPciDev->pDevIns;
+    PHDASTATE   pThis = RT_FROM_MEMBER(pPciDev, HDASTATE, PciDev);
+    RTIOPORT    Port = (RTIOPORT)GCPhysAddress;
     int         rc;
-    PPDMDEVINS  pDevIns = pPciDev->pDevIns;
-    RTIOPORT    Port = (RTIOPORT)GCPhysAddress;
-    PHDASTATE pThis = PCIDEV_2_ICH6_HDASTATE(pPciDev);
 
     /* 18.2 of the ICH6 datasheet defines the valid access widths as byte, word, and double word */