Changeset 89847 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 23, 2021 8:47:54 AM (3 years ago)

Author:

vboxsync

Message:

DevHda: Some preprocessor indentation fixes. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DevHdaStream.cpp (modified) (24 diffs)

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

@@ -73 +73 @@
     pStreamShared->State.fInReset = false;
     pStreamShared->State.fRunning = false;
-#ifdef HDA_USE_DMA_ACCESS_HANDLER
+# ifdef HDA_USE_DMA_ACCESS_HANDLER
     RTListInit(&pStreamR3->State.lstDMAHandlers);
-#endif
+# endif
 
     AssertPtr(pStreamR3->pHDAStateR3);
     AssertPtr(pStreamR3->pHDAStateR3->pDevIns);
 
-#ifdef DEBUG
+# ifdef DEBUG
     int rc = RTCritSectInit(&pStreamR3->Dbg.CritSect);
     AssertRCReturn(rc, rc);
-#endif
+# endif
 
     const bool fIsInput = hdaGetDirFromSD(uSD) == PDMAUDIODIR_IN;
@@ -178 +178 @@
     }
 
-#ifdef DEBUG
+# ifdef DEBUG
     if (RTCritSectIsInitialized(&pStreamR3->Dbg.CritSect))
     {
@@ -184 +184 @@
         AssertRC(rc2);
     }
-#endif
+# endif
 
     if (pStreamR3->Dbg.Runtime.fEnabled)
@@ -697 +697 @@
     hdaR3StreamSetPositionAbs(pStreamShared, pDevIns, pThis, HDA_STREAM_REG(pThis, LPIB, uSD));
 
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     hdaR3BDLEDumpAll(pDevIns, pThis, pStreamShared->u64BDLBase, pStreamShared->u16LVI + 1);
-#endif
+# endif
 
     /*
@@ -784 +784 @@
         LogRelMax(32, ("HDA: Initializing stream #%RU8 failed with %Rrc\n", uSD, rc));
 
-#ifdef VBOX_WITH_DTRACE
+# ifdef VBOX_WITH_DTRACE
     VBOXDD_HDA_STREAM_SETUP((uint32_t)uSD, rc, pStreamShared->State.Cfg.Props.uHz,
                             pStreamShared->State.aSchedule[pStreamShared->State.cSchedule - 1].cPeriodTicks,
                             pStreamShared->State.aSchedule[pStreamShared->State.cSchedule - 1].cbPeriod);
-#endif
+# endif
     return rc;
 }
@@ -841 +841 @@
     HDA_STREAM_REG(pThis, BDPL,  uSD) = 0;
 
-#ifdef HDA_USE_DMA_ACCESS_HANDLER
+# ifdef HDA_USE_DMA_ACCESS_HANDLER
     hdaR3StreamUnregisterDMAHandlers(pThis, pStream);
-#endif
+# endif
 
     /* Assign the default mixer sink to the stream. */
@@ -881 +881 @@
     pStreamR3->State.offRead  = 0;
 
-#ifdef DEBUG
+# ifdef DEBUG
     pStreamR3->Dbg.cReadsTotal      = 0;
     pStreamR3->Dbg.cbReadTotal      = 0;
@@ -890 +890 @@
     pStreamR3->Dbg.cbWrittenHz      = 0;
     pStreamR3->Dbg.tsWriteSlotBegin = 0;
-#endif
+# endif
 
     /* Report that we're done resetting this stream. */
     HDA_STREAM_REG(pThis, CTL,   uSD) = 0;
 
-#ifdef VBOX_WITH_DTRACE
+# ifdef VBOX_WITH_DTRACE
     VBOXDD_HDA_STREAM_RESET((uint32_t)uSD);
-#endif
+# endif
     LogFunc(("[SD%RU8] Reset\n", uSD));
 
@@ -1024 +1024 @@
 
 
-#if 0 /* Not used atm. */
+# if 0 /* Not used atm. */
 static uint32_t hdaR3StreamGetPosition(PHDASTATE pThis, PHDASTREAM pStreamShared)
 {
     return HDA_STREAM_REG(pThis, LPIB, pStreamShared->u8SD);
 }
-#endif
+# endif
 
 /**
@@ -1237 +1237 @@
     {
         Log3(("%s: [SD%RU8] BCIS bit set, skipping transfer\n", pszFunction, uSD));
-#ifdef HDA_STRICT
+# ifdef HDA_STRICT
         /* Timing emulation bug or guest is misbehaving -- let me know. */
         AssertMsgFailed(("%s: BCIS bit for stream #%RU8 still set when it shouldn't\n", pszFunction, uSD));
-#endif
+# endif
         return false;
     }
@@ -1436 +1436 @@
                 AssertRC(rc2);
 
-#ifdef HDA_DEBUG_SILENCE
+# ifdef HDA_DEBUG_SILENCE
                 fix me if relevant;
-#endif
+# endif
                 if (RT_LIKELY(!pStreamR3->Dbg.Runtime.fEnabled))
                 { /* likely */ }
