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

Timestamp:

Mar 18, 2021 10:26:14 AM (4 years ago)

Author:

vboxsync

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

143342

Message:

DevHDA: Added WALCLKA at 2030h (see 3.3.44). Turned two if statements around for better mojo. bugref:9890

File:

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

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

@@ -463 +463 @@
 const HDAREGALIAS g_aHdaRegAliases[] =
 {
+    { 0x2030, HDA_REG_WALCLK  },
     { 0x2084, HDA_REG_SD0LPIB },
     { 0x20a4, HDA_REG_SD1LPIB },
@@ -3135 +3136 @@
     DEVHDA_LOCK_RETURN(pDevIns, pThis, VINF_IOM_R3_MMIO_WRITE);
 
-    if (!(HDA_REG(pThis, GCTL) & HDA_GCTL_CRST) && idxRegDsc != HDA_REG_GCTL)
+    if (   (HDA_REG(pThis, GCTL) & HDA_GCTL_CRST)
+        || idxRegDsc == HDA_REG_GCTL)
+    { /* likely */ }
+    else
     {
         Log(("hdaWriteReg: Warning: Access to %s is blocked while controller is in reset mode\n", g_aHdaRegMap[idxRegDsc].abbrev));
@@ -3153 +3157 @@
     if (idxRegDsc >= HDA_NUM_GENERAL_REGS)
     {
-        const uint32_t uSDCTL = HDA_STREAM_REG(pThis, CTL, HDA_SD_NUM_FROM_REG(pThis, CTL, idxRegDsc));
-
         /*
          * Some OSes (like Win 10 AU) violate the spec by writing stuff to registers which are not supposed to be be touched
          * while SDCTL's RUN bit is set. So just ignore those values.
          */
-
-        /* Is the RUN bit currently set? */
-        if (   RT_BOOL(uSDCTL & HDA_SDCTL_RUN)
-            /* Are writes to the register denied if RUN bit is set? */
-            && !(g_aHdaRegMap[idxRegDsc].fFlags & HDA_RD_F_SD_WRITE_RUN))
+        const uint32_t uSDCTL = HDA_STREAM_REG(pThis, CTL, HDA_SD_NUM_FROM_REG(pThis, CTL, idxRegDsc));
+        if (   !(uSDCTL & HDA_SDCTL_RUN)
+            || (g_aHdaRegMap[idxRegDsc].fFlags & HDA_RD_F_SD_WRITE_RUN))
+        { /* likely */ }
+        else
         {
             Log(("hdaWriteReg: Warning: Access to %s is blocked! %R[sdctl]\n", g_aHdaRegMap[idxRegDsc].abbrev, uSDCTL));