Update sample to get ready for RS4 changes - merge pre-RS4 fixes. (#256)

* Format Changes
==============
* Add KSEVENT_PINCAPS_FORMATCHANGE to Bluetooth HFP Endpoints
* Remove 8 bit formats from Bluetooth HFP Endpoints

Name Template
==============
* Bluetooth Endpoints are now based on templates in INF and then customized with endpoints specific data

Sideband Common Interface for future Sideband buses
===================================================
* Add ISidebandDevice
* Add current directory to TabletAudioSample include path. Remove unused compiler flags.
* RS4 bug fixes

14 files changed, 492 insertions, 99 deletions

diff --git a/audio/sysvad/TabletAudioSample/ComponentizedApoSample.inf b/audio/sysvad/TabletAudioSample/ComponentizedApoSample.inx
index a60abe3f..43457d73 100644
--- a/audio/sysvad/TabletAudioSample/ComponentizedApoSample.inf
+++ b/audio/sysvad/TabletAudioSample/ComponentizedApoSample.inx
diff --git a/audio/sysvad/TabletAudioSample/ComponentizedAudioSample.inf b/audio/sysvad/TabletAudioSample/ComponentizedAudioSample.inx
index 6e380029..cd77bd98 100644
--- a/audio/sysvad/TabletAudioSample/ComponentizedAudioSample.inf
+++ b/audio/sysvad/TabletAudioSample/ComponentizedAudioSample.inx
diff --git a/audio/sysvad/TabletAudioSample/ComponentizedAudioSampleExtension.inf b/audio/sysvad/TabletAudioSample/ComponentizedAudioSampleExtension.inx
index d91e44ba..a13515cc 100644
--- a/audio/sysvad/TabletAudioSample/ComponentizedAudioSampleExtension.inf
+++ b/audio/sysvad/TabletAudioSample/ComponentizedAudioSampleExtension.inx
diff --git a/audio/sysvad/TabletAudioSample/TabletAudioSample.rc b/audio/sysvad/TabletAudioSample/TabletAudioSample.rc
new file mode 100644
index 00000000..3ab06ea6
--- /dev/null
+++ b/audio/sysvad/TabletAudioSample/TabletAudioSample.rc
@@ -0,0 +1,30 @@
+/*++
+
+Copyright (c) Microsoft Corporation All Rights Reserved
+
+Module Name:
+
+    TabletAudioSample.rc
+
+Abstract:
+
+
+--*/
+
+#include <windows.h>
+
+#include <ntverp.h>
+
+#define VER_FILETYPE                VFT_DRV
+#define VER_FILESUBTYPE             VFT2_DRV_SOUND
+#define VER_FILEDESCRIPTION_STR     "Microsoft Virtual Audio Tablet Sample Driver"
+#define VER_INTERNALNAME_STR        "TabletAudioSample.sys"
+#define VER_ORIGINALFILENAME_STR    "TabletAudioSample.sys"
+
+#define VER_LEGALCOPYRIGHT_YEARS    "2013"
+#define VER_LEGALCOPYRIGHT_STR	    "Copyright (C) Microsoft Corp." VER_LEGALCOPYRIGHT_YEARS
+
+#include "common.ver"
+
+
+
diff --git a/audio/sysvad/TabletAudioSample/TabletAudioSample.vcxproj b/audio/sysvad/TabletAudioSample/TabletAudioSample.vcxproj
index 48c5665e..205ff309 100644
--- a/audio/sysvad/TabletAudioSample/TabletAudioSample.vcxproj
+++ b/audio/sysvad/TabletAudioSample/TabletAudioSample.vcxproj
@@ -83,19 +83,19 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\portcls.lib;$(DDK_LIB_PATH)\stdunk.lib;$(DDK_LIB_PATH)\libcntpr.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32;UNICODE;_UNICODE;PC_IMPLEMENTATION</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DEBUG_LEVEL=DEBUGLVL_TERSE</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..;.</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32;UNICODE;_UNICODE;PC_IMPLEMENTATION</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DEBUG_LEVEL=DEBUGLVL_TERSE</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32;UNICODE;_UNICODE;PC_IMPLEMENTATION</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DEBUG_LEVEL=DEBUGLVL_TERSE</PreprocessorDefinitions>
     </Midl>
@@ -105,19 +105,19 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\portcls.lib;$(DDK_LIB_PATH)\stdunk.lib;$(DDK_LIB_PATH)\libcntpr.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32;UNICODE;_UNICODE;PC_IMPLEMENTATION</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DEBUG_LEVEL=DEBUGLVL_TERSE</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..;.</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32;UNICODE;_UNICODE;PC_IMPLEMENTATION</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DEBUG_LEVEL=DEBUGLVL_TERSE</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32;UNICODE;_UNICODE;PC_IMPLEMENTATION</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DEBUG_LEVEL=DEBUGLVL_TERSE</PreprocessorDefinitions>
     </Midl>
@@ -127,19 +127,19 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\portcls.lib;$(DDK_LIB_PATH)\stdunk.lib;$(DDK_LIB_PATH)\libcntpr.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32;UNICODE;_UNICODE;PC_IMPLEMENTATION</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DEBUG_LEVEL=DEBUGLVL_TERSE</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..;.</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32;UNICODE;_UNICODE;PC_IMPLEMENTATION</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DEBUG_LEVEL=DEBUGLVL_TERSE</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32;UNICODE;_UNICODE;PC_IMPLEMENTATION</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DEBUG_LEVEL=DEBUGLVL_TERSE</PreprocessorDefinitions>
     </Midl>
@@ -149,19 +149,19 @@
       <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\portcls.lib;$(DDK_LIB_PATH)\stdunk.lib;$(DDK_LIB_PATH)\libcntpr.lib</AdditionalDependencies>
     </Link>
     <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32;UNICODE;_UNICODE;PC_IMPLEMENTATION</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DEBUG_LEVEL=DEBUGLVL_TERSE</PreprocessorDefinitions>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..;.</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32;UNICODE;_UNICODE;PC_IMPLEMENTATION</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DEBUG_LEVEL=DEBUGLVL_TERSE</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);..;.</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32;UNICODE;_UNICODE;PC_IMPLEMENTATION</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);DEBUG_LEVEL=DEBUGLVL_TERSE</PreprocessorDefinitions>
     </Midl>
