儲存庫 vbox 的更動 75866

時間撮記:

2018-12-2 上午01:30:48 (6 年 以前)

作者:

vboxsync

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

127070

訊息:

DevHDA: nit

位置:

trunk/src/VBox/Devices/Audio

檔案:

• DevHDA.cpp (修改) (6 筆差異)
• DevHDACommon.cpp (修改) (3 筆差異)
• DevHDACommon.h (修改) (1 筆差異)
• HDAStream.cpp (修改) (2 筆差異)

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

@@ -481 +481 @@
 static SSMFIELD const g_aSSMBDLEDescFields7[] =
 {
-    SSMFIELD_ENTRY(HDABDLEDESC, u64BufAdr),
+    SSMFIELD_ENTRY(HDABDLEDESC, u64BufAddr),
     SSMFIELD_ENTRY(HDABDLEDESC, u32BufSize),
     SSMFIELD_ENTRY(HDABDLEDESC, fFlags),
@@ -3597 +3597 @@
 
         Assert(curBDLE.Desc.u32BufSize == pBDLE->Desc.u32BufSize);
-        Assert(curBDLE.Desc.u64BufAdr  == pBDLE->Desc.u64BufAdr);
+        Assert(curBDLE.Desc.u64BufAddr  == pBDLE->Desc.u64BufAddr);
         Assert(curBDLE.Desc.fFlags     == pBDLE->Desc.fFlags);
     }
     else
     {
-        Assert(pBDLE->Desc.u64BufAdr  == 0);
+        Assert(pBDLE->Desc.u64BufAddr  == 0);
         Assert(pBDLE->Desc.u32BufSize == 0);
     }
@@ -3857 +3857 @@
         rc = SSMR3Skip(pSSM, sizeof(uint32_t));        /* Begin marker */   \
         AssertRCReturn(rc, rc);                                             \
-        rc = SSMR3GetU64(pSSM, &x.Desc.u64BufAdr);     /* u64BdleCviAddr */ \
+        rc = SSMR3GetU64(pSSM, &x.Desc.u64BufAddr);     /* u64BdleCviAddr */ \
         AssertRCReturn(rc, rc);                                             \
         rc = SSMR3Skip(pSSM, sizeof(uint32_t));        /* u32BdleMaxCvi */  \
@@ -4017 +4017 @@
                     AssertRC(rc);
                     Assert(uMarker == UINT32_C(0x19200102) /* SSMR3STRUCT_BEGIN */);
-                    rc = SSMR3GetU64(pSSM, &pStream->State.BDLE.Desc.u64BufAdr);
+                    rc = SSMR3GetU64(pSSM, &pStream->State.BDLE.Desc.u64BufAddr);
                     AssertRC(rc);
                     rc = SSMR3GetU32(pSSM, &pStream->State.BDLE.Desc.u32BufSize);
@@ -4270 +4270 @@
                        "BDLE(idx:%RU32, off:%RU32, fifow:%RU32, IOC:%RTbool, DMA[%RU32 bytes @ 0x%x])",
                        pBDLE->State.u32BDLIndex, pBDLE->State.u32BufOff, pBDLE->State.cbBelowFIFOW,
-                       pBDLE->Desc.fFlags & HDA_BDLE_FLAG_IOC, pBDLE->Desc.u32BufSize, pBDLE->Desc.u64BufAdr);
+                       pBDLE->Desc.fFlags & HDA_BDLE_FLAG_IOC, pBDLE->Desc.u32BufSize, pBDLE->Desc.u64BufAddr);
 }
 
@@ -4423 +4423 @@
 
         pHlp->pfnPrintf(pHlp, "\t\t%s #%03d BDLE(adr:0x%llx, size:%RU32, ioc:%RTbool)\n",
-                        pBDLE->State.u32BDLIndex == i ? "*" : " ", i, bd.u64BufAdr, bd.u32BufSize, bd.fFlags & HDA_BDLE_FLAG_IOC);
+                        pBDLE->State.u32BDLIndex == i ? "*" : " ", i, bd.u64BufAddr, bd.u32BufSize, bd.fFlags & HDA_BDLE_FLAG_IOC);
 
         cbBDLE += bd.u32BufSize;

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

@@ -318 +318 @@
 # endif
 
-    RTGCPHYS addrChunk = pBDLE->Desc.u64BufAdr + pBDLE->State.u32BufOff;
+    RTGCPHYS addrChunk = pBDLE->Desc.u64BufAddr + pBDLE->State.u32BufOff;
 
     while (cbLeft)
@@ -396 +396 @@
     uint32_t cbLeft = RT_MIN(cbBuf, pBDLE->Desc.u32BufSize - pBDLE->State.u32BufOff);
 
-    RTGCPHYS addrChunk = pBDLE->Desc.u64BufAdr + pBDLE->State.u32BufOff;
+    RTGCPHYS addrChunk = pBDLE->Desc.u64BufAddr + pBDLE->State.u32BufOff;
 
     while (cbLeft)
@@ -576 +576 @@
 
         LogFunc(("\t#%03d BDLE(adr:0x%llx, size:%RU32, ioc:%RTbool)\n",
-                 i, bd.u64BufAdr, bd.u32BufSize, bd.fFlags & HDA_BDLE_FLAG_IOC));
+                 i, bd.u64BufAddr, bd.u32BufSize, bd.fFlags & HDA_BDLE_FLAG_IOC));
 
         cbBDLE += bd.u32BufSize;

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

@@ -550 +550 @@
 {
     /** Starting address of the actual buffer. Must be 128-bit aligned. */
-    uint64_t     u64BufAdr;
+    uint64_t     u64BufAddr;
     /** Size of the actual buffer (in bytes). */
     uint32_t     u32BufSize;

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

@@ -1554 +1554 @@
 
             /* Is the current range a direct neighbor of the current BLDE? */
-            if ((pRange->uAddr + pRange->uSize) == BDLE.Desc.u64BufAdr)
+            if ((pRange->uAddr + pRange->uSize) == BDLE.Desc.u64BufAddr)
             {
                 /* Expand the current range by the current BDLE's size. */
@@ -1572 +1572 @@
             pRange = &arrRanges[cRanges];
 
-            pRange->uAddr = BDLE.Desc.u64BufAdr;
+            pRange->uAddr = BDLE.Desc.u64BufAddr;
             pRange->uSize = BDLE.Desc.u32BufSize;