Merge pull request #139 from girishpattabiraman/master

SysVad sample for Windows Creators Update (1703)

4 files changed, 131 insertions, 8 deletions

diff --git a/audio/sysvad/TabletAudioSample/TabletAudioSample.vcxproj.Filters b/audio/sysvad/TabletAudioSample/TabletAudioSample.vcxproj.Filters
new file mode 100644
index 00000000..cc7dcd30
--- /dev/null
+++ b/audio/sysvad/TabletAudioSample/TabletAudioSample.vcxproj.Filters
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
+      <UniqueIdentifier>{7FE326AE-6214-4FE0-A27B-F229A098BDBC}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <UniqueIdentifier>{64C16D2B-849C-4264-A615-18A8E8AC9505}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
+      <UniqueIdentifier>{46FAF4E8-F18C-4797-9CFA-2F3473BCB316}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Driver Files">
+      <Extensions>inf;inv;inx;mof;mc;</Extensions>
+      <UniqueIdentifier>{EE8F0A00-C1F0-4CB4-80E3-5FCC378E0BF4}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\adapter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\basetopo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\hw.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\kshelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\savedata.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\tonegenerator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="hdmitopo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="micintopo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="spdiftopo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\sysvad.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/audio/sysvad/TabletAudioSample/minipairs.h b/audio/sysvad/TabletAudioSample/minipairs.h
index 320aed6f..e955791e 100644
--- a/audio/sysvad/TabletAudioSample/minipairs.h
+++ b/audio/sysvad/TabletAudioSample/minipairs.h
@@ -177,7 +177,10 @@ ENDPOINT_MINIPAIR SpeakerMiniports =
     SIZEOF_ARRAY(SpeakerPinDeviceFormatsAndModes),
     SpeakerTopologyPhysicalConnections,
     SIZEOF_ARRAY(SpeakerTopologyPhysicalConnections),