@@ -184,8 +184,8 @@
     </Link>
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_WAVERT_;SYSVAD_BTH_BYPASS</PreprocessorDefinitions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon;.</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates;_NEW_DELETE_OPERATORS_</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
       <DisableSpecificWarnings>4595;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -193,12 +193,12 @@
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_WAVERT_;SYSVAD_BTH_BYPASS</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon</AdditionalIncludeDirectories>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_WAVERT_;SYSVAD_BTH_BYPASS</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -207,8 +207,8 @@
     </Link>
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_WAVERT_;SYSVAD_BTH_BYPASS</PreprocessorDefinitions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon;.</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates;_NEW_DELETE_OPERATORS_</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
       <DisableSpecificWarnings>4595;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -216,12 +216,12 @@
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_WAVERT_;SYSVAD_BTH_BYPASS</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon</AdditionalIncludeDirectories>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_WAVERT_;SYSVAD_BTH_BYPASS</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -230,8 +230,8 @@
     </Link>
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_WAVERT_;SYSVAD_BTH_BYPASS</PreprocessorDefinitions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon;.</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates;_NEW_DELETE_OPERATORS_</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
       <DisableSpecificWarnings>4595;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -239,12 +239,12 @@
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_WAVERT_;SYSVAD_BTH_BYPASS</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon</AdditionalIncludeDirectories>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_WAVERT_;SYSVAD_BTH_BYPASS</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -253,8 +253,8 @@
     </Link>
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_WAVERT_;SYSVAD_BTH_BYPASS</PreprocessorDefinitions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon;.</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates;_NEW_DELETE_OPERATORS_</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
       <DisableSpecificWarnings>4595;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -262,17 +262,18 @@
     <Midl>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_WAVERT_;SYSVAD_BTH_BYPASS</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon</AdditionalIncludeDirectories>
     </Midl>
     <ResourceCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_WAVERT_;SYSVAD_BTH_BYPASS</PreprocessorDefinitions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);_USE_SingleComponentMultiFxStates</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon;.</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\EndpointsCommon</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\adapter.cpp" />
     <ClCompile Include="..\basetopo.cpp" />
+    <ClCompile Include="..\BthhfpDevice.cpp" />
     <ClCompile Include="..\common.cpp" />
     <ClCompile Include="..\hw.cpp" />
     <ClCompile Include="..\kshelper.cpp" />
@@ -281,10 +282,10 @@
     <ClCompile Include="hdmitopo.cpp" />
     <ClCompile Include="micintopo.cpp" />
     <ClCompile Include="spdiftopo.cpp" />
-    <ResourceCompile Include="..\sysvad.rc" />
+    <ResourceCompile Include="TabletAudioSample.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
+    <Inf Exclude="@(Inx)" Include="*.inx" />
     <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
   </ItemGroup>
   <ItemGroup>
diff --git a/audio/sysvad/TabletAudioSample/TabletAudioSample.vcxproj.Filters b/audio/sysvad/TabletAudioSample/TabletAudioSample.vcxproj.Filters
index cc7dcd30..643d5929 100644
--- a/audio/sysvad/TabletAudioSample/TabletAudioSample.vcxproj.Filters
+++ b/audio/sysvad/TabletAudioSample/TabletAudioSample.vcxproj.Filters
@@ -19,40 +19,26 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\adapter.cpp">
+    <ClCompile Include="..\*.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">
+    <ClCompile Include="*.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\sysvad.rc">
+    <ResourceCompile Include="TabletAudioSample.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Inf Include="*.inx">
+      <Filter>Driver Files</Filter>
+    </Inf>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/audio/sysvad/TabletAudioSample/hdmitoptable.h b/audio/sysvad/TabletAudioSample/hdmitoptable.h
index 5fab7cf4..23bd8765 100644
--- a/audio/sysvad/TabletAudioSample/hdmitoptable.h
+++ b/audio/sysvad/TabletAudioSample/hdmitoptable.h
@@ -36,6 +36,51 @@ KSDATARANGE HdmiTopoPinDataRangesBridge[] =
     STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
     STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_DIGITAL),
     STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
