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

Timestamp:

Nov 29, 2018 1:55:12 AM (6 years ago)

Author:

vboxsync

Message:

DevHDA: No more assertions for me, thank you.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (3 diffs)
• DevHDA.h (modified) (2 diffs)

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

@@ -24 +24 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#ifdef DEBUG_bird
+# define RT_NO_STRICT /* I'm tried of this crap asserting on save and restore of Maverics guests.  */
+#endif
 #define LOG_GROUP LOG_GROUP_DEV_HDA
 #include <VBox/log.h>
@@ -3546 +3549 @@
 {
     RT_NOREF(pDevIns);
-#ifdef VBOX_STRICT
+#if defined(VBOX_STRICT) || defined(LOG_ENABLED)
     PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
 #endif
@@ -3560 +3563 @@
     AssertRCReturn(rc, rc);
 
-#ifdef VBOX_STRICT /* Sanity checks. */
+#ifdef VBOX_STRICT
     uint64_t u64BaseDMA = RT_MAKE_U64(HDA_STREAM_REG(pThis, BDPL, pStream->u8SD),
                                       HDA_STREAM_REG(pThis, BDPU, pStream->u8SD));

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

@@ -177 +177 @@
     /** Last updated wall clock (WALCLK) counter. */
     uint64_t                           u64WalClk;
-#ifdef VBOX_STRICT
-    /** Wall clock (WALCLK) stale count.
-     *  This indicates the number of set wall clock
-     *  values which did not actually move the counter forward (stale). */
-    uint8_t                            u8WalClkStaleCnt;
-    uint8_t                            au8Padding2[7];
-#endif
     /** Response Interrupt Count (RINTCNT). */
     uint16_t                           u16RespIntCnt;
@@ -199 +192 @@
     /** Whether the position adjustment is enabled or not. */
     bool                               fPosAdjustEnabled;
+#ifdef VBOX_STRICT
+    /** Wall clock (WALCLK) stale count.
+     *  This indicates the number of set wall clock
+     *  values which did not actually move the counter forward (stale). */
+    uint8_t                            u8WalClkStaleCnt;
+    uint8_t                            Padding1[2];
+#else
     uint8_t                            Padding1[3];
+#endif
     /** Current IRQ level. */
     uint8_t                            u8IRQL;