Changeset 88724 in vbox for trunk/include/VBox

Timestamp:

Apr 27, 2021 10:24:18 AM (4 years ago)

Author:

vboxsync

Message:

Audio: PDMAUDIOSTREAMSTS_FLAGS_XXX -> PDMAUDIOSTREAM_STS_XXX. bugref:9890

Location:

trunk/include/VBox/vmm

Files:

• pdmaudioifs.h (modified) (6 diffs)
• pdmaudioinline.h (modified) (3 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -899 +899 @@
 
 
-/** @name PDMAUDIOSTREAMSTS_FLAGS_XXX
+/** @name PDMAUDIOSTREAM_STS_XXX
  * @{ */
 /** No flags being set. */
-#define PDMAUDIOSTREAMSTS_FLAGS_NONE            UINT32_C(0)
+#define PDMAUDIOSTREAM_STS_NONE             UINT32_C(0)
 /** Whether this stream has been initialized by the backend or not. */
-#define PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED     RT_BIT_32(0)
+#define PDMAUDIOSTREAM_STS_INITIALIZED      RT_BIT_32(0)
 /** Whether this stream is enabled or disabled. */
-#define PDMAUDIOSTREAMSTS_FLAGS_ENABLED         RT_BIT_32(1)
+#define PDMAUDIOSTREAM_STS_ENABLED          RT_BIT_32(1)
 /** Whether this stream has been paused or not. This also implies
  *  that this is an enabled stream! */
-#define PDMAUDIOSTREAMSTS_FLAGS_PAUSED          RT_BIT_32(2)
+#define PDMAUDIOSTREAM_STS_PAUSED           RT_BIT_32(2)
 /** Indicates that the stream is draining (output only).
  *  Whether this stream was marked as being disabled
  *  but there are still associated guest output streams
  *  which rely on its data. */
-#define PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE RT_BIT_32(3)
+#define PDMAUDIOSTREAM_STS_PENDING_DISABLE  RT_BIT_32(3)
 /** Whether this stream is in re-initialization phase and requires the device
  *  to call pfnStreamReInit.
@@ -920 +920 @@
  *  All other bits remain untouched to be able to restore the stream's state
  *  after the re-initialization has been completed. */
-#define PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT     RT_BIT_32(4)
+#define PDMAUDIOSTREAM_STS_NEED_REINIT      RT_BIT_32(4)
 /** Validation mask. */
-#define PDMAUDIOSTREAMSTS_VALID_MASK            UINT32_C(0x0000001F)
-/** Stream status flag, PDMAUDIOSTREAMSTS_FLAGS_XXX. */
-typedef uint32_t PDMAUDIOSTREAMSTS;
+#define PDMAUDIOSTREAM_STS_VALID_MASK       UINT32_C(0x0000001F)
+/** Stream status flag, PDMAUDIOSTREAM_STS_XXX. */
+typedef uint32_t uint32_t;
 /** @} */
 
@@ -975 +975 @@
     uint32_t volatile       cRefs;
     /** Stream status flag. */
-    PDMAUDIOSTREAMSTS       fStatus;
+    uint32_t       fStatus;
     /** Audio direction of this stream. */
     PDMAUDIODIR             enmDir;
@@ -1092 +1092 @@
 
     /**
-     * Re-initializes the stream in response to PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT.
+     * Re-initializes the stream in response to PDMAUDIOSTREAM_STS_NEED_REINIT.
      *
      * @returns VBox status code.
@@ -1162 +1162 @@
      * @param   pStream         Pointer to audio stream.
      */
-    DECLR3CALLBACKMEMBER(PDMAUDIOSTREAMSTS, pfnStreamGetStatus, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream));
+    DECLR3CALLBACKMEMBER(uint32_t, pfnStreamGetStatus, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream));
 
     /**
@@ -1375 +1375 @@
      * Returns the current status of the given backend stream.
      *
-     * @returns PDMAUDIOSTREAMSTS
+     * @returns uint32_t
      * @param   pInterface          Pointer to the interface structure containing the called function pointer.
      * @param   pStream             Pointer to audio stream.
      */