+  },
+  {
+      sizeof(KSDATARANGE),
+      0,
+      0,
+      0,
+      STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+      STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MLP),
+      STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
+  },
+  {
+      sizeof(KSDATARANGE),
+      0,
+      0,
+      0,
+      STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+      STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DTS),
+      STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
+  },
+  {
+      sizeof(KSDATARANGE),
+      0,
+      0,
+      0,
+      STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+      STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DTS_HD),
+      STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
+  },
+  {
+      sizeof(KSDATARANGE),
+      0,
+      0,
+      0,
+      STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+      STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MAT20),
+      STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
+  },
+  {
+      sizeof(KSDATARANGE),
+      0,
+      0,
+      0,
+      STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+      STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MAT21),
+      STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
   }
 };
 
@@ -44,7 +89,12 @@ static
 PKSDATARANGE HdmiTopoPinDataRangePointersBridge[] =
 {
   &HdmiTopoPinDataRangesBridge[0],
-  &HdmiTopoPinDataRangesBridge[1]
+  &HdmiTopoPinDataRangesBridge[1],
+  &HdmiTopoPinDataRangesBridge[2],
+  &HdmiTopoPinDataRangesBridge[3],
+  &HdmiTopoPinDataRangesBridge[4],
+  &HdmiTopoPinDataRangesBridge[5],
+  &HdmiTopoPinDataRangesBridge[6]
 };
 
 //=============================================================================
diff --git a/audio/sysvad/TabletAudioSample/hdmiwavtable.h b/audio/sysvad/TabletAudioSample/hdmiwavtable.h
index 7d786a64..ad3b26e0 100644
--- a/audio/sysvad/TabletAudioSample/hdmiwavtable.h
+++ b/audio/sysvad/TabletAudioSample/hdmiwavtable.h
@@ -44,6 +44,24 @@ Abstract:
 #define HDMI_DOLBY_DIGITAL_MIN_SAMPLE_RATE       44100   // Min Sample Rate
 #define HDMI_DOLBY_DIGITAL_MAX_SAMPLE_RATE       48000   // Max Sample Rate
 
+#define HDMI_DOLBY_MAT_MAX_CHANNELS              8       // Max Channels.
+#define HDMI_DOLBY_MAT_MIN_BITS_PER_SAMPLE       16      // Min Bits Per Sample
+#define HDMI_DOLBY_MAT_MAX_BITS_PER_SAMPLE       16      // Max Bits Per Sample
+#define HDMI_DOLBY_MAT_MIN_SAMPLE_RATE           192000  // Min Sample Rate
+#define HDMI_DOLBY_MAT_MAX_SAMPLE_RATE           192000  // Max Sample Rate
+
+#define HDMI_DTS_MAX_CHANNELS                    2       // Max Channels.
+#define HDMI_DTS_MIN_BITS_PER_SAMPLE             16      // Min Bits Per Sample
+#define HDMI_DTS_MAX_BITS_PER_SAMPLE             16      // Max Bits Per Sample
+#define HDMI_DTS_MIN_SAMPLE_RATE                 48000   // Min Sample Rate
+#define HDMI_DTS_MAX_SAMPLE_RATE                 48000   // Max Sample Rate
+
+#define HDMI_DTS_HD_MAX_CHANNELS                 8       // Max Channels.
+#define HDMI_DTS_HD_MIN_BITS_PER_SAMPLE          16      // Min Bits Per Sample
+#define HDMI_DTS_HD_MAX_BITS_PER_SAMPLE          16      // Max Bits Per Sample
+#define HDMI_DTS_HD_MIN_SAMPLE_RATE              192000  // Min Sample Rate
+#define HDMI_DTS_HD_MAX_SAMPLE_RATE              192000  // Max Sample Rate
+
 //
 // Max # of pin instances.
 //
@@ -204,11 +222,163 @@ KSDATAFORMAT_WAVEFORMATEXTENSIBLE HdmiHostPinSupportedDeviceFormats[] =
             KSAUDIO_SPEAKER_5POINT1_SURROUND,
             STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_DIGITAL)
         }
