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

Timestamp:

Feb 11, 2013 8:04:41 PM (12 years ago)

Author:

vboxsync

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

83733

Message:

DevIchIntelHDA.cpp: uint64_t constants are not ULL suffixed but wrapped in UINT64_C(). Fixed some doxygen todos.

File:

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

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

@@ -587 +587 @@
     { 0x00050, 0x00004, 0xFFFFFF80, 0xFFFFFF80, hdaRegReadU32          , hdaRegWriteBase         , "RIRBLBASE" , "RIRB Lower Base Address" },
     { 0x00054, 0x00004, 0xFFFFFFFF, 0xFFFFFFFF, hdaRegReadU32          , hdaRegWriteBase         , "RIRBUBASE" , "RIRB Upper Base Address" },
-    { 0x00058, 0x00002, 0x000000FF, 0x00008000, hdaRegReadU8,            hdaRegWriteRIRBWP       , "RIRBWP"    , "RIRB Write Pointer" },
+    { 0x00058, 0x00002, 0x000000FF, 0x00008000, hdaRegReadU8           , hdaRegWriteRIRBWP       , "RIRBWP"    , "RIRB Write Pointer" },
     { 0x0005A, 0x00002, 0x000000FF, 0x000000FF, hdaRegReadU16          , hdaRegWriteU16          , "RINTCNT"   , "Response Interrupt Count" },
     { 0x0005C, 0x00001, 0x00000007, 0x00000007, hdaRegReadU8           , hdaRegWriteU8           , "RIRBCTL"   , "RIRB Control" },
@@ -796 +796 @@
     {
 #ifdef DEBUG_vvl
-            Assert(   idxHigh >= 0
-                   && idxLow  >= 0);
+        Assert(   idxHigh >= 0
+               && idxLow  >= 0);
 #endif
-            if (   idxHigh < idxLow
-                || idxHigh < 0)
-                break;
-            int idxMiddle = idxLow + (idxHigh - idxLow) / 2;
-            if (offReg < g_aIchIntelHDRegMap[idxMiddle].offset)
-                idxHigh = idxMiddle - 1;
-            else if (offReg >= g_aIchIntelHDRegMap[idxMiddle].offset + g_aIchIntelHDRegMap[idxMiddle].size)
-                idxLow  = idxMiddle + 1;
-            else if (   offReg >= g_aIchIntelHDRegMap[idxMiddle].offset
-                     && offReg < g_aIchIntelHDRegMap[idxMiddle].offset + g_aIchIntelHDRegMap[idxMiddle].size)
-                return idxMiddle;
+        if (   idxHigh < idxLow
+            || idxHigh < 0)
+            break;
+        int idxMiddle = idxLow + (idxHigh - idxLow) / 2;
+        if (offReg < g_aIchIntelHDRegMap[idxMiddle].offset)
+            idxHigh = idxMiddle - 1;
+        else if (offReg >= g_aIchIntelHDRegMap[idxMiddle].offset + g_aIchIntelHDRegMap[idxMiddle].size)
+            idxLow  = idxMiddle + 1;
+        else if (   offReg >= g_aIchIntelHDRegMap[idxMiddle].offset
+                 && offReg <  g_aIchIntelHDRegMap[idxMiddle].offset + g_aIchIntelHDRegMap[idxMiddle].size)
+            return idxMiddle;
     }
     return -1;
@@ -1362 +1362 @@
 {
 #ifdef VBOX_WITH_HDA_CODEC_EMU
-    /* @todo a bit more investigation is required here. */
+    /** @todo a bit more investigation is required here. */
     int rc = 0;
     audsettings_t as;
@@ -1477 +1477 @@
     {
         case ICH6_HDA_REG_CORBLBASE:
-            pThis->u64CORBBase &= 0xFFFFFFFF00000000ULL;
+            pThis->u64CORBBase &= UINT64_C(0xFFFFFFFF00000000);
             pThis->u64CORBBase |= pThis->au32Regs[iReg];
             break;
         case ICH6_HDA_REG_CORBUBASE:
-            pThis->u64CORBBase &= 0x00000000FFFFFFFFULL;
+            pThis->u64CORBBase &= UINT64_C(0x00000000FFFFFFFF);
             pThis->u64CORBBase |= ((uint64_t)pThis->au32Regs[iReg] << 32);
             break;
         case ICH6_HDA_REG_RIRLBASE:
-            pThis->u64RIRBBase &= 0xFFFFFFFF00000000ULL;
+            pThis->u64RIRBBase &= UINT64_C(0xFFFFFFFF00000000);
             pThis->u64RIRBBase |= pThis->au32Regs[iReg];
             break;
         case ICH6_HDA_REG_RIRUBASE:
-            pThis->u64RIRBBase &= 0x00000000FFFFFFFFULL;
+            pThis->u64RIRBBase &= UINT64_C(0x00000000FFFFFFFF);
             pThis->u64RIRBBase |= ((uint64_t)pThis->au32Regs[iReg] << 32);
             break;
         case ICH6_HDA_REG_DPLBASE:
-            /* @todo: first bit has special meaning */
-            pThis->u64DPBase &= 0xFFFFFFFF00000000ULL;
+            /** @todo: first bit has special meaning */
+            pThis->u64DPBase &= UINT64_C(0xFFFFFFFF00000000);
             pThis->u64DPBase |= pThis->au32Regs[iReg];
             break;
         case ICH6_HDA_REG_DPUBASE:
-            pThis->u64DPBase &= 0x00000000FFFFFFFFULL;
+            pThis->u64DPBase &= UINT64_C(0x00000000FFFFFFFF);
             pThis->u64DPBase |= ((uint64_t)pThis->au32Regs[iReg] << 32);
             break;
@@ -1698 +1698 @@
              && pBdle->fBdleCviIoc)
         {
-            /*
+            /**
              * @todo - more carefully investigate BCIS flag.
              * Speech synthesis works fine on Mac Guest if this bit isn't set
@@ -2432 +2432 @@
                                 N_ ("Invalid configuration for the Intel HDA device"));
 
-    // ** @todo r=michaln: This device may need R0/RC enabling, especially if guests
-    // poll some register(pThis).
+    /// @todo r=michaln: This device may need R0/RC enabling, especially if guests
+    /// poll some register(pThis).
 
     /*