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

Timestamp:

Jun 2, 2017 12:50:42 PM (8 years ago)

Author:

vboxsync

Message:

HDA: Fewer macros.

File:

• trunk/src/VBox/Devices/Audio/DevHDA.cpp (modified) (9 diffs)

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

@@ -198 +198 @@
 #define HDA_INTCTL_GIE_SHIFT        31
 #define HDA_INTCTL_CIE_SHIFT        30
-#define HDA_INTCTL_S0_SHIFT         0
-#define HDA_INTCTL_S1_SHIFT         1
-#define HDA_INTCTL_S2_SHIFT         2
-#define HDA_INTCTL_S3_SHIFT         3
-#define HDA_INTCTL_S4_SHIFT         4
-#define HDA_INTCTL_S5_SHIFT         5
-#define HDA_INTCTL_S6_SHIFT         6
-#define HDA_INTCTL_S7_SHIFT         7
-#define INTCTL_SX(pThis, X)         (HDA_REG_FLAG_VALUE((pThis), INTCTL, S##X))
+/* Bits 0-29 correspond to streams 0-29. */
 #define HDA_INTCTL_GIE_MASK         RT_BIT(31) /* Global Interrupt Enable (3.3.14). */
 
@@ -213 +205 @@
 #define HDA_INTSTS_GIS_SHIFT        31
 #define HDA_INTSTS_CIS_SHIFT        30
-#define HDA_INTSTS_S0_SHIFT         0
-#define HDA_INTSTS_S1_SHIFT         1
-#define HDA_INTSTS_S2_SHIFT         2
-#define HDA_INTSTS_S3_SHIFT         3
-#define HDA_INTSTS_S4_SHIFT         4
-#define HDA_INTSTS_S5_SHIFT         5
-#define HDA_INTSTS_S6_SHIFT         6
-#define HDA_INTSTS_S7_SHIFT         7
-#define HDA_INTSTS_S_MASK(num)      RT_BIT(HDA_REG_FIELD_SHIFT(S##num))
+/* Bits 0-29 correspond to streams 0-29. */
 
 #define HDA_REG_WALCLK              13 /* 0x30 */
@@ -379 +363 @@
 
 #define SDSTS(pThis, num)           HDA_REG((pThis), SD(STS, num))
-#define HDA_SDSTS_FIFORDY_SHIFT     5
-#define HDA_SDSTS_DE_SHIFT          4
-#define HDA_SDSTS_FE_SHIFT          3
-#define HDA_SDSTS_BCIS_SHIFT        2
+#define HDA_SDSTS_FIFORDY           RT_BIT(5)   /* FIFO Ready */
+#define HDA_SDSTS_DESE              RT_BIT(4)   /* Descriptor Error */
+#define HDA_SDSTS_FIFOE             RT_BIT(3)   /* FIFO Error */
+#define HDA_SDSTS_BCIS              RT_BIT(2)   /* Buffer Completion Interrupt Status */
 
 #define HDA_REG_SD0LPIB             36 /* 0x84 */
@@ -1465 +1449 @@
 
 #define HDA_MARK_STREAM(x)                                                  \
-        if (   (INTCTL_SX(pThis, x))                                        \
-            && (   (SDSTS(pThis, x) & HDA_REG_FIELD_FLAG_MASK(SDSTS, DE))   \
-                || (SDSTS(pThis, x) & HDA_REG_FIELD_FLAG_MASK(SDSTS, FE))   \
-                || (SDSTS(pThis, x) & HDA_REG_FIELD_FLAG_MASK(SDSTS, BCIS)) \
-               )                                                            \
+        if (   (HDA_REG(pThis, INTCTL) & RT_BIT(x))                         \
+            && ((SDSTS(pThis, x) & (HDA_SDSTS_DESE | HDA_SDSTS_FIFOE | HDA_SDSTS_BCIS))) \
            )                                                                \
     {                                                                       \
@@ -1860 +1841 @@
      * Second, initialize the registers.
      */
-    HDA_STREAM_REG(pThis, STS,   uSD) = HDA_REG_FIELD_FLAG_MASK(SDSTS, FIFORDY);
+    HDA_STREAM_REG(pThis, STS,   uSD) = HDA_SDSTS_FIFORDY;
     /* According to the ICH6 datasheet, 0x40000 is the default value for stream descriptor register 23:20
      * bits are reserved for stream number 18.2.33, resets SDnCTL except SRST bit. */
@@ -2208 +2189 @@
     else
     {
-        /** @todo Clear INTSTS's individual stream status bits as well? */
-
         /* Make sure to lower interrupt line, as Global Interrupt Enable (GIE) is disabled. */
         PDMDevHlpPCISetIrq(pThis->CTX_SUFF(pDevIns), 0, 0 /* iLevel */);
@@ -4108 +4087 @@
         fProceed = false;
     /* Is the BCIS (Buffer Completion Interrupt Status) flag set? Then we have to wait and skip. */
-    else if ((HDA_STREAM_REG(pThis, STS, pStream->u8SD) & HDA_REG_FIELD_FLAG_MASK(SDSTS, BCIS)))
+    else if ((HDA_STREAM_REG(pThis, STS, pStream->u8SD) & HDA_SDSTS_BCIS))
         fProceed = false;
 
@@ -4245 +4224 @@
          * This must be set in *any* case.
          */
-        HDA_STREAM_REG(pThis, STS, pStream->u8SD) |= HDA_REG_FIELD_FLAG_MASK(SDSTS, BCIS);
+        HDA_STREAM_REG(pThis, STS, pStream->u8SD) |= HDA_SDSTS_BCIS;
         Log3Func(("[SD%RU8]: BCIS set\n", pStream->u8SD));
 
@@ -5584 +5563 @@
                        "SDSTS(raw:%#0x, fifordy:%RTbool, dese:%RTbool, fifoe:%RTbool, bcis:%RTbool)",
                        uSdSts,
-                       RT_BOOL(uSdSts & HDA_REG_FIELD_FLAG_MASK(SDSTS, FIFORDY)),
-                       RT_BOOL(uSdSts & HDA_REG_FIELD_FLAG_MASK(SDSTS, DE)),
-                       RT_BOOL(uSdSts & HDA_REG_FIELD_FLAG_MASK(SDSTS, FE)),
-                       RT_BOOL(uSdSts & HDA_REG_FIELD_FLAG_MASK(SDSTS, BCIS)));
+                       RT_BOOL(uSdSts & HDA_SDSTS_FIFORDY),
+                       RT_BOOL(uSdSts & HDA_SDSTS_DESE),
+                       RT_BOOL(uSdSts & HDA_SDSTS_FIFOE),
+                       RT_BOOL(uSdSts & HDA_SDSTS_BCIS));
 }