+    },
+    { // 6
+        {
+            sizeof(KSDATAFORMAT_WAVEFORMATEXTENSIBLE),
+            0,
+            0,
+            0,
+            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MLP),
+            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
+        },
+        {
+            {
+                WAVE_FORMAT_EXTENSIBLE,
+                8,
+                192000,
+                3072000,
+                16,
+                16,
+                sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)
+            },
+            16,
+            KSAUDIO_SPEAKER_7POINT1,
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MLP)
+        }
+    },
+    { // 7
+        {
+            sizeof(KSDATAFORMAT_WAVEFORMATEXTENSIBLE),
+            0,
+            0,
+            0,
+            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MLP),
+            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
+        },
+        {
+            {
+                WAVE_FORMAT_EXTENSIBLE,
+                8,
+                192000,
+                3072000,
+                16,
+                16,
+                sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)
+            },
+            16,
+            KSAUDIO_SPEAKER_7POINT1_SURROUND,
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MLP)
+        }
+    },
+    { // 8
+        {
+            sizeof(KSDATAFORMAT_WAVEFORMATEXTENSIBLE),
+            0,
+            0,
+            0,
+            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DTS),
+            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
+        },
+        {
+            {
+                WAVE_FORMAT_EXTENSIBLE,
+                2,
+                48000,
+                192000,
+                4,
+                16,
+                sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)
+            },
+            16,
+            KSAUDIO_SPEAKER_5POINT1_SURROUND,
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DTS)
+        }
+    },
+    { // 9
+        {
+            sizeof(KSDATAFORMAT_WAVEFORMATEXTENSIBLE),
+            0,
+            0,
+            0,
+            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DTS_HD),
+            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
+        },
+        {
+            {
+                WAVE_FORMAT_EXTENSIBLE,
+                8,
+                192000,
+                3072000,
+                16,
+                16,
+                sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)
+            },
+            16,
+            KSAUDIO_SPEAKER_7POINT1,
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DTS_HD)
+        }
+    },
+    { // 10
+        {
+            sizeof(KSDATAFORMAT_WAVEFORMATEXTENSIBLE),
+            0,
+            0,
+            0,
+            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MAT20),
+            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
+        },
+        {
+            {
+                WAVE_FORMAT_EXTENSIBLE,
+                8,
+                192000,
+                3072000,
+                16,
+                16,
+                sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)
+            },
+            16,
+            KSAUDIO_SPEAKER_7POINT1,
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MAT20)
+        }
+    },
+    { // 11
+        {
+            sizeof(KSDATAFORMAT_WAVEFORMATEXTENSIBLE),
+            0,
+            0,
+            0,
+            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MAT21),
+            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
+        },
+        {
+            {
+                WAVE_FORMAT_EXTENSIBLE,
+                8,
+                192000,
+                3072000,
+                16,
+                16,
+                sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)
+            },
+            16,
+            KSAUDIO_SPEAKER_7POINT1,
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MAT21)
+        }
     }
 };
 
 //
 // Supported modes (only on streaming pins).
+// Note: This pin does not support KSPROPERTY_PIN_PROPOSEDATAFORMAT2 
+//       since none of the modes on this endpoint have a default format.
 //
 static
 MODE_AND_DEFAULT_FORMAT HdmiHostPinSupportedDeviceModes[] =
@@ -216,10 +386,6 @@ MODE_AND_DEFAULT_FORMAT HdmiHostPinSupportedDeviceModes[] =
     {
         STATIC_AUDIO_SIGNALPROCESSINGMODE_RAW,
         NULL, // just an example of no default format for this endpoint/mode   
-    },
-    {
-        STATIC_AUDIO_SIGNALPROCESSINGMODE_DEFAULT,
-        NULL, // just an example of no default format for this endpoint/mode   
     }
 };
 
@@ -299,11 +465,91 @@ KSDATARANGE_AUDIO HdmiPinDataRangesStream[] =
             STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_DIGITAL),
             STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
         },
-        HDMI_DOLBY_DIGITAL_MAX_CHANNELS,           
-        HDMI_DOLBY_DIGITAL_MIN_BITS_PER_SAMPLE,    
-        HDMI_DOLBY_DIGITAL_MAX_BITS_PER_SAMPLE,    
+        HDMI_DOLBY_DIGITAL_MAX_CHANNELS,
+        HDMI_DOLBY_DIGITAL_MIN_BITS_PER_SAMPLE,
+        HDMI_DOLBY_DIGITAL_MAX_BITS_PER_SAMPLE,
         HDMI_DOLBY_DIGITAL_MIN_SAMPLE_RATE,
         HDMI_DOLBY_DIGITAL_MAX_SAMPLE_RATE
