Changeset 53485 in vbox for trunk

Timestamp:

Dec 9, 2014 9:21:11 AM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: Fixed tstDeviceStructSizeRC.

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevIchHda.cpp (modified) (3 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -627 +627 @@
      *  LUN has a HDA driver assigned. */
     uint8_t                            cLUNs;
+    uint8_t                            au8PaddingLUNs[4];
     /** The HDA codec to use. */
     R3PTRTYPE(PHDACODEC)               pCodec;
@@ -645 +646 @@
     /** 1.2.3.4.5.6.7. - someone please tell me what I'm counting! - .8.9.10... */
     uint8_t                            u8Counter;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    uint8_t                            au8Padding[4];
+#else
     uint8_t                            au8Padding[7];
+#endif
 } HDASTATE;
 /** Pointer to the ICH Intel HD Audio Controller state. */
@@ -1478 +1483 @@
                 pBdle = &pThis->StInBdle;
                 break;
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
             case HDA_REG_SD2CTL:
                 u8Strm = 2;
                 pBdle = &pThis->StMicBdle;
                 break;
+#endif
             case HDA_REG_SD4CTL:
                 u8Strm = 4;

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -1858 +1858 @@
     GEN_CHECK_OFF(HDASTATE, fR0Enabled);
     GEN_CHECK_OFF(HDASTATE, fRCEnabled);
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    GEN_CHECK_OFF(HDASTATE, cLUNs);
     GEN_CHECK_OFF(HDASTATE, pCodec);
+    GEN_CHECK_OFF(HDASTATE, paDrv);
+    GEN_CHECK_OFF(HDASTATE, pMixer);
+    GEN_CHECK_OFF(HDASTATE, pSinkLineIn);
+    GEN_CHECK_OFF(HDASTATE, pSinkMicIn);
+#else 
+    GEN_CHECK_OFF(HDASTATE, pCodec);
+    GEN_CHECK_OFF(HDASTATE, u64BaseTS);
     GEN_CHECK_OFF(HDASTATE, u8Counter);
-    GEN_CHECK_OFF(HDASTATE, u64BaseTS);
+#endif
 
     return (0);