Changeset 62182 in vbox for trunk/src

Timestamp:

Jul 12, 2016 9:37:58 AM (9 years ago)

Author:

vboxsync

Message:

Devices/testcase: fixes for VBOX_WITH_AUDIO_50

Location:

trunk/src/VBox/Devices/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• tstDeviceStructSize.cpp (modified) (1 diff)
• tstDeviceStructSizeRC.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/testcase/Makefile.kmk

@@ -39 +39 @@
         $(if $(VBOX_WITH_NEW_PS2M),VBOX_WITH_NEW_PS2M,) \
         $(if $(VBOX_WITH_NVME_IMPL),VBOX_WITH_NVME_IMPL,) \
+        $(if $(VBOX_WITH_AUDIO_50),VBOX_WITH_AUDIO_50,) \
         $(if $(VBOX_WITH_PCI_PASSTHROUGH_IMPL),VBOX_WITH_PCI_PASSTHROUGH_IMPL,) \
         $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,) \

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

@@ -120 +120 @@
 #include <VBox/vmm/pdmaudioifs.h>
 
-#undef LOG_GROUP
-#include "../Audio/DevIchAc97.cpp"
-#undef LOG_GROUP
-#include "../Audio/DevIchHda.cpp"
+#ifdef VBOX_WITH_AUDIO_50
+# undef LOG_GROUP
+# include "../Audio_old/DevIchAc97.cpp"
+# undef LOG_GROUP
+# include "../Audio_old/DevIchHda.cpp"
+#else
+# undef LOG_GROUP
+# include "../Audio/DevIchAc97.cpp"
+# undef LOG_GROUP
+# include "../Audio/DevIchHda.cpp"
+#endif
 
 #include <stdio.h>

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

@@ -114 +114 @@
 #undef LOG_GROUP
 #include "../PC/DevHPET.cpp"
-#undef LOG_GROUP
-#include "../Audio/DevIchAc97.cpp"
-#undef LOG_GROUP
-#include "../Audio/DevIchHda.cpp"
+#ifdef VBOX_WITH_AUDIO_50
+# undef LOG_GROUP
+# include "../Audio_old/DevIchAc97.cpp"
+# undef LOG_GROUP
+# include "../Audio_old/DevIchHda.cpp"
+#else
+# undef LOG_GROUP
+# include "../Audio/DevIchAc97.cpp"
+# undef LOG_GROUP
+# include "../Audio/DevIchHda.cpp"
+#endif
 #ifdef VBOX_WITH_NVME_IMPL
 # undef LOG_GROUP
@@ -1951 +1958 @@
     GEN_CHECK_OFF(AC97DRIVER, Out);
 
+#ifndef VBOX_WITH_AUDIO_50
     GEN_CHECK_SIZE(HDAMIXERSTREAM);
     GEN_CHECK_OFF(HDAMIXERSTREAM, DestSource);
     GEN_CHECK_OFF(HDAMIXERSTREAM, pMixStrm);
+#endif
 
     GEN_CHECK_SIZE(HDADRIVER);
@@ -1966 +1975 @@
     GEN_CHECK_OFF(HDADRIVER, MicIn);
 #endif
+#ifndef VBOX_WITH_AUDIO_50
     GEN_CHECK_OFF(HDADRIVER, Front);
+#endif
 #ifdef VBOX_WITH_HDA_51_SURROUND
     GEN_CHECK_OFF(HDADRIVER, CenterLFE);
@@ -1989 +2000 @@
 
     GEN_CHECK_SIZE(HDASTREAM);
+#ifndef VBOX_WITH_AUDIO_50
     GEN_CHECK_OFF(HDASTREAM, u8SD);
+#endif
     GEN_CHECK_OFF(HDASTREAM, u64BDLBase);
     GEN_CHECK_OFF(HDASTREAM, u16FMT);
@@ -2004 +2017 @@
     GEN_CHECK_OFF(HDASTATE, MMIOBaseAddr);
     GEN_CHECK_OFF(HDASTATE, au32Regs[0]);
+#ifdef VBOX_WITH_AUDIO_50
+    GEN_CHECK_OFF(HDASTATE, au32Regs[HDA_NREGS]);
+#else
     GEN_CHECK_OFF(HDASTATE, au32Regs[HDA_NUM_REGS]);
     GEN_CHECK_OFF(HDASTATE, aStreams);
     GEN_CHECK_OFF(HDASTATE, aTags);
+#endif
     GEN_CHECK_OFF(HDASTATE, u64CORBBase);
     GEN_CHECK_OFF(HDASTATE, u64RIRBBase);
@@ -2032 +2049 @@
     GEN_CHECK_OFF(HDASTATE, lstDrv);
     GEN_CHECK_OFF(HDASTATE, pMixer);
+#ifndef VBOX_WITH_AUDIO_50
     GEN_CHECK_OFF(HDASTATE, SinkFront);
+#endif
 #ifdef VBOX_WITH_HDA_51_SURROUND
     GEN_CHECK_OFF(HDASTATE, SinkCenterLFE);
     GEN_CHECK_OFF(HDASTATE, SinkRear);
 #endif
+#ifndef VBOX_WITH_AUDIO_50
     GEN_CHECK_OFF(HDASTATE, SinkLineIn);
+#endif
 #ifdef VBOX_WITH_HDA_MIC_IN
     GEN_CHECK_OFF(HDASTATE, SinkMicIn);