+    },
+    { // 3 - DOLBY-MLP host
+        {
+            sizeof(KSDATARANGE_AUDIO),
+            KSDATARANGE_ATTRIBUTES,         // An attributes list follows this data range
+            0,
+            0,
+            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MLP),
+            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
+        },
+        HDMI_DOLBY_MAT_MAX_CHANNELS,
+        HDMI_DOLBY_MAT_MIN_BITS_PER_SAMPLE,
+        HDMI_DOLBY_MAT_MAX_BITS_PER_SAMPLE,
+        HDMI_DOLBY_MAT_MIN_SAMPLE_RATE,
+        HDMI_DOLBY_MAT_MAX_SAMPLE_RATE
+    },
+    { // 4 - DTS host
+        {
+            sizeof(KSDATARANGE_AUDIO),
+            KSDATARANGE_ATTRIBUTES,         // An attributes list follows this data range
+            0,
+            0,
+            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DTS),
+            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
+        },
+        HDMI_DTS_MAX_CHANNELS,
+        HDMI_DTS_MIN_BITS_PER_SAMPLE,
+        HDMI_DTS_MAX_BITS_PER_SAMPLE,
+        HDMI_DTS_MIN_SAMPLE_RATE,
+        HDMI_DTS_MAX_SAMPLE_RATE
+    },
+    { // 5 - DTS-HD host
+        {
+            sizeof(KSDATARANGE_AUDIO),
+            KSDATARANGE_ATTRIBUTES,         // An attributes list follows this data range
+            0,
+            0,
+            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DTS_HD),
+            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
+        },
+        HDMI_DTS_HD_MAX_CHANNELS,
+        HDMI_DTS_HD_MIN_BITS_PER_SAMPLE,
+        HDMI_DTS_HD_MAX_BITS_PER_SAMPLE,
+        HDMI_DTS_HD_MIN_SAMPLE_RATE,
+        HDMI_DTS_HD_MAX_SAMPLE_RATE
+    },
+    { // 6 - DOLBY-MAT20 host
+        {
+            sizeof(KSDATARANGE_AUDIO),
+            KSDATARANGE_ATTRIBUTES,         // An attributes list follows this data range
+            0,
+            0,
+            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MAT20),
+            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
+        },
+        HDMI_DOLBY_MAT_MAX_CHANNELS,
+        HDMI_DOLBY_MAT_MIN_BITS_PER_SAMPLE,
+        HDMI_DOLBY_MAT_MAX_BITS_PER_SAMPLE,
+        HDMI_DOLBY_MAT_MIN_SAMPLE_RATE,
+        HDMI_DOLBY_MAT_MAX_SAMPLE_RATE
+    },
+    { // 7 - DOLBY-MAT21 host
+        {
+            sizeof(KSDATARANGE_AUDIO),
+            KSDATARANGE_ATTRIBUTES,         // An attributes list follows this data range
+            0,
+            0,
+            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MAT21),
+            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
+        },
+        HDMI_DOLBY_MAT_MAX_CHANNELS,
+        HDMI_DOLBY_MAT_MIN_BITS_PER_SAMPLE,
+        HDMI_DOLBY_MAT_MAX_BITS_PER_SAMPLE,
+        HDMI_DOLBY_MAT_MIN_SAMPLE_RATE,
+        HDMI_DOLBY_MAT_MAX_SAMPLE_RATE
     }
 };
 
@@ -313,6 +559,16 @@ PKSDATARANGE HdmiPinDataRangePointersStream[] =
     PKSDATARANGE(&HdmiPinDataRangesStream[0]),
     PKSDATARANGE(&PinDataRangeAttributeList),
     PKSDATARANGE(&HdmiPinDataRangesStream[2]),
+    PKSDATARANGE(&PinDataRangeAttributeList),
+    PKSDATARANGE(&HdmiPinDataRangesStream[3]),
+    PKSDATARANGE(&PinDataRangeAttributeList),
+    PKSDATARANGE(&HdmiPinDataRangesStream[4]),
+    PKSDATARANGE(&PinDataRangeAttributeList),
+    PKSDATARANGE(&HdmiPinDataRangesStream[5]),
+    PKSDATARANGE(&PinDataRangeAttributeList),
+    PKSDATARANGE(&HdmiPinDataRangesStream[6]),
+    PKSDATARANGE(&PinDataRangeAttributeList),
+    PKSDATARANGE(&HdmiPinDataRangesStream[7]),
     PKSDATARANGE(&PinDataRangeAttributeList)
 };
 
@@ -326,7 +582,7 @@ PKSDATARANGE HdmiPinDataRangePointersLoopbackStream[] =
 static
 KSDATARANGE HdmiPinDataRangesBridge[] =
 {
-    {
+    { // 0
         sizeof(KSDATARANGE),
         0,
         0,
@@ -335,7 +591,7 @@ KSDATARANGE HdmiPinDataRangesBridge[] =
         STATICGUIDOF(KSDATAFORMAT_SUBTYPE_ANALOG),
         STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
     },
-    {
+    { // 1
         sizeof(KSDATARANGE),
         0,
         0,
@@ -343,6 +599,51 @@ KSDATARANGE HdmiPinDataRangesBridge[] =
         STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
         STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_DIGITAL),
         STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
+    },
+    { // 2
+        sizeof(KSDATARANGE),
+        0,
+        0,
+        0,
+        STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+        STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MLP),
+        STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
+    },
+    { // 3
+        sizeof(KSDATARANGE),
+        0,
+        0,
+        0,
+        STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+        STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DTS),
+        STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
+    },
+    { // 4
+        sizeof(KSDATARANGE),
+        0,
+        0,
+        0,
+        STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+        STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DTS_HD),
+        STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
+    },
+    { // 5
+        sizeof(KSDATARANGE),
+        0,
+        0,
+        0,
+        STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+        STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MAT20),
+        STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
+    },
+    { // 6
+        sizeof(KSDATARANGE),
+        0,
+        0,
+        0,
+        STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
+        STATICGUIDOF(KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MAT21),
+        STATICGUIDOF(KSDATAFORMAT_SPECIFIER_NONE)
     }
 };
 
