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

Timestamp:

Feb 3, 2021 3:27:46 PM (4 years ago)

Author:

vboxsync

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

142600

Message:

Audio/HDA: Doxygen fix (it doesn't have VBOX_WITH_AUDIO_HDA_ASYNC_IO defined and got confused by unbalanced {} #ifdefs).

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (1 diff)
• DevHDACommon.h (modified) (1 diff)
• HDAStream.cpp (modified) (7 diffs)

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

@@ -4487 +4487 @@
  * @param   pThis       The shared HDA device state.
  * @param   pThisCC     The ring-3 HDA device state.
- * @param   pThis       Device instance.
  * @param   iLun        The logical unit which is being replaced.
  */

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

@@ -625 +625 @@
 /** @} */
 
-/** @name Register utility functions. */
+/** @name Register utility functions.
+ * @{  */
 uint8_t       hdaSDFIFOWToBytes(uint16_t u16RegFIFOW);
 /** @} */

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

@@ -1582 +1582 @@
 /**
  * Updates a HDA stream by doing its required data transfers.
+ *
  * The host sink(s) set the overall pace.
- *
- * This routine is called by both, the synchronous and the asynchronous, implementations.
  *
  * This routine is called by both, the synchronous and the asynchronous
@@ -1628 +1627 @@
 # endif
         {
-
             uint32_t cbStreamFree = hdaR3StreamGetFree(pStreamR3);
             if (!cbStreamFree)
@@ -1659 +1657 @@
                 pStreamShared->State.tsLastUpdateNs = tsNowNs;
             }
-
-# ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
         }
-# endif
         Log3Func(("[SD%RU8] fInTimer=%RTbool, tsLastUpdateNs=%RU64, fDoRead=%RTbool\n",
                   pStreamShared->u8SD, fInTimer, pStreamShared->State.tsLastUpdateNs, fDoRead));
@@ -1676 +1671 @@
 # ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
         if (!fInTimer) /* In async I/O thread */
-        {
 # else
         if (fDoRead)
+# endif
         {
-# endif
             const uint32_t cbSinkWritable     = AudioMixerSinkGetWritable(pSink);
             const uint32_t cbStreamReadable   = hdaR3StreamGetUsed(pStreamR3);
@@ -1706 +1700 @@
 # ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
         if (!fInTimer)
+# endif
         {
-# endif
             rc2 = AudioMixerSinkUpdate(pSink);
             AssertRC(rc2);
@@ -1751 +1745 @@
                 }
             }
+        }
 # ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
-        }
         else /* fInTimer */
+# endif
         {
-# endif
-
 # ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
             const uint64_t tsNowNs = RTTimeNanoTS();
@@ -1773 +1766 @@
                 AssertRC(rc2);
             }
-# ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
         }
-# endif
     }
 }