-    ENDPOINT_OFFLOAD_SUPPORTED
+    ENDPOINT_OFFLOAD_SUPPORTED,
+    SpeakerModulesWaveFilter, 
+    SIZEOF_ARRAY(SpeakerModulesWaveFilter),
+    &SpeakerModuleNotificationDeviceId,
 };
 
 /*********************************************************************
@@ -219,7 +222,10 @@ ENDPOINT_MINIPAIR SpeakerHpMiniports =
     SIZEOF_ARRAY(SpeakerHpPinDeviceFormatsAndModes),
     SpeakerHpTopologyPhysicalConnections,
     SIZEOF_ARRAY(SpeakerHpTopologyPhysicalConnections),
-    ENDPOINT_OFFLOAD_SUPPORTED
+    ENDPOINT_OFFLOAD_SUPPORTED,
+    SpeakerHpModulesWaveFilter, 
+    SIZEOF_ARRAY(SpeakerHpModulesWaveFilter),
+    &SpeakerHpModuleNotificationDeviceId,
 };
 
 /*********************************************************************
@@ -261,7 +267,8 @@ ENDPOINT_MINIPAIR HdmiMiniports =
     SIZEOF_ARRAY(HdmiPinDeviceFormatsAndModes),
     HdmiTopologyPhysicalConnections,
     SIZEOF_ARRAY(HdmiTopologyPhysicalConnections),
-    ENDPOINT_NO_FLAGS
+    ENDPOINT_NO_FLAGS,
+    NULL, 0, NULL,                          // audio module settings.
 };
 
 /*********************************************************************
@@ -304,7 +311,8 @@ ENDPOINT_MINIPAIR SpdifMiniports =
     SIZEOF_ARRAY(SpdifPinDeviceFormatsAndModes),
     SpdifTopologyPhysicalConnections,
     SIZEOF_ARRAY(SpdifTopologyPhysicalConnections),
-    ENDPOINT_OFFLOAD_SUPPORTED
+    ENDPOINT_OFFLOAD_SUPPORTED,
+    NULL, 0, NULL,                                          // audio module settings.
 };
 
 //
@@ -348,7 +356,8 @@ ENDPOINT_MINIPAIR MicInMiniports =
     SIZEOF_ARRAY(MicInPinDeviceFormatsAndModes),
     MicInTopologyPhysicalConnections,
     SIZEOF_ARRAY(MicInTopologyPhysicalConnections),
-    ENDPOINT_NO_FLAGS
+    ENDPOINT_NO_FLAGS,
+    NULL, 0, NULL,                          // audio module settings.
 };
 
 /*********************************************************************
@@ -389,7 +398,8 @@ ENDPOINT_MINIPAIR MicArray1Miniports =
     SIZEOF_ARRAY(MicArrayPinDeviceFormatsAndModes),
     MicArray1TopologyPhysicalConnections,
     SIZEOF_ARRAY(MicArray1TopologyPhysicalConnections),
-    ENDPOINT_SOUNDDETECTOR_SUPPORTED
+    ENDPOINT_SOUNDDETECTOR_SUPPORTED,
+    NULL, 0, NULL,                          // audio module settings.
 };
 
 /*********************************************************************
@@ -429,7 +439,8 @@ ENDPOINT_MINIPAIR MicArray2Miniports =
     SIZEOF_ARRAY(MicArrayPinDeviceFormatsAndModes),
     MicArray2TopologyPhysicalConnections,
     SIZEOF_ARRAY(MicArray2TopologyPhysicalConnections),
-    ENDPOINT_SOUNDDETECTOR_SUPPORTED
+    ENDPOINT_SOUNDDETECTOR_SUPPORTED,
+    NULL, 0, NULL,                          // audio module settings.
 };
 
 /*********************************************************************
@@ -469,7 +480,8 @@ ENDPOINT_MINIPAIR MicArray3Miniports =
     SIZEOF_ARRAY(MicArray3PinDeviceFormatsAndModes),
     MicArray3TopologyPhysicalConnections,
     SIZEOF_ARRAY(MicArray3TopologyPhysicalConnections),
-    ENDPOINT_NO_FLAGS
+    ENDPOINT_NO_FLAGS,
+    NULL, 0, NULL,                          // audio module settings.
 };
 
 //=============================================================================
diff --git a/audio/sysvad/TabletAudioSample/sources b/audio/sysvad/TabletAudioSample/sources
new file mode 100644
index 00000000..39d0de57
--- /dev/null
+++ b/audio/sysvad/TabletAudioSample/sources
@@ -0,0 +1,53 @@
+
+# Copyright (c) Microsoft Corporation.  All rights reserved.
+
+
+!include ..\sources.inc
+
+TARGETNAME=TabletAudioSample
+
+TARGETLIBS= \
+    $(TARGETLIBS) \
+    $(OBJ_PATH)\..\EndpointsCommon\$(O)\EndpointsCommon.lib \
+
+
+C_DEFINES = $(C_DEFINES) -D_USE_WAVERT_ -DSYSVAD_BTH_BYPASS
+
+
+#C_DEFINES = $(C_DEFINES) -D_USE_WAVERT_ 
+#
+# Indicate to the WDK that this sample only supports Win10[+]
+#
+MINIMUM_NT_TARGET_VERSION=$(_NT_TARGET_VERSION_WINTHRESHOLD)
+
+#
+# Audio driver is a KMDF miniport.
+#
+KMDF_VERSION_MAJOR=1
+
+#
+# Uncomment one of the following lines to select the right power management.
+# Note that the single-component/multi-state feature requires also a registry 
+# value set via the INF. The name of the registry value is SingleComponentMultiFxStates.
+# see INF file for more info.
+#
+#C_DEFINES= $(C_DEFINES) -D_USE_IPortClsRuntimePower
+C_DEFINES= $(C_DEFINES) -D_USE_SingleComponentMultiFxStates
+
+INCLUDES= \
+        $(INCLUDES); \
+        ..\EndpointsCommon; \
+
+SOURCES=$(SOURCES)              \
+        hdmitopo.cpp    \
+        spdiftopo.cpp   \
+        micintopo.cpp   \
+
+
+# Indicate that this module must be included in the driver package
+DDK_NO_PACKAGE_PROJECT=0
+DDK_INCLUDE_PACKAGE_PROJECT=1
+
+
+MUI_VERIFY_NO_LOC_RESOURCE=1 
+
diff --git a/audio/sysvad/TabletAudioSample/tabletaudiosample.inf b/audio/sysvad/TabletAudioSample/tabletaudiosample.inf
index 0e85d33b..c9f533af 100644
--- a/audio/sysvad/TabletAudioSample/tabletaudiosample.inf
+++ b/audio/sysvad/TabletAudioSample/tabletaudiosample.inf