@@ -350,7 +651,12 @@ static
 PKSDATARANGE HdmiPinDataRangePointersBridge[] =
 {
     &HdmiPinDataRangesBridge[0],
-    &HdmiPinDataRangesBridge[1]    
+    &HdmiPinDataRangesBridge[1],
+    &HdmiPinDataRangesBridge[2],
+    &HdmiPinDataRangesBridge[3],
+    &HdmiPinDataRangesBridge[4],
+    &HdmiPinDataRangesBridge[5],
+    &HdmiPinDataRangesBridge[6]
 };
 
 
diff --git a/audio/sysvad/TabletAudioSample/micintopo.cpp b/audio/sysvad/TabletAudioSample/micintopo.cpp
index 6c1de10f..22746b95 100644
--- a/audio/sysvad/TabletAudioSample/micintopo.cpp
+++ b/audio/sysvad/TabletAudioSample/micintopo.cpp
@@ -204,7 +204,7 @@ Return Value:
                         // 0x00000001 - JACKDESC2_PRESENCE_DETECT_CAPABILITY
                         // 0x00000002 - JACKDESC2_DYNAMIC_FORMAT_CHANGE_CAPABILITY 
                         //
-                        pDesc->JackCapabilities = JACKDESC2_PRESENCE_DETECT_CAPABILITY;
+                        pDesc->JackCapabilities = 0;
                         
                         ntStatus = STATUS_SUCCESS;
                     }
diff --git a/audio/sysvad/TabletAudioSample/micinwavtable.h b/audio/sysvad/TabletAudioSample/micinwavtable.h
index c22ac94c..2f923a31 100644
--- a/audio/sysvad/TabletAudioSample/micinwavtable.h
+++ b/audio/sysvad/TabletAudioSample/micinwavtable.h
@@ -414,6 +414,12 @@ PCPROPERTY_ITEM PropertiesMicInWaveFilter[] =
         KSPROPERTY_PIN_PROPOSEDATAFORMAT,
         KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_BASICSUPPORT,
         PropertyHandler_WaveFilter
+    },
+    {
+        &KSPROPSETID_Pin,
+        KSPROPERTY_PIN_PROPOSEDATAFORMAT2,
+        KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_BASICSUPPORT,
+        PropertyHandler_WaveFilter
     }
 };
 
