From 28f8fc7638b9149e05a7b15ec11cc08f9e6d7e86 Mon Sep 17 00:00:00 2001 From: Daniel Rugerio <50124185+darugeri@users.noreply.github.com> Date: Thu, 10 Sep 2020 11:28:09 -0700 Subject: Updates to SysVAD (#527) * Fixed build errors when disabling sideband, * A note about the SysVAD sample and HLK testing. --- audio/sysvad/EndpointsCommon/mintopo.cpp | 1 + audio/sysvad/EndpointsCommon/mintopo.h | 4 ++++ audio/sysvad/EndpointsCommon/speakertoptable.h | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'audio/sysvad/EndpointsCommon') diff --git a/audio/sysvad/EndpointsCommon/mintopo.cpp b/audio/sysvad/EndpointsCommon/mintopo.cpp index 4f2bf4fa..4e417c4a 100644 --- a/audio/sysvad/EndpointsCommon/mintopo.cpp +++ b/audio/sysvad/EndpointsCommon/mintopo.cpp @@ -581,6 +581,7 @@ Return Value: return ntStatus; } + #if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND) //============================================================================= #pragma code_seg() diff --git a/audio/sysvad/EndpointsCommon/mintopo.h b/audio/sysvad/EndpointsCommon/mintopo.h index 266fc81d..b4eda617 100644 --- a/audio/sysvad/EndpointsCommon/mintopo.h +++ b/audio/sysvad/EndpointsCommon/mintopo.h @@ -33,6 +33,8 @@ class CMiniportTopology : { private: eDeviceType m_DeviceType; + + union { PVOID m_DeviceContext; #if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND) @@ -55,6 +57,7 @@ public: m_DeviceType(DeviceType), m_DeviceContext(DeviceContext) { + #if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND) if (IsSidebandDevice()) { @@ -85,6 +88,7 @@ public: _In_reads_(cJackDescriptions) PKSJACK_DESCRIPTION *JackDescriptions, _In_ DWORD JackCapabilities ); + #if defined(SYSVAD_BTH_BYPASS) || defined(SYSVAD_USB_SIDEBAND) BOOL IsSidebandDevice() diff --git a/audio/sysvad/EndpointsCommon/speakertoptable.h b/audio/sysvad/EndpointsCommon/speakertoptable.h index eb12173a..6850c0cf 100644 --- a/audio/sysvad/EndpointsCommon/speakertoptable.h +++ b/audio/sysvad/EndpointsCommon/speakertoptable.h @@ -104,6 +104,7 @@ PKSJACK_DESCRIPTION SpeakerJackDescriptions[] = &SpeakerJackDescBridge }; + //============================================================================= static PCCONNECTION_DESCRIPTOR SpeakerTopoMiniportConnections[] = @@ -133,7 +134,6 @@ PCPROPERTY_ITEM PropertiesSpeakerTopoFilter[] = } }; - DEFINE_PCAUTOMATION_TABLE_PROP(AutomationSpeakerTopoFilter, PropertiesSpeakerTopoFilter); //============================================================================= -- cgit v1.3.1