-    DECLR3CALLBACKMEMBER(PDMAUDIOSTREAMSTS, pfnStreamGetStatus, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream));
+    DECLR3CALLBACKMEMBER(uint32_t, pfnStreamGetStatus, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream));
 
     /**

trunk/include/VBox/vmm/pdmaudioinline.h

@@ -422 +422 @@
  *
  * @returns @c true if ready to be read from, @c false if not.
- * @param   fStatus     Stream status to evaluate, PDMAUDIOSTREAMSTS_FLAGS_XXX.
- */
-DECLINLINE(bool) PDMAudioStrmStatusCanRead(PDMAUDIOSTREAMSTS fStatus)
-{
-    AssertReturn(fStatus & PDMAUDIOSTREAMSTS_VALID_MASK, false);
+ * @param   fStatus     Stream status to evaluate, PDMAUDIOSTREAM_STS_XXX.
+ */
+DECLINLINE(bool) PDMAudioStrmStatusCanRead(uint32_t fStatus)
+{
+    AssertReturn(fStatus & PDMAUDIOSTREAM_STS_VALID_MASK, false);
     /*
-    return      fStatus & PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
-           &&   fStatus & PDMAUDIOSTREAMSTS_FLAGS_ENABLED
-           && !(fStatus & PDMAUDIOSTREAMSTS_FLAGS_PAUSED)
+    return      fStatus & PDMAUDIOSTREAM_STS_INITIALIZED
+           &&   fStatus & PDMAUDIOSTREAM_STS_ENABLED
+           && !(fStatus & PDMAUDIOSTREAM_STS_PAUSED)
            && !(fStatus & PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT);*/
-    return (fStatus & (  PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
-                       | PDMAUDIOSTREAMSTS_FLAGS_ENABLED
-                       | PDMAUDIOSTREAMSTS_FLAGS_PAUSED
-                       | PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT ))
-        == (  PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
-            | PDMAUDIOSTREAMSTS_FLAGS_ENABLED);
+    return (fStatus & (  PDMAUDIOSTREAM_STS_INITIALIZED
+                       | PDMAUDIOSTREAM_STS_ENABLED
+                       | PDMAUDIOSTREAM_STS_PAUSED
+                       | PDMAUDIOSTREAM_STS_NEED_REINIT ))
+        == (  PDMAUDIOSTREAM_STS_INITIALIZED
+            | PDMAUDIOSTREAM_STS_ENABLED);
 }
 
@@ -444 +444 @@
  *
  * @returns @c true if ready to be written to, @c false if not.
- * @param   fStatus     Stream status to evaluate, PDMAUDIOSTREAMSTS_FLAGS_XXX.
- */
-DECLINLINE(bool) PDMAudioStrmStatusCanWrite(PDMAUDIOSTREAMSTS fStatus)
-{
-    AssertReturn(fStatus & PDMAUDIOSTREAMSTS_VALID_MASK, false);
+ * @param   fStatus     Stream status to evaluate, PDMAUDIOSTREAM_STS_XXX.
+ */
+DECLINLINE(bool) PDMAudioStrmStatusCanWrite(uint32_t fStatus)
+{
+    AssertReturn(fStatus & PDMAUDIOSTREAM_STS_VALID_MASK, false);
     /*
-    return      fStatus & PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
-           &&   fStatus & PDMAUDIOSTREAMSTS_FLAGS_ENABLED
-           && !(fStatus & PDMAUDIOSTREAMSTS_FLAGS_PAUSED)
-           && !(fStatus & PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE)
+    return      fStatus & PDMAUDIOSTREAM_STS_INITIALIZED
+           &&   fStatus & PDMAUDIOSTREAM_STS_ENABLED
+           && !(fStatus & PDMAUDIOSTREAM_STS_PAUSED)
+           && !(fStatus & PDMAUDIOSTREAM_STS_PENDING_DISABLE)
            && !(fStatus & PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT);*/
-    return (fStatus & (  PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
-                       | PDMAUDIOSTREAMSTS_FLAGS_ENABLED
-                       | PDMAUDIOSTREAMSTS_FLAGS_PAUSED
-                       | PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE
-                       | PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT))
-        == (  PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
-            | PDMAUDIOSTREAMSTS_FLAGS_ENABLED);
+    return (fStatus & (  PDMAUDIOSTREAM_STS_INITIALIZED
+                       | PDMAUDIOSTREAM_STS_ENABLED
+                       | PDMAUDIOSTREAM_STS_PAUSED
+                       | PDMAUDIOSTREAM_STS_PENDING_DISABLE
+                       | PDMAUDIOSTREAM_STS_NEED_REINIT))
+        == (  PDMAUDIOSTREAM_STS_INITIALIZED
+            | PDMAUDIOSTREAM_STS_ENABLED);
 }
 
@@ -468 +468 @@
  *
  * @returns @c true if ready to operate, @c false if not.
- * @param   fStatus     Stream status to evaluate, PDMAUDIOSTREAMSTS_FLAGS_XXX.
- */
-DECLINLINE(bool) PDMAudioStrmStatusIsReady(PDMAUDIOSTREAMSTS fStatus)
-{
-    AssertReturn(fStatus & PDMAUDIOSTREAMSTS_VALID_MASK, false);
+ * @param   fStatus     Stream status to evaluate, PDMAUDIOSTREAM_STS_XXX.
+ */
+DECLINLINE(bool) PDMAudioStrmStatusIsReady(uint32_t fStatus)
+{
+    AssertReturn(fStatus & PDMAUDIOSTREAM_STS_VALID_MASK, false);
     /*
-    return      fStatus & PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
-           &&   fStatus & PDMAUDIOSTREAMSTS_FLAGS_ENABLED
+    return      fStatus & PDMAUDIOSTREAM_STS_INITIALIZED
+           &&   fStatus & PDMAUDIOSTREAM_STS_ENABLED
            && !(fStatus & PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT);*/
-    return (fStatus & (  PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
-                       | PDMAUDIOSTREAMSTS_FLAGS_ENABLED
-                       | PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT))
-        == (  PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED
-            | PDMAUDIOSTREAMSTS_FLAGS_ENABLED);
+    return (fStatus & (  PDMAUDIOSTREAM_STS_INITIALIZED
+                       | PDMAUDIOSTREAM_STS_ENABLED
+                       | PDMAUDIOSTREAM_STS_NEED_REINIT))
+        == (  PDMAUDIOSTREAM_STS_INITIALIZED
+            | PDMAUDIOSTREAM_STS_ENABLED);
 }