@@ -1444 +1444 @@
                     AudioHlpFileWrite(pStreamR3->Dbg.Runtime.pFileDMARaw, pvBufSrc, cbBufSrc, 0 /* fFlags */);
 
-#ifdef VBOX_WITH_DTRACE
+# ifdef VBOX_WITH_DTRACE
                 VBOXDD_HDA_STREAM_DMA_IN((uint32_t)uSD, (uint32_t)cbBufSrc, pStreamR3->State.offRead);
-#endif
+# endif
                 pStreamR3->State.offRead += cbBufSrc;
                 RTCircBufReleaseReadBlock(pCircBuf, cbBufSrc);
@@ -1551 +1551 @@
 static void hdaR3StreamPullFromMixer(PHDASTREAMR3 pStreamR3, PAUDMIXSINK pSink)
 {
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     uint64_t const offWriteOld = pStreamR3->State.offWrite;
-#endif
+# endif
     pStreamR3->State.offWrite = AudioMixerSinkTransferToCircBuf(pSink,
                                                                 pStreamR3->State.pCircBuf,
@@ -1606 +1606 @@
      *
      */
-#if 0
+# if 0
     uint8_t    abBounce[4096 + 128];    /* Most guest does at most 4KB BDLE. So, 4KB + space for a partial frame to reduce loops. */
     uint32_t   cbBounce = 0;            /* in case of incomplete frames between buffer segments */
-#endif
+# endif
     PRTCIRCBUF pCircBuf = pStreamR3->State.pCircBuf;
     uint32_t   cbLeft   = cbToProduce;
@@ -1626 +1626 @@
 
         /* Need to diverge if the BDLEs contain misaligned entries.  */
-#if 0
+# if 0
         if (/** @todo pStreamShared->State.fFrameAlignedBuffers */)
-#endif
+# endif
         {
             if (cbChunk <= cbLeft)
@@ -1649 +1649 @@
                 AssertRC(rc2);
 
-#ifdef HDA_DEBUG_SILENCE
+# ifdef HDA_DEBUG_SILENCE
                 fix me if relevant;
-#endif
+# endif
                 if (RT_LIKELY(!pStreamR3->Dbg.Runtime.fEnabled))
                 { /* likely */ }
@@ -1657 +1657 @@
                     AudioHlpFileWrite(pStreamR3->Dbg.Runtime.pFileDMARaw, pvBufDst, cbBufDst, 0 /* fFlags */);
 
-#ifdef VBOX_WITH_DTRACE
+# ifdef VBOX_WITH_DTRACE
                 VBOXDD_HDA_STREAM_DMA_OUT((uint32_t)uSD, (uint32_t)cbBufDst, pStreamR3->State.offWrite);
-#endif
+# endif
                 pStreamR3->State.offWrite += cbBufDst;
                 RTCircBufReleaseWriteBlock(pCircBuf, cbBufDst);
@@ -1671 +1671 @@
             }
         }
-#if 0
+# if 0
         /*
          * Need to map the frame content, so we need to read the guest data
@@ -1732 +1732 @@
                               offBounce, cFramesToConvert, cbBufDst, ASMMemIsZero(pvBufDst, cbBufDst) ? " all zero" : ""));
 
-# ifdef HDA_DEBUG_SILENCE
+#  ifdef HDA_DEBUG_SILENCE
                     fix me if relevant;
-# endif
+#  endif
                     if (RT_LIKELY(!pStreamR3->Dbg.Runtime.fEnabled))
                     { /* likely */ }
@@ -1760 +1760 @@
             Log5Func(("loop0: GCPhys=%RGp cbBounce=%#x cbLeft=%#x\n", GCPhys, cbBounce, cbLeft));
         }
-#endif
+# endif
 
         STAM_PROFILE_STOP(&pThis->StatOut, a);
@@ -1771 +1771 @@
 
     Assert(cbLeft == 0); /* There shall be no break statements in the above loop, so cbLeft is always zero here! */
-#if 0
+# if 0
     AssertMsg(cbBounce == 0, ("%#x\n", cbBounce));
-#endif
+# endif
 
     /*
@@ -1799 +1799 @@
 static void hdaR3StreamPushToMixer(PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3, PAUDMIXSINK pSink, uint64_t nsNow)
 {
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     uint64_t const offReadOld = pStreamR3->State.offRead;
-#endif
+# endif
     pStreamR3->State.offRead = AudioMixerSinkTransferFromCircBuf(pSink,
                                                                  pStreamR3->State.pCircBuf,
@@ -2197 +2197 @@
 
 
-#if 0 /* unused - no prototype even */
+# if 0 /* unused - no prototype even */
 /**
  * Updates an HDA stream's current read or write buffer position (depending on the stream type) by
@@ -2231 +2231 @@
     return u32LPIB;
 }
-#endif
+# endif
 
 # ifdef HDA_USE_DMA_ACCESS_HANDLER