Changeset 71735 in vbox

Timestamp:

Apr 7, 2018 2:55:31 PM (7 years ago)

Author:

vboxsync

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

121837

Message:

DevHDACommon.cpp: The two hdaProcessInterrupt() prototypes was incorrectly guarded by DEBUG instead of LOG_ENABLED.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (4 diffs)
• DevHDACommon.cpp (modified) (10 diffs)
• DevHDACommon.h (modified) (3 diffs)
• HDAStream.cpp (modified) (1 diff)

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

@@ -591 +591 @@
     LogFunc(("fInterrupt=%RTbool\n", fInterrupt));
 
-# ifndef DEBUG
+# ifndef LOG_ENABLED
     hdaProcessInterrupt(pThis);
 # else
@@ -875 +875 @@
                 HDA_REG(pThis, RIRBSTS) |= HDA_RIRBSTS_RINTFL;
 
-# ifndef DEBUG
+# ifndef LOG_ENABLED
                 rc = hdaProcessInterrupt(pThis);
 # else
@@ -1515 +1515 @@
     }
 
-# ifndef DEBUG
+# ifndef LOG_ENABLED
     hdaProcessInterrupt(pThis);
 # else
@@ -2287 +2287 @@
     HDA_REG(pThis, RIRBSTS) &= ~(v & u32Value);
 
-#ifndef DEBUG
+#ifndef LOG_ENABLED
     int rc = hdaProcessInterrupt(pThis);
 #else

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

@@ -34 +34 @@
 
 
-#ifndef DEBUG
+#ifndef LOG_ENABLED
 /**
  * Processes (de/asserts) the interrupt according to the HDA's current state.
@@ -205 +205 @@
             return &pThis->SinkLineIn;
 # ifdef VBOX_WITH_AUDIO_HDA_MIC_IN
-        else if (uSD == uFirstSDI + 1)
+        if (uSD == uFirstSDI + 1)
             return &pThis->SinkMicIn;
 # else
-        else /* If we don't have a dedicated Mic-In sink, use the always present Line-In sink. */
-            return &pThis->SinkLineIn;
+        /* If we don't have a dedicated Mic-In sink, use the always present Line-In sink. */
+        return &pThis->SinkLineIn;
 # endif
     }
@@ -219 +219 @@
             return &pThis->SinkFront;
 # ifdef VBOX_WITH_AUDIO_HDA_51_SURROUND
-        else if (uSD == uFirstSDO + 1)
+        if (uSD == uFirstSDO + 1)
             return &pThis->SinkCenterLFE;
-        else if (uSD == uFirstSDO + 2)
+        if (uSD == uFirstSDO + 2)
             return &pThis->SinkRear;
 # endif
@@ -311 +311 @@
     uint32_t cbLeft      = RT_MIN(cbBuf, pBDLE->Desc.u32BufSize - pBDLE->State.u32BufOff);
 
-#ifdef HDA_DEBUG_SILENCE
+# ifdef HDA_DEBUG_SILENCE
     uint64_t   csSilence = 0;
 
     pStream->Dbg.cSilenceThreshold = 100;
     pStream->Dbg.cbSilenceReadMin  = _1M;
-#endif
+# endif
 
     RTGCPHYS addrChunk = pBDLE->Desc.u64BufAdr + pBDLE->State.u32BufOff;
@@ -328 +328 @@
             break;
 
-#ifdef HDA_DEBUG_SILENCE
+# ifdef HDA_DEBUG_SILENCE
         uint16_t *pu16Buf = (uint16_t *)pvBuf;
         for (size_t i = 0; i < cbChunk / sizeof(uint16_t); i++)
         {
             if (*pu16Buf == 0)
-            {
                 csSilence++;
-            }
             else
                 break;
             pu16Buf++;
         }
-#endif
+# endif
         if (pStream->Dbg.Runtime.fEnabled)
             DrvAudioHlpFileWrite(pStream->Dbg.Runtime.pFileDMA, (uint8_t *)pvBuf + cbReadTotal, cbChunk, 0 /* fFlags */);
 
-#ifdef VBOX_WITH_STATISTICS
         STAM_COUNTER_ADD(&pThis->StatBytesRead, cbChunk);
-#endif
         addrChunk         = (addrChunk + cbChunk) % pBDLE->Desc.u32BufSize;
 
@@ -355 +351 @@
     }
 
-#ifdef HDA_DEBUG_SILENCE
-
+# ifdef HDA_DEBUG_SILENCE
     if (csSilence)
         pStream->Dbg.csSilence += csSilence;
@@ -367 +362 @@
         pStream->Dbg.csSilence = 0;
     }
-#endif
+# endif
 
     if (RT_SUCCESS(rc))
@@ -418 +413 @@
             break;
 
-#ifdef VBOX_WITH_STATISTICS
         STAM_COUNTER_ADD(&pThis->StatBytesWritten, cbChunk);
-#endif
         addrChunk       = (addrChunk + cbChunk) % pBDLE->Desc.u32BufSize;
 
@@ -495 +488 @@
     AssertPtrReturn(pProps, VERR_INVALID_POINTER);
 
-# define EXTRACT_VALUE(v, mask, shift) ((v & ((mask) << (shift))) >> (shift))
+#define EXTRACT_VALUE(v, mask, shift) ((v & ((mask) << (shift))) >> (shift))
 
     int rc = VINF_SUCCESS;
@@ -563 +556 @@
     }
 
-# undef EXTRACT_VALUE
+#undef EXTRACT_VALUE
     return rc;
 }

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

@@ -20 +20 @@
 
 #include "AudioMixer.h"
+#include <VBox/log.h> /* LOG_ENABLED */
 
 /** See 302349 p 6.2. */
@@ -515 +516 @@
 #define HDA_BDLE_FLAG_IOC           RT_BIT(0)
 
+
 /*********************************************************************************************************************************
 *   Prototypes                                                                                                                 *
@@ -587 +589 @@
  * @{
  */
-#ifdef DEBUG
+#ifdef LOG_ENABLED
 int           hdaProcessInterrupt(PHDASTATE pThis, const char *pszSource);
 #else

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

@@ -1191 +1191 @@
         /* Trigger an interrupt first and let hdaRegWriteSDSTS() deal with
          * ending / beginning a period. */
-#ifndef DEBUG
+#ifndef LOG_ENABLED
         hdaProcessInterrupt(pThis);
 #else