diff --git a/audio/sysvad/TabletAudioSample/minipairs.h b/audio/sysvad/TabletAudioSample/minipairs.h
index e955791e..0a3c82ef 100644
--- a/audio/sysvad/TabletAudioSample/minipairs.h
+++ b/audio/sysvad/TabletAudioSample/minipairs.h
@@ -163,11 +163,13 @@ static
 ENDPOINT_MINIPAIR SpeakerMiniports =
 {
     eSpeakerDevice,
-    L"TopologySpeaker",                                     // make sure this name matches with KSNAME_TopologySpeaker in the inf's [Strings] section 
+    L"TopologySpeaker",                                     // make sure this or the template name matches with KSNAME_TopologySpeaker in the inf's [Strings] section 
+    NULL,                                                   // optional template name
     CreateMiniportTopologySYSVAD,
     &SpeakerTopoMiniportFilterDescriptor,
     0, NULL,                                                // Interface properties
-    L"WaveSpeaker",                                         // make sure this name matches with KSNAME_WaveSpeaker in the inf's [Strings] section
+    L"WaveSpeaker",                                         // make sure this or the template name matches with KSNAME_WaveSpeaker in the inf's [Strings] section
+    NULL,                                                   // optional template name
     CreateMiniportWaveRTSYSVAD,
     &SpeakerWaveMiniportFilterDescriptor,
     ARRAYSIZE(SysvadWaveFilterInterfacePropertiesRender),   // Interface properties
@@ -209,11 +211,13 @@ static
 ENDPOINT_MINIPAIR SpeakerHpMiniports =
 {
     eSpeakerHpDevice,
-    L"TopologySpeakerHeadphone",            // make sure this name matches with KSNAME_TopologySpeakerHeadphone in the inf's [Strings] section 
+    L"TopologySpeakerHeadphone",            // make sure this or the template name matches with KSNAME_TopologySpeakerHeadphone in the inf's [Strings] section 
+    NULL,                                   // optional template name
     CreateMiniportTopologySYSVAD,
     &SpeakerHpTopoMiniportFilterDescriptor,
     0, NULL,                                // Interface properties
-    L"WaveSpeakerHeadphone",                // make sure this name matches with KSNAME_WaveSpeakerHeadphone in the inf's [Strings] section
+    L"WaveSpeakerHeadphone",                // make sure this or the template name matches with KSNAME_WaveSpeakerHeadphone in the inf's [Strings] section
+    NULL,                                   // optional template name
     CreateMiniportWaveRTSYSVAD,
     &SpeakerHpWaveMiniportFilterDescriptor,
     0, NULL,                                // Interface properties
@@ -254,11 +258,13 @@ static
 ENDPOINT_MINIPAIR HdmiMiniports =
 {
     eHdmiRenderDevice,
-    L"TopologyHdmi",                        // make sure this name matches with KSNAME_TopologyHdmi in the inf's [Strings] section 
+    L"TopologyHdmi",                        // make sure this or the template name matches with KSNAME_TopologyHdmi in the inf's [Strings] section 
+    NULL,                                   // optional template name
     CreateHdmiMiniportTopology,
     &HdmiTopoMiniportFilterDescriptor,
     0, NULL,                                // Interface properties
-    L"WaveHdmi",                            // make sure this name matches with KSNAME_WaveHdmi in the inf's [Strings] section
+    L"WaveHdmi",                            // make sure this or the template name matches with KSNAME_WaveHdmi in the inf's [Strings] section
+    NULL,                                   // optional template name
     CreateMiniportWaveRTSYSVAD,
     &HdmiWaveMiniportFilterDescriptor,
     0, NULL,                                // Interface properties
@@ -267,7 +273,7 @@ ENDPOINT_MINIPAIR HdmiMiniports =
     SIZEOF_ARRAY(HdmiPinDeviceFormatsAndModes),
     HdmiTopologyPhysicalConnections,
     SIZEOF_ARRAY(HdmiTopologyPhysicalConnections),
-    ENDPOINT_NO_FLAGS,
+    ENDPOINT_LOOPBACK_SUPPORTED,
     NULL, 0, NULL,                          // audio module settings.
 };
 
@@ -297,11 +303,13 @@ static
 ENDPOINT_MINIPAIR SpdifMiniports =
 {
     eSpdifRenderDevice,
-    L"TopologySpdif",                                       // make sure this name matches with KSNAME_TopologySpeaker in the inf's [Strings] section 
+    L"TopologySpdif",                                       // make sure this or the template name matches with KSNAME_TopologySpeaker in the inf's [Strings] section 
+    NULL,                                                   // optional template name
     CreateMiniportTopologySYSVAD,
     &SpdifTopoMiniportFilterDescriptor,
     0, NULL,                                                // Interface properties
-    L"WaveSpdif",                                           // make sure this name matches with KSNAME_WaveSpeaker in the inf's [Strings] section
+    L"WaveSpdif",                                           // make sure this or the template name matches with KSNAME_WaveSpeaker in the inf's [Strings] section
+    NULL,                                                   // optional template name
     CreateMiniportWaveRTSYSVAD,
     &SpdifWaveMiniportFilterDescriptor,
     ARRAYSIZE(SysvadWaveFilterInterfacePropertiesRender),   // Interface properties
@@ -343,11 +351,13 @@ static
 ENDPOINT_MINIPAIR MicInMiniports =
 {
     eMicInDevice,
-    L"TopologyMicIn",                       // make sure this name matches with KSNAME_TopologyMicIn in the inf's [Strings] section 
+    L"TopologyMicIn",                       // make sure this or the template name matches with KSNAME_TopologyMicIn in the inf's [Strings] section 
+    NULL,                                   // optional template name
     CreateMiniportTopologySYSVAD,
     &MicInTopoMiniportFilterDescriptor,
     0, NULL,                                // Interface properties
-    L"WaveMicIn",                           // make sure this name matches with KSNAME_WaveMicIn in the inf's [Strings] section
+    L"WaveMicIn",                           // make sure this or the template name matches with KSNAME_WaveMicIn in the inf's [Strings] section
+    NULL,                                   // optional template name
     CreateMiniportWaveRTSYSVAD,
     &MicInWaveMiniportFilterDescriptor,
     0, NULL,                                // Interface properties
@@ -384,11 +394,13 @@ static
 ENDPOINT_MINIPAIR MicArray1Miniports =
 {
     eMicArrayDevice1,
-    L"TopologyMicArray1",                                   // make sure this name matches with KSNAME_TopologyMicArray1 in the inf's [Strings] section 
+    L"TopologyMicArray1",                                   // make sure this or the template name matches with KSNAME_TopologyMicArray1 in the inf's [Strings] section 
+    NULL,                                                   // optional template name
     CreateMicArrayMiniportTopology,
     &MicArray1TopoMiniportFilterDescriptor,
     0, NULL,                                                // Interface properties
-    L"WaveMicArray1",                                       // make sure this name matches with KSNAME_WaveMicArray1 in the inf's [Strings] section
+    L"WaveMicArray1",                                       // make sure this or the template name matches with KSNAME_WaveMicArray1 in the inf's [Strings] section
+    NULL,                                                   // optional template name
     CreateMiniportWaveRTSYSVAD,
     &MicArrayWaveMiniportFilterDescriptor,
     ARRAYSIZE(SysvadWaveFilterInterfacePropertiesCapture),  // Interface properties
@@ -426,11 +438,13 @@ static
 ENDPOINT_MINIPAIR MicArray2Miniports =
 {
     eMicArrayDevice2,
-    L"TopologyMicArray2",                   // make sure this name matches with KSNAME_TopologyMicArray2 in the inf's [Strings] section 
+    L"TopologyMicArray2",                   // make sure this or the template name matches with KSNAME_TopologyMicArray2 in the inf's [Strings] section 
+    NULL,                                   // optional template name
     CreateMicArrayMiniportTopology,
     &MicArray2TopoMiniportFilterDescriptor,
     0, NULL,                                // Interface properties
-    L"WaveMicArray2",                       // make sure this name matches with KSNAME_WaveMicArray2 in the inf's [Strings] section
+    L"WaveMicArray2",                       // make sure this or the template name matches with KSNAME_WaveMicArray2 in the inf's [Strings] section
+    NULL,                                   // optional template name
     CreateMiniportWaveRTSYSVAD,
     &MicArrayWaveMiniportFilterDescriptor,
     0, NULL,                                // Interface properties
@@ -467,11 +481,13 @@ static
 ENDPOINT_MINIPAIR MicArray3Miniports =
 {
     eMicArrayDevice3,
-    L"TopologyMicArray3",                   // make sure this name matches with KSNAME_TopologyMicArray3 in the inf's [Strings] section 
+    L"TopologyMicArray3",                   // make sure this or the template name matches with KSNAME_TopologyMicArray3 in the inf's [Strings] section 
+    NULL,                                   // optional template name
     CreateMicArrayMiniportTopology,
     &MicArray3TopoMiniportFilterDescriptor,
     0, NULL,                                // Interface properties
-    L"WaveMicArray3",                       // make sure this name matches with KSNAME_WaveMicArray3 in the inf's [Strings] section
+    L"WaveMicArray3",                       // make sure this or the template name matches with KSNAME_WaveMicArray3 in the inf's [Strings] section
+    NULL,                                   // optional template name
     CreateMiniportWaveRTSYSVAD,
     &MicArray3WaveMiniportFilterDescriptor,
     0, NULL,                                // Interface properties
diff --git a/audio/sysvad/TabletAudioSample/sources b/audio/sysvad/TabletAudioSample/sources
index 39d0de57..91592397 100644
--- a/audio/sysvad/TabletAudioSample/sources
+++ b/audio/sysvad/TabletAudioSample/sources
@@ -34,14 +34,15 @@ KMDF_VERSION_MAJOR=1
 #C_DEFINES= $(C_DEFINES) -D_USE_IPortClsRuntimePower
 C_DEFINES= $(C_DEFINES) -D_USE_SingleComponentMultiFxStates
 
-INCLUDES= \
-        $(INCLUDES); \
-        ..\EndpointsCommon; \
+INCLUDES=                               \
+        $(INCLUDES);                    \
+        ..\EndpointsCommon;             \
 
-SOURCES=$(SOURCES)              \
-        hdmitopo.cpp    \
-        spdiftopo.cpp   \
-        micintopo.cpp   \
+SOURCES=$(SOURCES)                      \
+        hdmitopo.cpp                    \
+        spdiftopo.cpp                   \
+        micintopo.cpp                   \
+        TabletAudioSample.rc            \
 
 
 # Indicate that this module must be included in the driver package
@@ -49,5 +50,4 @@ DDK_NO_PACKAGE_PROJECT=0
 DDK_INCLUDE_PACKAGE_PROJECT=1
 
 
-MUI_VERIFY_NO_LOC_RESOURCE=1 
-
+MUI_VERIFY_NO_LOC_RESOURCE=1
diff --git a/audio/sysvad/TabletAudioSample/spdifwavtable.h b/audio/sysvad/TabletAudioSample/spdifwavtable.h
index 36b0e903..fd23799c 100644
--- a/audio/sysvad/TabletAudioSample/spdifwavtable.h
+++ b/audio/sysvad/TabletAudioSample/spdifwavtable.h
@@ -423,6 +423,8 @@ KSDATAFORMAT_WAVEFORMATEXTENSIBLE SpdifOffloadPinSupportedDeviceFormats[] =
 
 //
 // Supported modes (only on streaming pins).
+// Note: This pin does not support KSPROPERTY_PIN_PROPOSEDATAFORMAT2 
+//       since none of the modes on this endpoint have a default format.
 //
 static
 MODE_AND_DEFAULT_FORMAT SpdifHostPinSupportedDeviceModes[] =
@@ -443,10 +445,6 @@ MODE_AND_DEFAULT_FORMAT SpdifOffloadPinSupportedDeviceModes[] =
     {
         STATIC_AUDIO_SIGNALPROCESSINGMODE_RAW,
         NULL, // just an example of no default format for this endpoint/mode   
-    },
-    {
-        STATIC_AUDIO_SIGNALPROCESSINGMODE_DEFAULT,
-        NULL, // just an example of no default format for this endpoint/mode   
     }
 };
 
diff --git a/audio/sysvad/TabletAudioSample/tabletaudiosample.inf b/audio/sysvad/TabletAudioSample/tabletaudiosample.inx
index 8a0eb788..e1c0512f 100644
--- a/audio/sysvad/TabletAudioSample/tabletaudiosample.inf
+++ b/audio/sysvad/TabletAudioSample/tabletaudiosample.inx