Merge develop changes prior to upcoming WDK release (May 2024)

author: Adonais Romero González <[email protected]> 2024-05-06 16:21:31 -0700
committer: GitHub <[email protected]> 2024-05-06 16:21:31 -0700
commit: a74a241c664c4e1d7c0838287b34076c19d9858a (patch)
tree: 6ff7562612967b122acf8acf8a69c4dcfd5905db /network/wlan
parent: def8e8e34ed2b7b1deb2fc9112ac4255f1a0f2ba (diff)
parent: 15477ce52bbb6b42ca591ecdfb484cac089f89ab (diff)
16 files changed, 306 insertions, 7236 deletions
diff --git a/network/wlan/WDI/COMMON/common.vcxproj b/network/wlan/WDI/COMMON/common.vcxproj
index 339f1c94..2842595d 100644
--- a/network/wlan/WDI/COMMON/common.vcxproj
+++ b/network/wlan/WDI/COMMON/common.vcxproj
@@ -1,28 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Win10 Debug|Arm">
-      <Configuration>Win10 Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Debug|Win32">
-      <Configuration>Win10 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Debug|x64">
-      <Configuration>Win10 Debug</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Release|Arm">
-      <Configuration>Win10 Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Release|Win32">
-      <Configuration>Win10 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Release|x64">
-      <Configuration>Win10 Release</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -31,14 +15,13 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <DriverType>KMDF</DriverType>
     <TARGETNAME>$(ProjectName)</TARGETNAME>
-    <Configuration>Win10 Debug</Configuration>
+    <Configuration>Debug</Configuration>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="PropertySheets">
     <ConversionToolVersion>1.0</ConversionToolVersion>
     <BUILD_ALT_DIR>$(Configuration.Replace(' ',''))</BUILD_ALT_DIR>
-    <IntDir Condition="'$(Platform)'!='Win32'">$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
-    <IntDir Condition="'$(Platform)'=='Win32'">$(BUILD_ALT_DIR)\</IntDir>
+    <IntDir>$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
     <OutDir>$(SolutionDir)COMMON\$(Configuration)\$(Platform)\</OutDir>
   </PropertyGroup>
   <ImportGroup Label="PreConfiguration">
@@ -47,83 +30,21 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{956B060D-1055-4584-9CF4-9FE14C428545}</ProjectGuid>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-    <SupportsPackaging>
-    </SupportsPackaging>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Arm'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'" Label="Configuration">
-    <TargetVersion>
-    </TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
   </PropertyGroup>
   <PropertyGroup>
     <DebuggerFlavor Condition="'$(IsKernelModeToolset)'=='true'">DbgengKernelDebugger</DebuggerFlavor>
     <DebuggerFlavor Condition="'$(IsUserModeToolset)'=='true'">DbgengRemoteDebugger</DebuggerFlavor>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ExecutablePath>
-    </ExecutablePath>
-    <ReferencePath>$(VC_ReferencesPath_x86);</ReferencePath>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
-    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath>$(VC_SourcePath);</SourcePath>
-    <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);</ExcludePath>
-    <ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.ilk;*.ipdb;*.iobj;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ReferencePath>$(VC_ReferencePath_x86);</ReferencePath>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
-    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath>$(VC_SourcePath);</SourcePath>
-    <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);</ExcludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Arm'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ReferencePath>$(VC_ReferencePath_Arm);</ReferencePath>
-    <LibraryPath>$(VC_LibraryPath_Arm);$(WindowsSDK_LibraryPath_Arm);$(NETFXKitsDir)Lib\um\arm</LibraryPath>
-    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath>$(VC_SourcePath);</SourcePath>
-    <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_arm);</ExcludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ReferencePath>$(VC_ReferencePath_Arm);</ReferencePath>
-    <LibraryPath>$(VC_LibraryPath_Arm);$(WindowsSDK_LibraryPath_Arm);$(NETFXKitsDir)Lib\um\arm</LibraryPath>
-    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath>$(VC_SourcePath);</SourcePath>
-    <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_arm);</ExcludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
     <ReferencePath>$(VC_ReferencesPath_x64);</ReferencePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
@@ -131,7 +52,7 @@
     <SourcePath>$(VC_SourcePath);</SourcePath>
     <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64);</ExcludePath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
     <ReferencePath>$(VC_ReferencesPath_x64);</ReferencePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
@@ -139,208 +60,7 @@
     <SourcePath>$(VC_SourcePath);</SourcePath>
     <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64);</ExcludePath>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_X86_;DBG;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <AdditionalIncludeDirectories>$(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;</AdditionalIncludeDirectories>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <ShowIncludes>false</ShowIncludes>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-      <WppEnabled>true</WppEnabled>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
-    <ClCompile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <MinimalRebuild>true</MinimalRebuild>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <ShowIncludes>false</ShowIncludes>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-      <AdditionalIncludeDirectories>$(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_X86_;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WppEnabled>true</WppEnabled>
-      <DebugInformationFormat>None</DebugInformationFormat>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Lib>
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Arm'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;</AdditionalIncludeDirectories>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>_ARM_;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <MinimalRebuild>true</MinimalRebuild>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <ShowIncludes>false</ShowIncludes>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-      <WppEnabled>true</WppEnabled>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'">
-    <ClCompile>
-      <DebugInformationFormat>None</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'">
-    <ClCompile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>_ARM_;DBG;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <MinimalRebuild>true</MinimalRebuild>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <ShowIncludes>false</ShowIncludes>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-      <WppEnabled>true</WppEnabled>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;</AdditionalIncludeDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -388,7 +108,7 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WppEnabled>true</WppEnabled>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;</AdditionalIncludeDirectories>
diff --git a/network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj b/network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj
index 7fe68165..a4044511 100644
--- a/network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj
+++ b/network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj
@@ -1,78 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Win10 Debug|Arm">
-      <Configuration>Win10 Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Debug|Win32">
-      <Configuration>Win10 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Debug|x64">
-      <Configuration>Win10 Debug</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Release|Arm">
-      <Configuration>Win10 Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Release|Win32">
-      <Configuration>Win10 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Release|x64">
-      <Configuration>Win10 Release</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Debug|Arm">
-      <Configuration>WinBlue Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Debug|Arm">
-      <Configuration>Win8 Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Release|Arm">
-      <Configuration>WinBlue Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Release|Arm">
-      <Configuration>Win8 Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Debug|Win32">
-      <Configuration>WinBlue Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Debug|Win32">
-      <Configuration>Win8 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win7 Debug|Win32">
-      <Configuration>Win7 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Vista Debug|Win32">
-      <Configuration>Vista Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Release|Win32">
-      <Configuration>WinBlue Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Release|Win32">
-      <Configuration>Win8 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win7 Release|Win32">
-      <Configuration>Win7 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Vista Release|Win32">
-      <Configuration>Vista Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="WinBlue Debug|x64">
       <Configuration>WinBlue Debug</Configuration>
       <Platform>x64</Platform>
@@ -118,8 +54,7 @@
   <PropertyGroup Label="PropertySheets">
     <ConversionToolVersion>1.0</ConversionToolVersion>
     <BUILD_ALT_DIR>$(Configuration.Replace(' ',''))</BUILD_ALT_DIR>
-    <IntDir Condition="'$(Platform)'!='Win32'">$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
-    <IntDir Condition="'$(Platform)'=='Win32'">$(BUILD_ALT_DIR)\x86\</IntDir>
+    <IntDir>$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
     <OutDir>$(IntDir)</OutDir>
   </PropertyGroup>
   <ImportGroup Label="PreConfiguration">
@@ -128,77 +63,11 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{316BB9D3-0947-4431-BC09-1C71C7201001}</ProjectGuid>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|Arm'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Mobile</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Arm'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|Arm'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Arm'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Mobile</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Arm'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|Win32'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">
-    <TargetVersion>Win7</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|Win32'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">
-    <TargetVersion>Win7</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|x64'">
     <TargetVersion>WindowsV6.3</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
   </PropertyGroup>
@@ -218,7 +87,7 @@
     <TargetVersion>WindowsV6.3</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
   </PropertyGroup>
diff --git a/network/wlan/WDI/HEADER/PlatformDef.h b/network/wlan/WDI/HEADER/PlatformDef.h
index cad6fb7a..a8f4fb55 100644
--- a/network/wlan/WDI/HEADER/PlatformDef.h
+++ b/network/wlan/WDI/HEADER/PlatformDef.h
@@ -813,42 +813,42 @@ PlatformRequestPreAuthentication(
 
 RT_STATUS
 PlatformReadFile(
-	IN		PVOID		Adapter,
-	IN		ps1Byte		szFileName,
-	IN OUT	pu1Byte		pBufOfLines,
-	IN		s4Byte		nMaxNumLine,
-	IN		s4Byte		nMaxByteCntLine,
-	OUT		ps4Byte		pnNumLines	
+	IN		PVOID				Adapter,
+	IN		UNICODE_STRING*		fileName,
+	IN OUT	pu1Byte				pBufOfLines,
+	IN		s4Byte				nMaxNumLine,
+	IN		s4Byte				nMaxByteCntLine,
+	OUT		ps4Byte				pnNumLinesRead
 	);
 
 RT_STATUS
 PlatformOpenFile(
-	IN		PVOID		Adapter,
-	IN		ps1Byte		szFileName,
-	IN OUT	PRT_FILE_HANDLER		pFileHandler
+	IN		UNICODE_STRING*		fileName,
+	IN OUT	HANDLE*				fileHandle
 	);
 
 RT_STATUS
 PlatformMapFile(
-	IN OUT	PRT_FILE_HANDLER	pFileHandler
+	IN OUT	HANDLE*	fileHandle,
+	OUT		u1Byte* contentBuffer,
+	OUT		s4Byte* contentBufferLength
 	);
 
 VOID
 PlatformUnMapFile(
-	IN OUT	PRT_FILE_HANDLER	pFileHandler
+	IN OUT	u1Byte* contentBuffer
 	);
 
 VOID
 PlatformCloseFile(
-	IN OUT	PRT_FILE_HANDLER	pFileHandler
+	IN OUT	HANDLE* fileHandle
 	);
 
 RT_STATUS
 PlatformReadAndMapFile(
-	IN		PVOID		Adapter,
-	IN		ps1Byte		szFileName,
-	IN OUT	pu1Byte		pOutFile,
-	IN OUT	pu4Byte	UNALIGNED	pFileSize
+	IN		UNICODE_STRING*		fileName,
+	OUT		u1Byte*				outFileBuffer,
+	OUT		u4Byte*				outFileBufferLength
 	);
 
 BOOLEAN
diff --git a/network/wlan/WDI/LIB/Arm/hal.lib b/network/wlan/WDI/LIB/Arm/hal.lib
deleted file mode 100644
index 794359a7..00000000
--- a/network/wlan/WDI/LIB/Arm/hal.lib
+++ /dev/null
diff --git a/network/wlan/WDI/LIB/Arm/rtklibcom.lib b/network/wlan/WDI/LIB/Arm/rtklibcom.lib
deleted file mode 100644
index 356e3860..00000000
--- a/network/wlan/WDI/LIB/Arm/rtklibcom.lib
+++ /dev/null
diff --git a/network/wlan/WDI/LIB/x86/hal.lib b/network/wlan/WDI/LIB/x86/hal.lib
deleted file mode 100644
index 41be4e25..00000000
--- a/network/wlan/WDI/LIB/x86/hal.lib
+++ /dev/null
diff --git a/network/wlan/WDI/LIB/x86/rtklibcom.lib b/network/wlan/WDI/LIB/x86/rtklibcom.lib
deleted file mode 100644
index b18054af..00000000
--- a/network/wlan/WDI/LIB/x86/rtklibcom.lib
+++ /dev/null
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c b/network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c
index d122f0c0..a8eb835d 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c
+++ b/network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c
@@ -207,85 +207,105 @@ ParseFileBufToLines(
 //		which is a 2-dimention array, for example,
 //		u1Byte pBufOfLines[nMaxNumLine][nMaxByteCntLine].
 //
-//	Note:
-//		In NDIS5, the file to open shall be placed at the directory the same as 
-//		driver binary.
-//
 RT_STATUS
 PlatformReadFile(
-	IN		PVOID		Adapter,
-	IN		ps1Byte		szFileName,
-	IN OUT	pu1Byte		pBufOfLines,
-	IN		s4Byte		nMaxNumLine,
-	IN		s4Byte		nMaxByteCntLine,
-	OUT		ps4Byte		pnNumLinesRead
+	IN		PVOID				Adapter,
+	IN		UNICODE_STRING*		fileName,
+	IN OUT	pu1Byte				pBufOfLines,
+	IN		s4Byte				nMaxNumLine,
+	IN		s4Byte				nMaxByteCntLine,
+	OUT		ps4Byte				pnNumLinesRead
 	)
 {
-	RT_STATUS				rtStatus = RT_STATUS_FAILURE;
-	NDIS_STRING				NdisStrFileName;
-	NDIS_PHYSICAL_ADDRESS	ndisPhyAddr;
-	NDIS_STATUS				ndisStatus;
-	NDIS_HANDLE				hFileHandle;
-	UINT					ulFileLength;
-	pu1Byte					pMappedFile = NULL;
+	RT_STATUS			rtStatus = RT_STATUS_FAILURE;
+	OBJECT_ATTRIBUTES	objectAttributes;
+	HANDLE				fileHandle;
+	IO_STATUS_BLOCK		iostatBlock;
+	NTSTATUS			ntStatus;
 
-	// Check input parameters.
-	if(szFileName == NULL)
-	{
-		RT_TRACE(COMP_INIT, DBG_WARNING, ("PlatformReadFile(): szFileName should not be NULL!\n"));
-		return rtStatus;
-	}
+	// Check Input parameters.
 	if(pBufOfLines == NULL)
 	{
 		RT_TRACE(COMP_INIT, DBG_WARNING, ("PlatformReadFile(): pBufOfLines should not be NULL!\n"));
 		return rtStatus;
 	}
 
-	// Convert szFileName to NDIS_STRING.
-	NdisInitializeString(&NdisStrFileName, (PUCHAR)szFileName);
-	if(NdisStrFileName.Buffer != NULL && NdisStrFileName.Length > 0)
-	{
-		// Open the file specified.
-		ndisPhyAddr.LowPart = ndisPhyAddr.HighPart = -1;
-		NdisOpenFile(&ndisStatus,
-					&hFileHandle,
-					&ulFileLength,
-					&NdisStrFileName,
-					ndisPhyAddr);
-		if(ndisStatus == NDIS_STATUS_SUCCESS)
-		{
-			// Map the file into memory.
-			NdisMapFile(&ndisStatus, (PVOID *)(&pMappedFile), hFileHandle);
-			if(ndisStatus == NDIS_STATUS_SUCCESS)
-			{
-				// Read the file into pBufOfLines.
-				ParseFileBufToLines(Adapter, pMappedFile, ulFileLength, pBufOfLines, nMaxNumLine, nMaxByteCntLine, pnNumLinesRead);
-	
-				// Return Success only when Config Success
-				rtStatus = RT_STATUS_SUCCESS; 
-	
-				// Relase the memory for mapping the file.
-				NdisUnmapFile(hFileHandle);
+	// Initialize the object attributes of the file we want to open
+	InitializeObjectAttributes(
+		&objectAttributes,
+		fileName,
+		OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE,
+		NULL,	// RootDirectory 
+		NULL	// Default Security
+	);	
+
+	// Open the file using the object attributes to get a Handle
+	ntStatus = ZwOpenFile(
+		&fileHandle,
+		GENERIC_READ, 
+		&objectAttributes,
+		&iostatBlock,
+		0,	// Do not share the file
+		FILE_NON_DIRECTORY_FILE
+	);
+
+	if (NT_SUCCESS(ntStatus)) {
+		FILE_STANDARD_INFORMATION fileInformation = { 0 };
+
+		// Get the file information to know the size we need to alloc
+		ntStatus = ZwQueryInformationFile(
+			fileHandle,
+			&iostatBlock,
+			&fileInformation,
+			sizeof(fileInformation),
+			FileStandardInformation
+		);
+
+		if (NT_SUCCESS(ntStatus)) {
+			u1Byte* buffer = NULL;
+			s4Byte bufferLength = (s4Byte)fileInformation.EndOfFile.QuadPart;
+
+			// Try to allocate space to read the file
+			buffer = ExAllocatePool2(POOL_FLAG_NON_PAGED, bufferLength, 'frP');
+			if (buffer) {
+
+				// If alloc was successful, then read the file
+				ntStatus = ZwReadFile(
+					fileHandle,
+					NULL,
+					NULL, 
+					NULL,
+					&iostatBlock,
+					buffer,
+					bufferLength,
+					0,	// No offset
+					NULL
+				);
+
+				if (NT_SUCCESS(ntStatus)) {
+					// Read the buffer into pBufOfLines.
+					ParseFileBufToLines(Adapter, buffer, bufferLength, pBufOfLines, nMaxNumLine, nMaxByteCntLine, pnNumLinesRead);
+					rtStatus = RT_STATUS_SUCCESS;
+				}
+				else {
+					RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to read file, ntStatus: %#X\n", ntStatus));
+				}
+
+				ExFreePool(buffer);
+
 			}
-			else
-			{
-				RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to map the file, %s!, ndisStatus: %#X\n", szFileName, ndisStatus));
+			else {
+				RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to allocate space for file!\n"));
 			}
-	
-			// Close the file.
-			NdisCloseFile(hFileHandle);
 		}
-		else
-		{
-			RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to open the file, %s!, ndisStatus: %#X\n", szFileName, ndisStatus));
+		else {
+			RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to read file attributes!, ntStatus: %#X\n", ntStatus));
 		}
-	
-		// Release the NDIS_STRING allocated via NdisInitializeString().
-		NdisFreeString(NdisStrFileName);
+
+		ZwClose(fileHandle);
 	}
-	else
-	{
-		RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): NdisInitializeString() failed! szFileName: %s\n", szFileName));
+	else {
+		RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to open the file!, ntStatus: %#X\n", ntStatus));
 	}
 
 	return rtStatus;
@@ -293,51 +313,39 @@ PlatformReadFile(
 
 RT_STATUS
 PlatformOpenFile(
-	IN		PVOID				Adapter,
-	IN		ps1Byte				szFileName,
-	IN OUT	PRT_FILE_HANDLER	pFileHandler
+	IN		UNICODE_STRING*		fileName,
+	IN OUT	HANDLE*				fileHandle
 	)
 {
-	RT_STATUS				rtStatus = RT_STATUS_FAILURE;
-	NDIS_STRING				NdisStrFileName;
-	NDIS_PHYSICAL_ADDRESS	ndisPhyAddr;
-	NDIS_STATUS				ndisStatus;
-	pu1Byte					pMappedFile = NULL;
+	RT_STATUS			rtStatus = RT_STATUS_FAILURE;
+	OBJECT_ATTRIBUTES	objectAttributes;
+	IO_STATUS_BLOCK		iostatBlock;
+	NTSTATUS			ntStatus;
 
-	
-	// Check input parameters.
-	if(szFileName == NULL)
-	{
-		RT_TRACE(COMP_INIT, DBG_LOUD, ("PlatformOpenFile(): szFileName should not be NULL!\n"));
-		return rtStatus;
-	}
+	// Initialize the object attributes of the file we want to open
+	InitializeObjectAttributes(
+		&objectAttributes,
+		fileName,
+		OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE,
+		NULL,	// RootDirectory 
+		NULL	// Default Security
+	);
 
-	// Convert szFileName to NDIS_STRING.
-	NdisInitializeString(&NdisStrFileName, (PUCHAR)szFileName);
-	if(NdisStrFileName.Buffer != NULL && NdisStrFileName.Length > 0)
-	{
-		// Open the file specified.
-		ndisPhyAddr.LowPart = ndisPhyAddr.HighPart = -1;
-		NdisOpenFile(&ndisStatus,
-					&(pFileHandler->FileHandler),
-					&(pFileHandler->FileLength),
-					&NdisStrFileName,
-					ndisPhyAddr);
-		
-		NdisFreeString(NdisStrFileName);
-		if(ndisStatus == NDIS_STATUS_SUCCESS)
-		{
-			rtStatus = RT_STATUS_SUCCESS;
-		}
-		else
-		{
-			RT_TRACE(COMP_INIT, DBG_LOUD, ("PlatformOpenFile(): failed to open the file, %s!, ndisStatus: %#X\n", szFileName, ndisStatus));
-		}
-		
+	// Open the file using the object attributes to get a Handle
+	ntStatus = ZwOpenFile(
+		fileHandle,
+		GENERIC_READ,
+		&objectAttributes,
+		&iostatBlock,
+		0,	// Do not share the file
+		FILE_NON_DIRECTORY_FILE
+	);
+
+	if (NT_SUCCESS(ntStatus)) {
+		rtStatus = RT_STATUS_SUCCESS;
 	}
-	else
-	{
-		RT_TRACE(COMP_INIT, DBG_LOUD, ("PlatformOpenFile(): NdisInitializeString() failed! szFileName: %s\n", szFileName));
+	else {
+		RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to open the file!, ntStatus: %#X, fileName: %wZ\n", ntStatus, fileName));
 	}
 
 	return rtStatus;
@@ -345,20 +353,66 @@ PlatformOpenFile(
 
 RT_STATUS
 PlatformMapFile(
-	IN OUT	PRT_FILE_HANDLER	pFileHandler
+	IN OUT	HANDLE*	fileHandle,
+	OUT		u1Byte* contentBuffer,
+	OUT		s4Byte* contentBufferLength
 	)
 {
-	RT_STATUS				rtStatus = RT_STATUS_FAILURE;
-	NDIS_STATUS				ndisStatus;
 
-	
-	// Map the file into memory.
-	NdisMapFile(&ndisStatus, (PVOID *)(&(pFileHandler->MappedFile)), pFileHandler->FileHandler);
-	if(ndisStatus == NDIS_STATUS_SUCCESS) {
-		rtStatus = RT_STATUS_SUCCESS;
+	RT_STATUS			rtStatus = RT_STATUS_FAILURE;
+	OBJECT_ATTRIBUTES	objectAttributes;
+	IO_STATUS_BLOCK		iostatBlock;
+	NTSTATUS			ntStatus;
+
+
+	FILE_STANDARD_INFORMATION fileInformation = { 0 };
+
+	// Get the file information to know the size we need to alloc
+	ntStatus = ZwQueryInformationFile(
+		*fileHandle,
+		&iostatBlock,
+		&fileInformation,
+		sizeof(fileInformation),
+		FileStandardInformation
+	);
+
+	if (NT_SUCCESS(ntStatus)) {
+		u1Byte* buffer = NULL;
+		s4Byte bufferLength = (s4Byte)fileInformation.EndOfFile.QuadPart;
+
+		// Try to allocate space to read the file
+		buffer = ExAllocatePool2(POOL_FLAG_NON_PAGED, bufferLength, 'frP');
+		if (buffer) {
+
+			// If alloc was successful, then read the file
+			ntStatus = ZwReadFile(
+				fileHandle,
+				NULL,
+				NULL,
+				NULL,
+				&iostatBlock,
+				buffer,
+				bufferLength,
+				0,	// No offset
+				NULL
+			);
+
+			if (NT_SUCCESS(ntStatus)) {
+				contentBuffer = buffer;
+				*contentBufferLength = bufferLength;
+				rtStatus = RT_STATUS_SUCCESS;
+			}
+			else {
+				ExFreePool(buffer);
+				RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to read file, ntStatus: %#X\n", ntStatus));
+			}
+		}
+		else {
+			RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to allocate space for file!\n"));
+		}
 	}
 	else {
-		RT_TRACE(COMP_INIT, DBG_LOUD, ("PlatformMapFile(): failed to map the file!, ndisStatus: %#X\n", ndisStatus));
+		RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to read file attributes!, ntStatus: %#X\n", ntStatus));
 	}
 
 	return rtStatus;
@@ -366,22 +420,65 @@ PlatformMapFile(
 
 VOID
 PlatformUnMapFile(
-	IN OUT	PRT_FILE_HANDLER	pFileHandler
+	IN OUT	u1Byte* contentBuffer
 	)
 {
 	// Relase the memory for mapping the file.
-	NdisUnmapFile(pFileHandler->FileHandler);
+	ExFreePool(contentBuffer);
 }
 
+
 VOID
 PlatformCloseFile(
-	IN OUT	PRT_FILE_HANDLER	pFileHandler
+	IN OUT	HANDLE* fileHandle
 	)
 {
 	// Relase the memory for mapping the file.
-	NdisCloseFile(pFileHandler->FileHandler);
+	ZwClose(fileHandle);
+}
+
+//
+//	Description:
+//		Open the file specifed and copy the file into an byte buffer, 
+//
+RT_STATUS
+PlatformReadAndMapFile(
+	IN		UNICODE_STRING*		fileName,
+	OUT		u1Byte* outFileBuffer,
+	OUT		u4Byte* outFileBufferLength
+)
+{
+	RT_STATUS			rtStatus = RT_STATUS_FAILURE;
+	HANDLE				fileHandle;
+	RT_STATUS			callStatus;
+
+	callStatus = PlatformOpenFile(fileName, &fileHandle);
+
+	if (callStatus == RT_STATUS_SUCCESS) {
+		u1Byte* fileBuffer = NULL;
+		u4Byte* fileBufferLength = NULL;
+
+		callStatus = PlatformMapFile(&fileHandle, fileBuffer, fileBufferLength);
+
+		if (callStatus == RT_STATUS_SUCCESS) {
+			outFileBuffer = fileBuffer;
+			outFileBufferLength = fileBufferLength;
+			rtStatus = RT_STATUS_SUCCESS;
+		}
+		else {
+			RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadAndMapFile(): failed to map file!, rtStatus: %#X\n", callStatus));
+		}
+
+		PlatformCloseFile(fileHandle);
+	}
+	else {
+		RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadAndMapFile(): failed to open the file!, rtStatus: %#X\n", callStatus));
+	}
+
+	return rtStatus;
 }
 
+
 //
 //	Description:
 //		Indication for PHY power state changed.
@@ -2722,85 +2819,6 @@ N6InitializeNative80211MIBs(
 	Adapter->pNdisCommon->PrivacyExemptionEntrieNum = 0;	
 }
 
-//
-//	Description:
-//		Open the file specifed and copy the file into an array, 
-//
-RT_STATUS
-PlatformReadAndMapFile(
-	IN		PVOID		Adapter,
-	IN		ps1Byte		szFileName,
-	IN OUT	pu1Byte		pOutFile,
-	IN OUT	pu4Byte		UNALIGNED pFileSize
-	)
-{
-	RT_STATUS				rtStatus = RT_STATUS_FAILURE;
-	NDIS_STRING				NdisStrFileName;
-	NDIS_PHYSICAL_ADDRESS	ndisPhyAddr;
-	NDIS_STATUS				ndisStatus;
-	NDIS_HANDLE				hFileHandle;
-	UINT					ulFileLength;
-	pu1Byte					pMappedFile = NULL;
-
-	// Check input parameters.
-	if(szFileName == NULL)
-	{
-		RT_TRACE(COMP_INIT, DBG_WARNING, ("PlatformReadAndMapFile(): szFileName should not be NULL!\n"));
-		return rtStatus;
-	}
-
-
-	// Convert szFileName to NDIS_STRING.
-	NdisInitializeString(&NdisStrFileName, (PUCHAR)szFileName);
-	if(NdisStrFileName.Buffer != NULL && NdisStrFileName.Length > 0)
-	{
-		// Open the file specified.
-		ndisPhyAddr.LowPart = ndisPhyAddr.HighPart = -1;
-		NdisOpenFile(&ndisStatus,
-					&hFileHandle,
-					&ulFileLength,
-					&NdisStrFileName,
-					ndisPhyAddr);
-		if(ndisStatus == NDIS_STATUS_SUCCESS)
-		{
-			// Map the file into memory.
-			NdisMapFile(&ndisStatus, (PVOID *)(&pMappedFile), hFileHandle);
-			if(ndisStatus == NDIS_STATUS_SUCCESS)
-			{
-				// Copy File into array
-				PlatformMoveMemory(pOutFile, pMappedFile, ulFileLength);
-				*pFileSize = ulFileLength;
-	
-				// Return Success only when Config Success
-				rtStatus = RT_STATUS_SUCCESS; 
-	
-				// Relase the memory for mapping the file.
-				NdisUnmapFile(hFileHandle);
-			}
-			else
-			{
-				RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadAndMapFile(): failed to map the file, %s!, ndisStatus: %#X\n", szFileName, ndisStatus));
-			}
-	
-			// Close the file.
-			NdisCloseFile(hFileHandle);
-		}
-		else
-		{
-			RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadAndMapFile(): failed to open the file, %s!, ndisStatus: %#X\n", szFileName, ndisStatus));
-		}
-	
-		// Release the NDIS_STRING allocated via NdisInitializeString().
-		NdisFreeString(NdisStrFileName);
-	}
-	else
-	{
-		RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadAndMapFile(): NdisInitializeString() failed! szFileName: %s\n", szFileName));
-	}
-
-	return rtStatus;
-}
-
 
 //
 //	Description:
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj
index 963ab013..cfc0e2fa 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj
+++ b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj
@@ -1,108 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Win10 Debug|Arm">
-      <Configuration>Win10 Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Debug|Arm">
-      <Configuration>WinBlue Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Debug|Arm">
-      <Configuration>Win8 Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Release|Arm">
-      <Configuration>Win10 Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Release|Arm">
-      <Configuration>WinBlue Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Release|Arm">
-      <Configuration>Win8 Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Debug|Win32">
-      <Configuration>Win10 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Debug|Win32">
-      <Configuration>WinBlue Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Debug|Win32">
-      <Configuration>Win8 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win7 Debug|Win32">
-      <Configuration>Win7 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Vista Debug|Win32">
-      <Configuration>Vista Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Release|Win32">
-      <Configuration>Win10 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Release|Win32">
-      <Configuration>WinBlue Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Release|Win32">
-      <Configuration>Win8 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win7 Release|Win32">
-      <Configuration>Win7 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Vista Release|Win32">
-      <Configuration>Vista Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Debug|x64">
-      <Configuration>Win10 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Debug|x64">
-      <Configuration>WinBlue Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Debug|x64">
-      <Configuration>Win8 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win7 Debug|x64">
-      <Configuration>Win7 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Vista Debug|x64">
-      <Configuration>Vista Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Release|x64">
-      <Configuration>Win10 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Release|x64">
-      <Configuration>WinBlue Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Release|x64">
-      <Configuration>Win8 Release</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Win7 Release|x64">
-      <Configuration>Win7 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Vista Release|x64">
-      <Configuration>Vista Release</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -118,8 +22,6 @@
     <ConversionToolVersion>1.0</ConversionToolVersion>
     <BUILD_ALT_DIR>$(Configuration.Replace(' ',''))</BUILD_ALT_DIR>
     <IntDir Condition="'$(Platform)'!='Win32'">$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
-    <IntDir Condition="'$(Platform)'=='Win32'">
-    </IntDir>
     <OutDir>$(SolutionDir)\DrvBin\$(Configuration)\$(Platform)</OutDir>
   </PropertyGroup>
   <ImportGroup Label="PreConfiguration">
@@ -128,186 +30,23 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{105EA485-B9B6-48AE-B8B0-96BBEA575973}</ProjectGuid>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'">
-    <TargetVersion>
-    </TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-    <SupportsPackaging>true</SupportsPackaging>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|Arm'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Arm'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Arm'">
-    <TargetVersion>
-    </TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-    <SupportsPackaging>
-    </SupportsPackaging>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|Arm'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Arm'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'">
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-    <SupportsPackaging>
-    </SupportsPackaging>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|Win32'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">
-    <TargetVersion>Win7</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
     <SupportsPackaging>true</SupportsPackaging>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|Win32'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">
-    <TargetVersion>Win7</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-    <SupportsPackaging>true</SupportsPackaging>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|x64'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">
-    <TargetVersion>Win7</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
     <SupportsPackaging>true</SupportsPackaging>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|x64'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">
-    <TargetVersion>Win7</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
   <PropertyGroup>
     <DebuggerFlavor Condition="'$(IsKernelModeToolset)'=='true'">DbgengKernelDebugger</DebuggerFlavor>
     <DebuggerFlavor Condition="'$(IsUserModeToolset)'=='true'">DbgengRemoteDebugger</DebuggerFlavor>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <TargetExt>.sys</TargetExt>
-    <ReferencePath>$(VC_ReferencesPath_x86);</ReferencePath>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
-    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath>$(VC_SourcePath);</SourcePath>
-    <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);</ExcludePath>
-    <EnableInf2cat>true</EnableInf2cat>
-    <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>
-    <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime>
-    <Inf2CatVerbose>true</Inf2CatVerbose>
-    <Inf2CatNoCatalog>false</Inf2CatNoCatalog>
-    <Inf2CatWindowsVersionList>10_x86;$(Inf2CatWindowsVersionList)</Inf2CatWindowsVersionList>
-    <ApiValidator_Enable>true</ApiValidator_Enable>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ReferencePath>$(VC_ReferencesPath_x86);</ReferencePath>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
-    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath>$(VC_SourcePath);</SourcePath>
-    <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);</ExcludePath>
-    <EnableInf2cat>true</EnableInf2cat>
-    <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>
-    <TargetExt>.sys</TargetExt>
-    <Inf2CatWindowsVersionList>10_X86;$(Inf2CatWindowsVersionList)</Inf2CatWindowsVersionList>
-    <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Arm'">
-    <TargetExt>.sys</TargetExt>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ReferencePath>$(VC_ReferencesPath_arm);</ReferencePath>
-    <LibraryPath>$(VC_LibraryPath_arm);$(WindowsSDK_LibraryPath_arm);$(NETFXKitsDir)Lib\um\arm</LibraryPath>
-    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath>$(VC_SourcePath);</SourcePath>
-    <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_arm);</ExcludePath>
-    <EnableInf2cat>false</EnableInf2cat>
-    <Inf2CatWindowsVersionList>6_3_ARM;$(Inf2CatWindowsVersionList)</Inf2CatWindowsVersionList>
-    <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime>
-    <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'">
-    <TargetExt>.sys</TargetExt>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ReferencePath>$(VC_ReferencesPath_arm);</ReferencePath>
-    <LibraryPath>$(VC_LibraryPath_arm);$(WindowsSDK_LibraryPath_arm);$(NETFXKitsDir)Lib\um\arm</LibraryPath>
-    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath>$(VC_SourcePath);</SourcePath>
-    <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_arm);</ExcludePath>
-    <EnableInf2cat>false</EnableInf2cat>
-    <Inf2CatWindowsVersionList>6_3_Arm;$(Inf2CatWindowsVersionList)</Inf2CatWindowsVersionList>
-    <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime>
-    <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>
     <EnableInf2cat>true</EnableInf2cat>
     <Inf2CatWindowsVersionList>10_x64;$(Inf2CatWindowsVersionList)</Inf2CatWindowsVersionList>
@@ -320,7 +59,7 @@
     <SourcePath>$(VC_SourcePath);</SourcePath>
     <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64);</ExcludePath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetExt>.sys</TargetExt>
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
     <ReferencePath>$(VC_ReferencesPath_x64);</ReferencePath>
@@ -333,233 +72,7 @@
     <Inf2CatUseLocalTime>true</Inf2CatUseLocalTime>
     <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'">
-    <Link>
-      <AdditionalDependencies>$(SolutionDir)COMMON\$(Configuration)\common.lib;$(SolutionDir)PLATFORM\NdisComm\$(Configuration)\NdisComm.lib;$(SolutionDir)\LIB\x86\hal.lib;$(SolutionDir)\LIB\x86\rtklibcom.lib;$(WindowsSDK_LibraryPath_x86)km\x86\ndis.lib;$(WindowsSDK_LibraryPath_x86)km\x86\ntoskrnl.lib;$(WindowsSDK_LibraryPath_x86)km\x86\sdbus.lib;$(WindowsSDK_LibraryPath_x86)km\x86\wlan\1.0\TlvGeneratorParser.lib;</AdditionalDependencies>
-      <!-- warning LNK4099: PDB 'rtklibcom.pdb' was not found with 'rtklibcom.lib(multichannels.obj)' -->
-      <AdditionalOptions>$(AdditionalOptions) /IGNORE:4099</AdditionalOptions>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-    <ClCompile>
-      <PreprocessorDefinitions>_X86_;DBG;NDIS60_MINIPORT;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <AdditionalIncludeDirectories>$(WindowsSdkDir)Include\km\;$(WindowsSdkDir)Include\shared\;$(WindowsSdkDir)Include\wdf\kmdf\1.15\;$(WindowsSdkDir)Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)COMMON\;$(SolutionDir)PLATFORM\NDIS6;</AdditionalIncludeDirectories>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <ShowIncludes>false</ShowIncludes>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-      <WppEnabled>true</WppEnabled>
-      <WppMinimalRebuildFromTracking>true</WppMinimalRebuildFromTracking>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(WindowsSdkDir)Include\km\;$(WindowsSdkDir)Include\shared\;$(WindowsSdkDir)Include\wdf\kmdf\1.15\;$(WindowsSdkDir)Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)COMMON\;$(SolutionDir)PLATFORM\NDIS6;</AdditionalIncludeDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>_X86_;NDIS60_MINIPORT;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <MinimalRebuild>true</MinimalRebuild>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <ShowIncludes>false</ShowIncludes>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-      <WppEnabled>true</WppEnabled>
-      <DebugInformationFormat>None</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <!-- warning LNK4099: PDB 'rtklibcom.pdb' was not found with 'rtklibcom.lib(multichannels.obj)' -->
-      <AdditionalOptions>$(AdditionalOptions) /IGNORE:4099</AdditionalOptions>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>$(SolutionDir)COMMON\$(Configuration)\common.lib;$(SolutionDir)PLATFORM\NdisComm\$(Configuration)\NdisComm.lib;$(SolutionDir)\LIB\x86\hal.lib;$(SolutionDir)\LIB\x86\rtklibcom.lib;$(WindowsSDK_LibraryPath_x86)km\x86\ndis.lib;$(WindowsSDK_LibraryPath_x86)km\x86\ntoskrnl.lib;$(WindowsSDK_LibraryPath_x86)km\x86\sdbus.lib;$(WindowsSDK_LibraryPath_x86)km\x86\wlan\1.0\TlvGeneratorParser.lib;</AdditionalDependencies>
-      <GenerateDebugInformation>
-      </GenerateDebugInformation>
-      <GenerateMapFile>
-      </GenerateMapFile>
-      <AssemblyDebug>
-      </AssemblyDebug>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <ProjectReference>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Arm'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(WindowsSdkDir)Include\km\;$(WindowsSdkDir)Include\shared\;$(WindowsSdkDir)Include\wdf\kmdf\1.15\;$(WindowsSdkDir)Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)COMMON\;$(SolutionDir)PLATFORM\NDIS6;</AdditionalIncludeDirectories>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>_ARM_;NDIS60_MINIPORT;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <MinimalRebuild>true</MinimalRebuild>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <ShowIncludes>false</ShowIncludes>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-      <WppEnabled>true</WppEnabled>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>$(SolutionDir)COMMON\$(Configuration)\$(Platform)\common.lib;$(SolutionDir)PLATFORM\NdisComm\$(Configuration)\$(Platform)\NdisComm.lib;$(SolutionDir)\LIB\Arm\hal.lib;$(SolutionDir)\LIB\Arm\rtklibcom.lib;$(WindowsSDK_LibraryPath_arm)km\arm\ndis.lib;$(WindowsSDK_LibraryPath_arm)km\arm\ntoskrnl.lib;$(WindowsSDK_LibraryPath_arm)km\arm\sdbus.lib;$(WindowsSDK_LibraryPath_arm)km\arm\wlan\1.0\TlvGeneratorParser.lib;</AdditionalDependencies>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <ProjectReference>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(WindowsSdkDir)Include\km\;$(WindowsSdkDir)Include\shared\;$(WindowsSdkDir)Include\wdf\kmdf\1.15\;$(WindowsSdkDir)Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)COMMON\;$(SolutionDir)PLATFORM\NDIS6;</AdditionalIncludeDirectories>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>_ARM_;DBG;NDIS60_MINIPORT;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <MinimalRebuild>true</MinimalRebuild>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <ShowIncludes>false</ShowIncludes>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-      <WppEnabled>true</WppEnabled>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>$(SolutionDir)COMMON\$(Configuration)\common.lib;$(SolutionDir)PLATFORM\NdisComm\$(Configuration)\NdisComm.lib;$(SolutionDir)\LIB\Arm\hal.lib;$(SolutionDir)\LIB\Arm\rtklibcom.lib;$(WindowsSDK_LibraryPath_arm)km\arm\ndis.lib;$(WindowsSDK_LibraryPath_arm)km\arm\ntoskrnl.lib;$(WindowsSDK_LibraryPath_arm)km\arm\sdbus.lib;$(WindowsSDK_LibraryPath_arm)km\arm\wlan\1.0\TlvGeneratorParser.lib;</AdditionalDependencies>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <ProjectReference>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WppEnabled>true</WppEnabled>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)Include\km\;$(WindowsSdkDir)Include\shared\;$(WindowsSdkDir)Include\wdf\kmdf\1.15\;$(WindowsSdkDir)Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)COMMON\;$(SolutionDir)PLATFORM\NDIS6;</AdditionalIncludeDirectories>
@@ -612,7 +125,7 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)Include\km\;$(WindowsSdkDir)Include\shared\;$(WindowsSdkDir)Include\wdf\kmdf\1.15\;$(WindowsSdkDir)Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)COMMON\;$(SolutionDir)PLATFORM\NDIS6;</AdditionalIncludeDirectories>
       <DebugInformationFormat>None</DebugInformationFormat>
@@ -665,159 +178,25 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Arm'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Arm'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|Arm'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|Arm'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
   <!-- Needed by any VcxProj -->
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <PropertyGroup Label="UserMacros" />
   <!-- The WrappedTaskItems label is used by the conversion tool to identify the location where items
         associated with wrapped tasks will reside.-->
   <ItemGroup Label="WrappedTaskItems">
-    <FilesToPackage Include="$(SolutionDir)\PLATFORM\WinInf\SDIO\x64\netrtwlans.inf" Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
+    <FilesToPackage Include="$(SolutionDir)\PLATFORM\WinInf\SDIO\x64\netrtwlans.inf" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       <PackageRelativeDirectory>
       </PackageRelativeDirectory>
     </FilesToPackage>
-    <FilesToPackage Include="$(SolutionDir)\PLATFORM\WinInf\SDIO\x64\netrtwlans.inf" Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
+    <FilesToPackage Include="$(SolutionDir)\PLATFORM\WinInf\SDIO\x64\netrtwlans.inf" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
       <PackageRelativeDirectory>
       </PackageRelativeDirectory>
     </FilesToPackage>
-    <PackagePath Include="$(OutDir)" Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'">
-    </PackagePath>
-    <FilesToPackage Include="$(OutDir)$(TargetName)$(TargetExt)" Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
+    <FilesToPackage Include="$(OutDir)$(TargetName)$(TargetExt)" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
       <PackageRelativeDirectory>
       </PackageRelativeDirectory>
     </FilesToPackage>
-    <FilesToPackage Include="$(OutDir)$(TargetName)$(TargetExt)" Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Arm'">
-      <PackageRelativeDirectory>
-      </PackageRelativeDirectory>
-    </FilesToPackage>
-    <FilesToPackage Include="$(OutDir)$(TargetName)$(TargetExt)" Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'">
-      <PackageRelativeDirectory>
-      </PackageRelativeDirectory>
-    </FilesToPackage>
-    <FilesToPackage Include="$(OutDir)$(TargetName)$(TargetExt)" Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
-      <PackageRelativeDirectory>
-      </PackageRelativeDirectory>
-    </FilesToPackage>
-    <FilesToPackage Include="$(OutDir)$(TargetName)$(TargetExt)" Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
-      <PackageRelativeDirectory>
-      </PackageRelativeDirectory>
-    </FilesToPackage>
-    <FilesToPackage Include="$(OutDir)$(TargetName)$(TargetExt)" Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'">
-      <PackageRelativeDirectory>
-      </PackageRelativeDirectory>
-    </FilesToPackage>
-    <FilesToPackage Include="$(SolutionDir)\PLATFORM\WinInf\SDIO\arm\netrtwlans.inf" Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'">
-      <PackageRelativeDirectory>
-      </PackageRelativeDirectory>
-    </FilesToPackage>
-    <FilesToPackage Include="$(SolutionDir)\PLATFORM\WinInf\SDIO\x86\netrtwlans.inf" Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
-      <PackageRelativeDirectory>
-      </PackageRelativeDirectory>
-    </FilesToPackage>
-    <FilesToPackage Include="$(SolutionDir)\PLATFORM\WinInf\SDIO\x86\netrtwlans.inf" Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Arm'">
-      <PackageRelativeDirectory>
-      </PackageRelativeDirectory>
-    </FilesToPackage>
-    <FilesToPackage Include="$(SolutionDir)\PLATFORM\WinInf\SDIO\x86\netrtwlans.inf" Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'">
+    <FilesToPackage Include="$(OutDir)$(TargetName)$(TargetExt)" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       <PackageRelativeDirectory>
       </PackageRelativeDirectory>
     </FilesToPackage>
@@ -878,6 +257,9 @@
   <ItemGroup>
     <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
   </ItemGroup>
+  <ItemGroup>
+    <Inf Include="$(SolutionDir)\PLATFORM\WinInf\SDIO\x64\netrtwlans.inf" />
+  </ItemGroup>
   <!-- /Necessary to pick up propper files from local directory when in the IDE-->
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
 \ No newline at end of file
diff --git a/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj b/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj
index 112e7ea9..a7bdea25 100644
--- a/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj
+++ b/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj
@@ -1,108 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Win10 Debug|Arm">
-      <Configuration>Win10 Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Debug|Win32">
-      <Configuration>Win10 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Debug|x64">
-      <Configuration>Win10 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Release|Arm">
-      <Configuration>Win10 Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Release|Win32">
-      <Configuration>Win10 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win10 Release|x64">
-      <Configuration>Win10 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Debug|Arm">
-      <Configuration>WinBlue Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Debug|Arm">
-      <Configuration>Win8 Debug</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Release|Arm">
-      <Configuration>WinBlue Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Release|Arm">
-      <Configuration>Win8 Release</Configuration>
-      <Platform>Arm</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Debug|Win32">
-      <Configuration>WinBlue Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Debug|Win32">
-      <Configuration>Win8 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win7 Debug|Win32">
-      <Configuration>Win7 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Vista Debug|Win32">
-      <Configuration>Vista Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Release|Win32">
-      <Configuration>WinBlue Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Release|Win32">
-      <Configuration>Win8 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win7 Release|Win32">
-      <Configuration>Win7 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Vista Release|Win32">
-      <Configuration>Vista Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Debug|x64">
-      <Configuration>WinBlue Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Debug|x64">
-      <Configuration>Win8 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win7 Debug|x64">
-      <Configuration>Win7 Debug</Configuration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Vista Debug|x64">
-      <Configuration>Vista Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="WinBlue Release|x64">
-      <Configuration>WinBlue Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win8 Release|x64">
-      <Configuration>Win8 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Win7 Release|x64">
-      <Configuration>Win7 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Vista Release|x64">
-      <Configuration>Vista Release</Configuration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -119,7 +23,6 @@
     <ConversionToolVersion>1.0</ConversionToolVersion>
     <BUILD_ALT_DIR>$(Configuration.Replace(' ',''))</BUILD_ALT_DIR>
     <IntDir Condition="'$(Platform)'!='Win32'">$(BUILD_ALT_DIR)\$(Platform)\</IntDir>
-    <IntDir Condition="'$(Platform)'=='Win32'">$(BUILD_ALT_DIR)\</IntDir>
     <OutDir>$(SolutionDir)PLATFORM\NdisComm\$(Configuration)\$(Platform)\</OutDir>
   </PropertyGroup>
   <ImportGroup Label="PreConfiguration">
@@ -128,153 +31,21 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C0A51792-1338-4294-ADAA-EDC4EE30CF05}</ProjectGuid>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|Arm'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Arm'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
+    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|Arm'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Arm'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Arm'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|Win32'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">
-    <TargetVersion>Win7</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|Win32'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">
-    <TargetVersion>Win7</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|x64'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">
-    <TargetVersion>Win7</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|x64'">
-    <TargetVersion>WindowsV6.3</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'" Label="Configuration">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">
-    <TargetVersion>Win8</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">
-    <TargetVersion>Win7</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
+    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
   </PropertyGroup>
   <PropertyGroup>
     <DebuggerFlavor Condition="'$(IsKernelModeToolset)'=='true'">DbgengKernelDebugger</DebuggerFlavor>
     <DebuggerFlavor Condition="'$(IsUserModeToolset)'=='true'">DbgengRemoteDebugger</DebuggerFlavor>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ReferencePath>$(VC_ReferencesPath_x86);</ReferencePath>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
-    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath>$(VC_SourcePath);</SourcePath>
-    <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);</ExcludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ReferencePath>$(VC_ReferencePath_x86);</ReferencePath>
-    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath>$(VC_SourcePath);</SourcePath>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
-    <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);</ExcludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Arm'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ReferencePath>$(VC_ReferencePath_arm);</ReferencePath>
-    <LibraryPath>$(VC_LibraryPath_arm);$(WindowsSDK_LibraryPath_arm);$(NETFXKitsDir)Lib\um\arm</LibraryPath>
-    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath>$(VC_SourcePath);</SourcePath>
-    <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_arm);</ExcludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'">
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-    <ReferencePath>$(VC_ReferencePath_arm);</ReferencePath>
-    <LibraryPath>$(VC_LibraryPath_arm);$(WindowsSDK_LibraryPath_arm);$(NETFXKitsDir)Lib\um\arm</LibraryPath>
-    <LibraryWPath>$(WindowsSDK_MetadataPath);</LibraryWPath>
-    <SourcePath>$(VC_SourcePath);</SourcePath>
-    <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_arm);</ExcludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
     <ReferencePath>$(VC_ReferencesPath_x64);</ReferencePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
@@ -282,7 +53,7 @@
     <SourcePath>$(VC_SourcePath);</SourcePath>
     <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64);</ExcludePath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
     <ReferencePath>$(VC_ReferencesPath_x64);</ReferencePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
@@ -290,220 +61,7 @@
     <SourcePath>$(VC_SourcePath);</SourcePath>
     <ExcludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64);</ExcludePath>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_X86_;DBG;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <AdditionalIncludeDirectories>$(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)COMMON\;</AdditionalIncludeDirectories>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <ExpandAttributedSource>false</ExpandAttributedSource>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <ShowIncludes>false</ShowIncludes>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-      <WppEnabled>true</WppEnabled>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
-    <Lib>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <ClCompile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <MinimalRebuild>true</MinimalRebuild>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <ShowIncludes>false</ShowIncludes>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-      <AdditionalIncludeDirectories>$(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)COMMON\;</AdditionalIncludeDirectories>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>_X86_;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WppEnabled>true</WppEnabled>
-    </ClCompile>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Arm'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)COMMON\;</AdditionalIncludeDirectories>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>_ARM_;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <MinimalRebuild>true</MinimalRebuild>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <ShowIncludes>false</ShowIncludes>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-      <WppEnabled>true</WppEnabled>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|Arm'">
-    <ClCompile>
-      <WppEnabled>true</WppEnabled>
-      <AdditionalIncludeDirectories>$(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)COMMON\;</AdditionalIncludeDirectories>
-      <DebugInformationFormat>None</DebugInformationFormat>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>_ARM_;DBG;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <MinimalRebuild>true</MinimalRebuild>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <ShowIncludes>false</ShowIncludes>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <ProjectReference>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-    </ProjectReference>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WppEnabled>true</WppEnabled>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)COMMON\;</AdditionalIncludeDirectories>
@@ -553,7 +111,7 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WppEnabled>true</WppEnabled>
       <AdditionalIncludeDirectories>$(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)COMMON\;</AdditionalIncludeDirectories>
@@ -603,106 +161,6 @@
       <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
     </DriverSign>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Arm'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Arm'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|Arm'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|Arm'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Vista Debug|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Vista Release|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|Win32'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Vista Debug|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Vista Release|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WinBlue Debug|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WinBlue Release|x64'">
-    <DriverSign>
-      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
-    </DriverSign>
-  </ItemDefinitionGroup>
   <!-- Needed by any VcxProj -->
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <PropertyGroup Label="UserMacros" />
diff --git a/network/wlan/WDI/PLATFORM/WinInf/SDIO/arm/netrtwlans.inf b/network/wlan/WDI/PLATFORM/WinInf/SDIO/arm/netrtwlans.inf
deleted file mode 100644
index e18bf510..00000000
--- a/network/wlan/WDI/PLATFORM/WinInf/SDIO/arm/netrtwlans.inf
+++ /dev/null
@@ -1,1259 +0,0 @@
-;; netrtwlans.inf 
-;;
-;; Realtek Wireless 802.11b/g/n SDIO Network Adapter
-;;
-;; Copyright (C) 2012 Realtek Semiconductor Corp.
-;;
-;; This release is primarily for WHQL test.
-;;
-
-;; FOR XP/Vista/Win7/Win8
-
-[Version]
-Signature	= "$Windows NT$"
-Class		= Net
-ClassGUID	= {4d36e972-e325-11ce-bfc1-08002be10318}
-Provider	= %Realtek%
-CatalogFile.NT	= netrtwlans.cat		;; for WHQL certified
-DriverVer = 11/23/2015,3008.22.1030.2015
-
-[Manufacturer]
-%Realtek% = Realtek,NTArm.10.0
-
-[ControlFlags]
-ExcludeFromSelect = *
-
-[Realtek.NTArm.10.0]
-;; For 8723 RTK common		================================================================
-
-;; For 8723 RTK common		================================================================
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_8753
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_B723
-;; Acer
-%RTL8723bs.DeviceDesc% = ACER8723bs.ndi, SD\VID_024C&PID_0623
-;; HP
-%RTL8723bs.DeviceDesc% = HP8723bs.ndi, SD\VID_024C&PID_0523
-;; ECS
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_0524
-;; bestbuy
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_0240
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_0241
-;; For Braswell platform
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_0626
-;; Reserved
-%RTL8723bs.DeviceDesc% = RSVD8723bs.ndi, SD\VID_024C&PID_0624
-
-;; For 8188E RTK common		================================================================
-%RTL8188es.DeviceDesc% = RTL8188es.ndi, SD\VID_024C&PID_8188
-%RTL8188es.DeviceDesc% = RTL8188es.ndi, SD\VID_024C&PID_8179 
-
-;; For 8812A RTK common		================================================================
-
-;; For 8814A RTK common		================================================================
-%RTL8814as.DeviceDesc% = RTL8814as.ndi, SD\VID_024C&PID_8813
-
-;; For 8821A RTK common		================================================================
-%RTL8821as.DeviceDesc% = RTL8821as.ndi, SD\VID_024C&PID_8821
-
-;; For 8192ES RTK common		================================================================
-%RTL8192es.DeviceDesc% = RTL8192es.ndi, SD\VID_024C&PID_818B
-
-
-;; For 8703 RTK common		================================================================
-%RTL8703bs.DeviceDesc% = RTL8703bs.ndi, SD\VID_024C&PID_B703
-
-;; For 8188 RTK common		================================================================
-%RTL8188fs.DeviceDesc% = RTL8188fs.ndi, SD\VID_024C&PID_F179
-
-;; For 8822B RTK common		================================================================
-%RTL8822bs.DeviceDesc% = RTL8822bs.ndi, SD\VID_024C&PID_B822
-
-;; For 8723D RTK common		================================================================
-%RTL8723ds.DeviceDesc% = RTL8723ds.ndi, SD\VID_024C&PID_D723
-
-;;----------------------------------------------------------------------------
-;; Realtek 8723as default installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[RTL8723as.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723as.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723as.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723as.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8723bs default installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[RTL8723bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, MCC.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723bs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;;----------------------------------------------------------------------------
-;; Acer 8723bs installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[ACER8723bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, RSSI2GridMode_2.reg, MCC.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[ACER8723bs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[ACER8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;;----------------------------------------------------------------------------
-;; HP 8723bs installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[HP8723bs.ndi.NT]
-AddReg				= NDIS_64.reg, HP8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[HP8723bs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[HP8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; RSVD 8723bs installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[RSVD8723bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, WowlanDisable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RSVD8723bs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RSVD8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8188eu default installation
-;;----------------------------------------------------------------------------
-
-
-
-
-
-[RTL8188es.ndi.NT]
-AddReg				= NDIS_64.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8188es.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8188es.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8821as default installation
-;;----------------------------------------------------------------------------
-
-
-
-
-
-[RTL8821as.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8821as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8821as.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8821as.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8814as default installation
-;;----------------------------------------------------------------------------
-
-
-
-
-
-[RTL8814as.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8814as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8814as.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8814as.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8192es default installation
-;;----------------------------------------------------------------------------
-
-
-
-
-
-[RTL8192es.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8192es.common.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8192es.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8192es.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8703bs default installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[RTL8703bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, KFREE_COMMON.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8703bs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8703bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8188fs default installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[RTL8188fs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, CIHVS.reg, PnpPreTransOn.reg, AutoChnlSelon.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8188fs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8188fs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-;;----------------------------------------------------------------------------
-;; Realtek 8822bs default installation
-;;----------------------------------------------------------------------------
-
-
-
-
-
-[RTL8822bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8822bs.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8822bs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8822bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8723ds default installation
-;;----------------------------------------------------------------------------
-
-
-
-
-
-[RTL8723ds.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723ds.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, CIHVS.reg, PnpPreTransOn.reg, AutoChnlSelon.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723ds.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723ds.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-;;----------------------------------------------------------------------------
-;; OS relative registry.
-;;----------------------------------------------------------------------------
-[NDIS_64.reg]
-HKR, Ndi\Interfaces,	UpperRange, 0, "ndis5,mdcwifi"
-HKR, Ndi\Interfaces,	LowerRange, 0, "wlan,ethernet,vwifi"
-HKR, Ndi,				Service,    0, "RtlWlans"
-;;
-;; OS relative service.
-;;
-[RtlWlans.Service]
-DisplayName    	= %RtlWlans.DeviceDesc.DispName%
-ServiceType    	= 1		; %SERVICE_KERNEL_DRIVER%
-StartType      	= 3		; %SERRVICE_DEMAND_START%
-ErrorControl   	= 1		; %SERRVICE_ERROR_NORMAL%
-ServiceBinary  	= %12%\rtwlans.sys
-LoadOrderGroup 	= NDIS
-
-;;
-;; OS relative event log.
-;;
-[RtlWlans.EventLog]
-AddReg 			= RtlWlans.AddEventLog.reg
-
-[RtlWlans.AddEventLog.reg]
-HKR, , EventMessageFile, 0x00020000, "%%SystemRoot%%\System32\netevent.dll"
-HKR, , TypesSupported  , 0x00010001, 7
-
-[CIHVS.reg]
-HKR, Ndi\IHVExtensions, ExtensibilityDLL,       0,  "%SystemRoot%\system32\Rtlihvs.dll"
-HKR, Ndi\IHVExtensions, UIExtensibilityCLSID,   0,  "{6C2A8CCA-B2A2-4d81-A3B2-4E15F445C312}"
-HKR, Ndi\IHVExtensions, GroupName,              0,  "Realtek CCX SDK IHV Service"
-HKR, Ndi\IHVExtensions, AdapterOUI,             0x00010001, 0x00e04c
-
-;*******************************************************************************
-; WAPI section
-;*******************************************************************************
-[wapi.reg]
-HKR,defaults,WapiSupport,0,"1"
-HKR,,WapiSupport,0,"1"
-
-;*******************************************************************************
-; RTL8723as common paramters
-;*******************************************************************************
-[RTL8723as.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-
-;*******************************************************************************
-; RTL8723bs common paramters
-;*******************************************************************************
-[RTL8723bs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,RomDLFwEnable,0,"1"
-HKR,,RomDLFwEnable,0,"1"
-
-HKR,defaults,bFwCtrlPwrOff,0,"1"
-HKR,,bFwCtrlPwrOff,0,"1"
-
-;;HKR,defaults,EnableAdaptivity,0,"0"
-;;HKR,,EnableAdaptivity,0,"0"
-
-HKR,defaults,EnableCarrierSense,0,"0"
-HKR,,EnableCarrierSense,0,"0"
-
-; AOAC reconnect
-HKR,defaults,PnpKeepLink,0,"1"
-HKR,,PnpKeepLink,0,"1"
-
-;; $$ End of RTL8723bs.common.reg
-
-[HP8723bs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,RomDLFwEnable,0,"1"
-HKR,,RomDLFwEnable,0,"1"
-
-HKR,defaults,bFwCtrlPwrOff,0,"1"
-HKR,,bFwCtrlPwrOff,0,"1"
-
-; Enable Adaptivity
-;;HKR,defaults,EnableAdaptivity,0,"1"
-;;HKR,,EnableAdaptivity,0,"1"
-
-HKR,defaults,EnableCarrierSense,0,"0"
-HKR,,EnableCarrierSense,0,"0"
-
-; Enable Customeized PowerLimit Table
-HKR,,EnableTxPowerLimit,0,"1"
-HKR,,DecryptCustomFile,,"1"
-HKR,,PwrLimitFile,0,"TXPWR_LMT_IEC0921_Enc.txt"
-
-; Regulation WorldWide
-HKR,defaults,PwrTblSel,0,"4"
-HKR,,PwrTblSel,0,"4"
-
-; AOAC reconnect
-HKR,defaults,PnpKeepLink,0,"1"
-HKR,,PnpKeepLink,0,"1"
-
-;; $$ End of HP8723bs.common.reg
-
-;*******************************************************************************
-; RTL8703bs common paramters
-;*******************************************************************************
-[RTL8703bs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,RomDLFwEnable,0,"1"
-HKR,,RomDLFwEnable,0,"1"
-
-HKR,defaults,bFwCtrlPwrOff,0,"1"
-HKR,,bFwCtrlPwrOff,0,"1"
-
-
-;*******************************************************************************
-; RTL8188Fs common paramters
-;*******************************************************************************
-[RTL8188fs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,RomDLFwEnable,0,"0"
-HKR,,RomDLFwEnable,0,"0"
-
-HKR,defaults,bFwCtrlPwrOff,0,"1"
-HKR,,bFwCtrlPwrOff,0,"1"
-
-
-;*******************************************************************************
-; RTL8821as common paramters
-;*******************************************************************************
-[RTL8821as.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-HKR,,StbcCap,0,"17"
-HKR,,LdpcCap,0,"34"
-HKR,,BeamformCap,0,"34"
-
-
-;*******************************************************************************
-; RTL8814as common paramters
-;*******************************************************************************
-[RTL8814as.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-;; Add for 8814AS, based on 8821AS's modification
-HKR,,StbcCap,0,"17"
-HKR,,LdpcCap,0,"34"
-HKR,,BeamformCap,0,"34"
-
-
-;*******************************************************************************
-; RTL8192es common paramters
-;*******************************************************************************
-[RTL8192es.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-;*******************************************************************************
-; RTL8822bs common paramters
-;*******************************************************************************
-[RTL8822bs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-HKR,,StbcCap,0,"17"
-HKR,,LdpcCap,0,"34"
-HKR,,BeamformCap,0,"34"
-HKR,,ValidRFPath,0,"51"
-HKR,,PreInitMem,0,"1"
-
-
-;*******************************************************************************
-; RTL8723ds common paramters
-;*******************************************************************************
-[RTL8723ds.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-HKR,defaults,LdpcCap,0,"0"
-
-
-;;----------------------------------------------------------------------------
-;; Realtek WLAN NIC parameters
-;;----------------------------------------------------------------------------
-[RTLWLAN.reg]
-
-; Enable Adaptivity
-HKR,,EnableAdaptivity,0,"1"
-
-HKR,defaults,Channel,0,"1"
-HKR,,Channel,0,"1"
-
-;; Antenna Diversity Type
-HKR,defaults,AntennaDivType,0,"0"
-HKR,,AntennaDivType,0,"0"
-
-HKR,defaults,NetworkType,0,"1"
-HKR,,NetworkType,0,"1"
-
-HKR,defaults,StaUapsd,0,"0"
-HKR,,StaUapsd,0,"0"
-
-; For B/G mode and B/G/N mode switch, we will use different wireless mode registry in later section
-HKR,Ndi\params\WirelessMode, 			ParamDesc, 	0, %WL_MODE_STR%
-HKR,Ndi\params\WirelessMode, 			type, 		0, "enum"
-HKR,Ndi\params\WirelessMode, 			default, 	0, "8"
-HKR,Ndi\params\WirelessMode\enum, 		"2", 		0, %IEEE_802_11B_STR%
-HKR,Ndi\params\WirelessMode\enum, 		"4", 		0, %IEEE_802_11BG_STR%
-HKR,Ndi\params\WirelessMode\enum, 		"8", 		0, %IEEE_802_11BGN_STR%
-HKR,defaults,WirelessMode, 0, "8"
-HKR,,WirelessMode, 0, "8"
-
-
-;; For WiFi test, 1: WiFi Config and 0: Performance Config
-HKR,defaults,WiFiConfg,0,"0"
-HKR,,WiFiConfg,0,"0"
-
-HKR,defaults,RxReorder,0,"1"
-HKR,,RxReorder,0,"1"
-
-HKR,,DefaultKeyID,,"0"
-HKR,,DefaultKey0,,""
-HKR,,DefaultKey1,,""
-HKR,,DefaultKey2,,""
-HKR,,DefaultKey3,,""
-
-;Inactive Power Save
-HKR,defaults,InactivePs,0,"0"
-HKR,,InactivePs,0,"0"
-
-;Leisure Power Save
-HKR,defaults,bLeisurePs,0,"2"
-HKR,,bLeisurePs,0,"2"
-
-;Fw Control LPS
-HKR,defaults,bFwCtrlLPS,0,"1"
-HKR,,bFwCtrlLPS,0,"1"
-
-;; LPS Interval
-;HKR,defaults,LPSIntvl,0,"3"
-HKR,,LPSIntvl,0,"3"
-
-HKR,,WEPinNmode,0,"0"
-
-HKR,defaults,RxSC,0,"0"
-HKR,,RxSC,0,"0"
-
-HKR,defaults,TxSC,0,"0"
-HKR,,TxSC,0,"0"
-
-HKR,defaults,NblRacingWA,0,"1"
-HKR,,NblRacingWA,0,"1"
-
-HKR,defaults,SuspendTimerInLowPwr,0,"1"
-HKR,,SuspendTimerInLowPwr,0,"1"
-
-;; Rx reorder pending time
-HKR,,RxReorder_PendTime,0,"100"
-
-;Antenna Diversity
-HKR,Ndi\params\AntDiv,			ParamDesc, 		0, "Antenna Diversity"
-HKR,Ndi\params\AntDiv, 			default, 		0, "0"
-HKR,Ndi\params\AntDiv, 			type, 		    0, "enum"
-HKR,Ndi\params\AntDiv\enum,  	"0",        	0, %DISABLED_STR%
-HKR,Ndi\params\AntDiv\enum,   	"1",        	0, %ENABLED_STR%
-
-HKLM, SYSTEM\CurrentControlSet\Services\RtlWlans\Parameters, "BtAntennaInHw", 0x00010001,2
-
-[Ndis5Set.reg]
-HKR,Ndi\params\PSPXlinkMode,			ParamDesc,  0, %PSP_XLINK_STR%
-HKR,Ndi\params\PSPXlinkMode,			type,       0, "enum"
-HKR,Ndi\params\PSPXlinkMode,			default,    0, "0"
-HKR,Ndi\params\PSPXlinkMode\enum,		"0",        0, %DISABLE_STR%
-HKR,Ndi\params\PSPXlinkMode\enum,		"1",        0, %ENABLE_STR%
-HKR,defaults,PSPXlinkMode,0,"0"
-HKR,,PSPXlinkMode,0,"0"
-
-;Inactive Power Save
-HKR,defaults,InactivePs,0,"0"
-HKR,,InactivePs,0,"0"
-
-
-[Ndis6Set.reg]
-;Inactive Power Save
-HKR,defaults,InactivePs,0,"2"
-HKR,,InactivePs,0,"2"
-
-
-;;----------------------------------------------------------------------------
-;; Wireless mode option parameters
-;;----------------------------------------------------------------------------
-[11nWirelessMode.reg]
-HKR,Ndi\params\WirelessMode, 		ParamDesc, 	0, %WL_MODE_STR%
-HKR,Ndi\params\WirelessMode, 		type, 		0, "enum"
-HKR,Ndi\params\WirelessMode, 		default, 	0, "8"
-HKR,Ndi\params\WirelessMode\enum, 	"2", 		0, %IEEE_802_11B_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"4", 		0, %IEEE_802_11BG_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"8", 		0, %IEEE_802_11BGN_STR%
-HKR,defaults,WirelessMode, 0, "8"
-HKR,,WirelessMode, 0, "8"
-
-;; 40MHz Support in 11n
-HKR,Ndi\params\BWSetting, 			ParamDesc, 	0, "Bandwidth"
-HKR,Ndi\params\BWSetting, 			type, 		0, "enum"
-HKR,Ndi\params\BWSetting, 			default, 	0, "1"
-HKR,Ndi\params\BWSetting\enum, 		"0", 		0, "20MHz Only"
-HKR,Ndi\params\BWSetting\enum, 		"1", 		0, "20_40MHz"
-HKR,defaults,BWSetting,0,"1"
-HKR,,BWSetting,0,"1"
-HKR,,BWSetting,,"1"
-
-HKR,,Channel,0,"10"
-
-[11gWirelessMode.reg]
-HKR,Ndi\params\WirelessMode, 		ParamDesc, 	0, %WL_MODE_STR%
-HKR,Ndi\params\WirelessMode, 		type, 		0, "enum"
-HKR,Ndi\params\WirelessMode, 		default, 	0, "8"
-HKR,Ndi\params\WirelessMode\enum, 	"2", 		0, %IEEE_802_11B_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"4", 		0, %IEEE_802_11BG_STR%
-HKR,defaults,WirelessMode, 0, "4"
-HKR,,WirelessMode, 0, "4"
-
-HKR,,BWSetting,0,"0"
-
-HKR,,Channel,0,"10"
-
-[11acWirelessMode.reg]
-HKR,Ndi\params\WirelessMode, 		ParamDesc, 	0, %WL_MODE_STR%
-HKR,Ndi\params\WirelessMode, 		type, 		0, "enum"
-HKR,Ndi\params\WirelessMode, 		default, 	0, "8"
-HKR,Ndi\params\WirelessMode\enum, 	"8", 		0, %AUTO_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"1", 		0, %IEEE_802_11A_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"2", 		0, %IEEE_802_11B_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"4", 		0, %IEEE_802_11BG_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"16", 		0, %IEEE_802_11BGN_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"32", 		0, %IEEE_802_11AN_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"64", 		0, %IEEE_802_11ANAC_STR%
-HKR,defaults,WirelessMode, 0, "8"
-HKR,,WirelessMode, 0, "8"
-
-HKR,,Channel,0,"36"
-
-;; RF Type
-HKR,,RFType,0,"15"
-
-
-HKR,defaults,BWSetting,0,"2"
-HKR,,BWSetting,0,"2"
-
-;;----------------------------------------------------------------------------
-;; LPS 32k Control Parameters
-;;----------------------------------------------------------------------------
-[32kEnable.reg]
-HKR,,bLowPowerEnable,0,"1"
-[32kDisable.reg]
-HKR,,bLowPowerEnable,0,"0"
-
-;-------------------------------------------------------------------------------
-;	PnP pre-transition handling
-;-------------------------------------------------------------------------------
-[PnpPreTransOn.reg]
-HKR,,PreTransPnP,0,"1"
-[PnpPreTransOff.reg]
-HKR,,PreTransPnP,0,"0"
-
-;;----------------------------------------------------------------------------
-;; WOWLAN Control Parameters
-;;----------------------------------------------------------------------------
-[WowlanAllEnable.reg]
-HKR,,WoWLANLPSLevel,0,"2"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "1"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"1"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "1"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"1"
-
-[WowlanDisable.reg]
-HKR,,WoWLANLPSLevel,0,"0"
-HKR,,ARPOffloadEnable,0,"0"
-HKR,,GTKOffloadEnable,0,"0"
-
-[WowlanAllEnableNoLPS.reg]
-HKR,,WoWLANLPSLevel,0,"0"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "1"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"1"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "1"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"1"
-
-[WowlanEnableNoPatternMatch.reg]
-HKR,,WoWLANLPSLevel,0,"2"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "1"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"1"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "0"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"0"
-
-[WowlanEnableNoLPSNoPatternMatch.reg]
-HKR,,WoWLANLPSLevel,0,"0"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "1"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"1"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "0"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"0"
-
-[ConnectedStandbyEnable.reg]
-HKR,,WoWLANLPSLevel,0,"2"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-HKR,,D2ListenIntvl,0,"4"
-HKR,,NSOffloadEnable,0,"1"
-HKR,,NLOEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "0"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"0"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "1"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"1"
-
-;; Packet coalescing should be enabled in WHCK test
-HKR,defaults,*PacketCoalescing,0,"0"
-HKR,,*PacketCoalescing,0,"0"
-
-;-------------------------------------------------------------------------------
-;	Auto Channel Selection
-;-------------------------------------------------------------------------------
-[AutoChnlSelon.reg]
-HKR,,AutoChnlSel,0,"1"
-[AutoChnlSeloff.reg]
-HKR,,AutoChnlSel,0,"0"
-
-;;----------------------------------------------------------------------------
-;; RSSI to Grid Mode Parameters
-;;----------------------------------------------------------------------------
-[RSSI2GridRealMode.reg]
-HKR,,RSSI2GridMode,0,"1"
-[RSSI2GridMode_2.reg]
-HKR,,RSSI2GridMode,0,"2"
-[RSSI2GridMode_4.reg]
-HKR,,RSSI2GridMode,0,"4"
-
-;;----------------------------------------------------------------------------
-;; KFREE parameters
-;;----------------------------------------------------------------------------
-[KFREE_COMMON.reg]
-HKR,,RfKFreeEnable,0,"0"
-
-;*******************************************************************************
-; Customer reg section
-;*******************************************************************************
-[ScanType.reg]
-HKR,defaults,PassiveScan, 0, "0"
-HKR,,PassiveScan, 0, "0"
-
-;*******************************************************************************
-; Multi-Channel Concurrent section
-;*******************************************************************************
-[MCC.reg]
-HKR,Ndi\params\MultiChannelFcsMode, 		ParamDesc, 	0, %MCC_STR%
-HKR,Ndi\params\MultiChannelFcsMode, 		type, 		0, "enum"
-HKR,Ndi\params\MultiChannelFcsMode, 		default, 	0, "0"
-HKR,Ndi\params\MultiChannelFcsMode\enum, 	"0", 		0, %DISABLED_STR%
-HKR,Ndi\params\MultiChannelFcsMode\enum, 	"4", 		0, %ENABLED_STR%
-HKR,defaults,MultiChannelFcsMode, 0, "0"
-HKR,,MultiChannelFcsMode, 0, "0"
-
-;*******************************************************************************
-; Destination Directory
-;*******************************************************************************
-[RTWlanS.CopyFiles]
-rtwlans.sys,,,2
-
-[DestinationDirs]
-DefaultDestDir     	= 11
-RTWlanS.CopyFiles	= 12
-CIHVS.CopyFiles					= 11
-RtlUI2.CopyFiles				= 10
-
-;;****************************************************************************
-;; Source Files
-;;****************************************************************************
-[CIHVS.CopyFiles]
-Rtlihvs.dll,,,2
-
-[RegisterUIExt]
-11,,RtlExtUI.dll,1
-
-[RtlUI2.CopyFiles]
-RtlUI2.exe,,,2
-
-[SourceDisksFiles]
-rtwlans.sys = 1
-Rtlihvs.dll = 1
-
-[SourceDisksNames]
-1=%DISKNAME%,,,
-
-
-;*******************************************************************************
-; Strings
-;*******************************************************************************
-[Strings]
-SSID_STR				            = "SSID"
-CHANNEL_STR				            = "Channel"
-NETWORK_TYPE_STR			        = "Network Type"
-LED_CONTROL_STR				        = "LED Control" 
-POWER_SAVE_STR				        = "Power Save Mode"
-WIFI_IBSS_STR				        = "IBSS Default 11b Mode"
-RATE_ADAPTIVE_STR			        = "Rate Adaptive"
-QOS_STR					            = "QoS"
-WiFiConfg_STR	  			        = "WiFiConfg"
-WMM_APSD				            = "WMM APSD"
-CCX_RM_STR				            = "CCX Radio Measurement"
-CCX_OFF_LINE_DUR_UP_LIMIT_STR		= "CCX Max Off-Line Measurement (0: unlimited)"
-FORCE_PRIORITY_STR			        = "Forced Priority"
-HW_PARA_STR				            = "Init from HwParaFile"
-THREE_WIRE_MODE_STR		            = "Three Wire Programming Mode"
-BOARD_TYPE_STR			            = "Board Type"
-PROTECTION_MODE_STR		            = "Protection Mode"
-TPC_STR					            = "Transmit Power Control"
-TPC_POLARITY_STR		            = "TPC Polarity Select"
-HIGH_POWER_STR			            = "High Power Mechanism"
-INIT_GAIN_STR			            = "Initial Gain State"
-CW_MAX_MIN_STR			            = "Contention Window"
-PSP_XLINK_STR			            = "PSP XLink Mode"
-DISABLE_STR				            = "Disable"
-ENABLE_STR				            = "Enable"
-DISABLED_STR				            = "Disabled"
-ENABLED_STR				            = "Enabled"
-AUTO_STR							= "Auto"
-AD_HOC_STR				            = "Ad Hoc"
-INFRASTRUCTURE_STR		            = "Infrastructure"
-AUTO_SELECT				            = "Auto select"
-WL_MODE_STR				            = "Wireless Mode"
-RX_REORDER_STR			            = "Rx Reorder"
-CAM_STR					            = "CAM"
-MAX_PSP_STR				            = "MAX_PSP"
-Fast_PSP_STR				        = "Fast_PSP"
-NO_AC_STR					        = "No AC (Disable)"
-ALL_AC_STR				            = "ALL AC"
-IEEE_802_11A_STR 					= "IEEE 802.11a"
-IEEE_802_11B_STR 			        = "IEEE 802.11b"
-IEEE_802_11BG_STR 			        = "IEEE 802.11b/g"
-IEEE_802_11BGN_STR 			        = "IEEE 802.11b/g/n"
-IEEE_802_11AN_STR					= "IEEE 802.11a/n"	
-IEEE_802_11ANAC_STR					= "IEEE 802.11a/n/ac"
-IEEE_802_11AC_STR					= "IEEE 802.11 ac"
-WakeOnMagicPacket					= "Wake on Magic Packet"
-WakeOnPattern						= "Wake on Pattern Match"                                                 
-MCC_STR								= "Multi-Channel Concurrent"
-
-;*******************************************************************************
-; manufacture description
-;*******************************************************************************
-Realtek					            = "Realtek Semiconductor Corp."
-
-
-;*******************************************************************************
-;	Source disk name
-;*******************************************************************************
-DISKNAME							= "Realtek Wireless LAN 802.11n SDIO Network Adapter Driver Disk"
-RtlWlans.DeviceDesc 				= "Realtek Wireless LAN 802.11n SDIO Network Adapter"
-RtlWlans.DeviceDesc.DispName		= "Realtek Wireless LAN 802.11n SDIO Network Adapter"
-
-;*******************************************************************************
-; RTL8723as Device description
-;*******************************************************************************
-RTL8723as.DeviceDesc 				= "Realtek RTL8723AS Wireless LAN 802.11n SDIO Network Adapter"
-RTL8723as.DeviceDesc.DispName		= "Realtek RTL8723AS Wireless LAN 802.11n SDIO Network Adapter"
-
-
-
-;*******************************************************************************
-; RTL8723bs Device description
-;*******************************************************************************
-RTL8723bs.DeviceDesc 				= "Realtek RTL8723BS Wireless LAN 802.11n SDIO Network Adapter"
-RTL8723bs.DeviceDesc.DispName		= "Realtek RTL8723BS Wireless LAN 802.11n SDIO Network Adapter"
-
-;*******************************************************************************
-; RTL8814as Device description
-;*******************************************************************************
-RTL8814as.DeviceDesc 				= "Realtek RTL8814AS Wireless LAN 802.11ac SDIO Network Adapter"
-RTL8814as.DeviceDesc.DispName		= "Realtek RTL8814AS Wireless LAN 802.11ac SDIO Network Adapter"
-
-;*******************************************************************************
-; RTL8188ES Device description
-;*******************************************************************************
-RTL8188es.DeviceDesc 				= "Realtek RTL8189ES Wireless LAN 802.11n USB 2.0 Network Adapter"
-RTL8188es.DeviceDesc.DispName		= "Realtek RTL8189ES Wireless LAN 802.11n USB 2.0 Network Adapter"
-;*******************************************************************************
-; RTL8821as Device description
-;*******************************************************************************
-RTL8821as.DeviceDesc 			= "Realtek RTL8821AS Wireless LAN 802.11ac SDIO 2.0 Network Adapter"
-RTL8821as.DeviceDesc.DispName		= "Realtek RTL8821AS Wireless LAN 802.11ac SDIO 2.0 Network Adapter"
-;*******************************************************************************
-; RTL8192E Device description
-;*******************************************************************************
-RTL8192es.DeviceDesc 				= "Realtek RTL8192ES Wireless LAN 802.11n USB 2.0 Network Adapter"
-RTL8192es.DeviceDesc.DispName		= "Realtek RTL8192ES Wireless LAN 802.11n USB 2.0 Network Adapter"
-
-;*******************************************************************************
-; RTL8703bs Device description
-;*******************************************************************************
-RTL8703bs.DeviceDesc 				= "Realtek RTL8703BS Wireless LAN 802.11n SDIO Network Adapter"
-RTL8703bs.DeviceDesc.DispName		= "Realtek RTL8703BS Wireless LAN 802.11n SDIO Network Adapter"
-
-;*******************************************************************************
-; RTL8188Fs Device description
-;*******************************************************************************
-RTL8188fs.DeviceDesc 				= "Realtek RTL8189FTV Wireless LAN 802.11n SDIO Network Adapter"
-RTL8188fs.DeviceDesc.DispName		= "Realtek RTL8189FTV Wireless LAN 802.11n SDIO Network Adapter"
-;*******************************************************************************
-; RTL8822bs Device description
-;*******************************************************************************
-RTL8822bs.DeviceDesc 			= "Realtek RTL8822BS Wireless LAN 802.11ac SDIO 2.0 Network Adapter"
-RTL8822bs.DeviceDesc.DispName		= "Realtek RTL8822BS Wireless LAN 802.11ac SDIO 2.0 Network Adapter"
-
-;*******************************************************************************
-; RTL8723ds Device description
-;*******************************************************************************
-RTL8723ds.DeviceDesc 				= "Realtek RTL8723DS Wireless LAN 802.11n SDIO Network Adapter"
-RTL8723ds.DeviceDesc.DispName		= "Realtek RTL8723DS Wireless LAN 802.11n SDIO Network Adapter"
diff --git a/network/wlan/WDI/PLATFORM/WinInf/SDIO/netrtwlans.inf b/network/wlan/WDI/PLATFORM/WinInf/SDIO/netrtwlans.inf
deleted file mode 100644
index 59166e9e..00000000
--- a/network/wlan/WDI/PLATFORM/WinInf/SDIO/netrtwlans.inf
+++ /dev/null
@@ -1,2711 +0,0 @@
-;; netrtwlans.inf 
-;;
-;; Realtek Wireless 802.11b/g/n SDIO Network Adapter
-;;
-;; Copyright (C) 2012 Realtek Semiconductor Corp.
-;;
-;; This release is primarily for WHQL test.
-;;
-
-;; FOR XP/Vista/Win7/Win8
-
-[Version]
-Signature	= "$Windows NT$"
-Class		= Net
-ClassGUID	= {4d36e972-e325-11ce-bfc1-08002be10318}
-Provider	= %Realtek%
-CatalogFile.NT	= netrtwlans.cat		;; for WHQL certified
-DriverVer = 10/30/2015,3008.22.1030.2015
-
-[Manufacturer]
-%Realtek%			= Realtek,			NTx86, NTamd64, NTx86.6.0, NTamd64.6.0, NTx86.6.1, NTamd64.6.1, NTx86.6.2, NTamd64.6.2, NTx86.6.3, NTamd64.6.3, NTx86.10.0, NTamd64.10.0, NTArm.10.0
-
-[ControlFlags]
-ExcludeFromSelect = *
-
-;; ## Manufacturer [Realtek]
-;; $$ ICtype 8723A Start
-;; For 8723 RTK common		================================================================
-;; $$ ICtype 8723A End
-
-;; $$ ICtype 8723B Start
-;; For 8723 RTK common		================================================================
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_8753
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_B723
-;; Acer
-%RTL8723bs.DeviceDesc% = ACER8723bs.ndi, SD\VID_024C&PID_0623
-;; HP
-%RTL8723bs.DeviceDesc% = HP8723bs.ndi, SD\VID_024C&PID_0523
-;; ECS
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_0524
-;; bestbuy
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_0240
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_0241
-;; For Braswell platform
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_0626
-;; Reserved
-%RTL8723bs.DeviceDesc% = RSVD8723bs.ndi, SD\VID_024C&PID_0624
-;; $$ ICtype 8723B End
-
-;; $$ ICtype 8188E Start
-;; For 8188E RTK common		================================================================
-%RTL8188es.DeviceDesc% = RTL8188es.ndi, SD\VID_024C&PID_8188
-%RTL8188es.DeviceDesc% = RTL8188es.ndi, SD\VID_024C&PID_8179 
-;; $$ ICtype 8188E End
-
-;; $$ ICtype 8812A Start
-;; For 8812A RTK common		================================================================
-;; $$ ICtype 8812A End
-
-;; $$ ICtype 8814A Start
-;; For 8814A RTK common		================================================================
-%RTL8814as.DeviceDesc% = RTL8814as.ndi, SD\VID_024C&PID_8813
-;; $$ ICtype 8814A End
-
-;; $$ ICtype 8821A Start
-;; For 8821A RTK common		================================================================
-%RTL8821as.DeviceDesc% = RTL8821as.ndi, SD\VID_024C&PID_8821
-;; $$ ICtype 8821A End
-
-;; $$ ICtype 8192E Start
-;; For 8192ES RTK common		================================================================
-%RTL8192es.DeviceDesc% = RTL8192es.ndi, SD\VID_024C&PID_818B
-;; $$ ICtype 8192E End
-
-
-;; $$ ICtype 8703B Start
-;; For 8703 RTK common		================================================================
-%RTL8703bs.DeviceDesc% = RTL8703bs.ndi, SD\VID_024C&PID_B703
-;; $$ ICtype 8703B End
-
-;; $$ ICtype 8188F Start
-;; For 8188 RTK common		================================================================
-%RTL8188fs.DeviceDesc% = RTL8188fs.ndi, SD\VID_024C&PID_F179
-;; $$ ICtype 8188F End
-
-;; $$ ICtype 8822B Start
-;; For 8822B RTK common		================================================================
-%RTL8822bs.DeviceDesc% = RTL8822bs.ndi, SD\VID_024C&PID_B822
-;; $$ ICtype 8822B End
-
-;; $$ ICtype 8723D Start
-;; For 8723D RTK common		================================================================
-%RTL8723ds.DeviceDesc% = RTL8723ds.ndi, SD\VID_024C&PID_D723
-;; $$ ICtype 8723D End
-
-;; $$ ICtype 8723A Start
-;;----------------------------------------------------------------------------
-;; Realtek 8723as default installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[RTL8723as_os51.ndi.NT]
-AddReg				= NDIS_51.reg, RTL8723as.common.reg, RTLWLAN.reg, Ndis5Set.reg, 11nWirelessMode.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[RTL8723as_os51.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[RTL8723as_os60.ndi.NT]
-AddReg				= NDIS_60.reg, RTL8723as.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[RTL8723as_os60.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os60 End
-             
-;; ** Section for os61 Start
-[RTL8723as_os61.ndi.NT]
-AddReg				= NDIS_61.reg, RTL8723as.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723as_os61.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723as_os61.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[RTL8723as_os62.ndi.NT]
-AddReg				= NDIS_62.reg, RTL8723as.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723as_os62.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723as_os62.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[RTL8723as_os63.ndi.NT]
-AddReg				= NDIS_63.reg, RTL8723as.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723as_os63.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723as_os63.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[RTL8723as_os64.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723as.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723as_os64.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723as_os64.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-
-;; $$ ICtype 8723A End
-
-;; $$ ICtype 8723B Start
-;;----------------------------------------------------------------------------
-;; Realtek 8723bs default installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[RTL8723bs.ndi.NT]
-AddReg				= NDIS_51.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis5Set.reg, 11nWirelessMode.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[RTL8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[RTL8723bs.ndi.NT]
-AddReg				= NDIS_60.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-;; $$ FeatureType WAPI Start
-AddReg 		= wapi.reg
-RegisterDlls 		= RegisterUIExt
-CopyFiles		= CIHVS.CopyFiles
-;; $$ FeatureType WAPI End
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[RTL8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os60 End
-             
-;; ** Section for os61 Start
-[RTL8723bs.ndi.NT]
-AddReg				= NDIS_61.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-;; $$ FeatureType WAPI Start
-AddReg 		= wapi.reg
-RegisterDlls 		= RegisterUIExt
-CopyFiles		= CIHVS.CopyFiles
-;; $$ FeatureType WAPI End
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723bs.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[RTL8723bs.ndi.NT]
-AddReg				= NDIS_62.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, MCC.reg
-;; $$ FeatureType WAPI Start
-AddReg 		= wapi.reg
-RegisterDlls 		= RegisterUIExt
-CopyFiles		= CIHVS.CopyFiles
-;; $$ FeatureType WAPI End
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[RTL8723bs.ndi.NT]
-AddReg				= NDIS_63.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, MCC.reg
-;; $$ FeatureType WAPI Start
-AddReg 		= wapi.reg
-RegisterDlls 		= RegisterUIExt
-CopyFiles		= CIHVS.CopyFiles
-;; $$ FeatureType WAPI End
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[RTL8723bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, MCC.reg
-;; $$ FeatureType WAPI Start
-AddReg 		= wapi.reg
-RegisterDlls 		= RegisterUIExt
-CopyFiles		= CIHVS.CopyFiles
-;; $$ FeatureType WAPI End
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-;;----------------------------------------------------------------------------
-;; Acer 8723bs installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[ACER8723bs.ndi.NT]
-AddReg				= NDIS_51.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis5Set.reg, 11nWirelessMode.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[ACER8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[ACER8723bs.ndi.NT]
-AddReg				= NDIS_60.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[ACER8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os60 End
-             
-;; ** Section for os61 Start
-[ACER8723bs.ndi.NT]
-AddReg				= NDIS_61.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg, RSSI2GridMode_2.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[ACER8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[ACER8723bs.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[ACER8723bs.ndi.NT]
-AddReg				= NDIS_62.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, RSSI2GridMode_2.reg, MCC.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[ACER8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[ACER8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[ACER8723bs.ndi.NT]
-AddReg				= NDIS_63.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, RSSI2GridMode_2.reg, MCC.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[ACER8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[ACER8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[ACER8723bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, RSSI2GridMode_2.reg, MCC.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[ACER8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[ACER8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-;;----------------------------------------------------------------------------
-;; HP 8723bs installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[HP8723bs.ndi.NT]
-AddReg				= NDIS_51.reg, HP8723bs.common.reg, RTLWLAN.reg, Ndis5Set.reg, 11nWirelessMode.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[HP8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[HP8723bs.ndi.NT]
-AddReg				= NDIS_60.reg, HP8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[HP8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os60 End
-             
-;; ** Section for os61 Start
-[HP8723bs.ndi.NT]
-AddReg				= NDIS_61.reg, HP8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[HP8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[HP8723bs.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[HP8723bs.ndi.NT]
-AddReg				= NDIS_62.reg, HP8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[HP8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[HP8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[HP8723bs.ndi.NT]
-AddReg				= NDIS_63.reg, HP8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[HP8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[HP8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[HP8723bs.ndi.NT]
-AddReg				= NDIS_64.reg, HP8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[HP8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[HP8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-
-;; $$ ICtype 8723B End
-
-;;----------------------------------------------------------------------------
-;; RSVD 8723bs installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[RSVD8723bs.ndi.NT]
-AddReg				= NDIS_51.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis5Set.reg, 11nWirelessMode.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[RSVD8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[RSVD8723bs.ndi.NT]
-AddReg				= NDIS_60.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[RSVD8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os60 End
-             
-;; ** Section for os61 Start
-[RSVD8723bs.ndi.NT]
-AddReg				= NDIS_61.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RSVD8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RSVD8723bs.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[RSVD8723bs.ndi.NT]
-AddReg				= NDIS_62.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, WowlanDisable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RSVD8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RSVD8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[RSVD8723bs.ndi.NT]
-AddReg				= NDIS_63.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, WowlanDisable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RSVD8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RSVD8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[RSVD8723bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, WowlanDisable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RSVD8723bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RSVD8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-
-;; $$ ICtype 8723B End
-
-;; $$ ICtype 8188E Start
-;;----------------------------------------------------------------------------
-;; Realtek 8188eu default installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[RTL8188es_os51.ndi.NT]
-AddReg				= NDIS_51.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis5Set.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[RTL8188es_os51.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[RTL8188es_os60.ndi.NT]
-AddReg				= NDIS_60.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg, ConnectedStandbyEnable.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[RTL8188es_os60.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os60 End
-
-;; ** Section for os61 Start
-[RTL8188es_os61.ndi.NT]
-AddReg				= NDIS_61.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg, ConnectedStandbyEnable.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8188es_os61.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8188es_os61.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[RTL8188es_os62.ndi.NT]
-AddReg				= NDIS_62.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg, ConnectedStandbyEnable.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8188es_os62.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8188es_os62.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[RTL8188es_os63.ndi.NT]
-AddReg				= NDIS_63.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8188es_os63.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8188es_os63.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[RTL8188es_os64.ndi.NT]
-AddReg				= NDIS_64.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8188es_os64.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8188es_os64.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-
-;; $$ ICtype 8188E End
-
-;; $$ ICtype 8821A Start
-;;----------------------------------------------------------------------------
-;; Realtek 8821as default installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[RTL8821as_os51.ndi.NT]
-AddReg				= NDIS_51.reg, RTL8821as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis5Set.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[RTL8821as_os51.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[RTL8821as_os60.ndi.NT]
-AddReg				= NDIS_60.reg, RTL8821as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[RTL8821as_os60.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os60 End
-
-;; ** Section for os61 Start
-[RTL8821as_os61.ndi.NT]
-AddReg				= NDIS_61.reg, RTL8821as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8821as_os61.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8821as_os61.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[RTL8821as_os62.ndi.NT]
-AddReg				= NDIS_62.reg, RTL8821as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8821as_os62.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8821as_os62.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[RTL8821as_os63.ndi.NT]
-AddReg				= NDIS_63.reg, RTL8821as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8821as_os63.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8821as_os63.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[RTL8821as_os64.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8821as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8821as_os64.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8821as_os64.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-
-;; $$ ICtype 8821A End
-
-;; $$ ICtype 8814A Start
-;;----------------------------------------------------------------------------
-;; Realtek 8814as default installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[RTL8814as_os51.ndi.NT]
-AddReg				= NDIS_51.reg, RTL8814as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis5Set.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[RTL8814as_os51.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[RTL8814as_os60.ndi.NT]
-AddReg				= NDIS_60.reg, RTL8814as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[RTL8814as_os60.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os60 End
-
-;; ** Section for os61 Start
-[RTL8814as_os61.ndi.NT]
-AddReg				= NDIS_61.reg, RTL8814as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8814as_os61.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8814as_os61.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[RTL8814as_os62.ndi.NT]
-AddReg				= NDIS_62.reg, RTL8814as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8814as_os62.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8814as_os62.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[RTL8814as_os63.ndi.NT]
-AddReg				= NDIS_63.reg, RTL8814as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8814as_os63.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8814as_os63.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[RTL8814as_os64.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8814as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8814as_os64.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8814as_os64.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-
-;; $$ ICtype 8814A End
-
-;; $$ ICtype 8192E Start
-;;----------------------------------------------------------------------------
-;; Realtek 8192es default installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[RTL8192es_os51.ndi.NT]
-AddReg				= NDIS_51.reg, RTL8192es.common.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis5Set.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[RTL8192es_os51.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[RTL8192es_os60.ndi.NT]
-AddReg				= NDIS_60.reg, RTL8192es.common.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[RTL8192es_os60.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os60 End
-
-;; ** Section for os61 Start
-[RTL8192es_os61.ndi.NT]
-AddReg				= NDIS_61.reg, RTL8192es.common.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8192es_os61.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8192es_os61.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[RTL8192es_os62.ndi.NT]
-AddReg				= NDIS_62.reg, RTL8192es.common.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8192es_os62.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8192es_os62.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[RTL8192es_os63.ndi.NT]
-AddReg				= NDIS_63.reg, RTL8192es.common.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8192es_os63.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8192es_os63.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[RTL8192es_os64.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8192es.common.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8192es_os64.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8192es_os64.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-
-;; $$ ICtype 8192E End
-
-;; $$ ICtype 8703B Start
-;;----------------------------------------------------------------------------
-;; Realtek 8703bs default installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[RTL8703bs.ndi.NT]
-AddReg				= NDIS_51.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis5Set.reg, 11nWirelessMode.reg, WowlanAllEnable.reg, KFREE_COMMON.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[RTL8703bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[RTL8703bs.ndi.NT]
-AddReg				= NDIS_60.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, WowlanAllEnable.reg, KFREE_COMMON.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[RTL8703bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os60 End
-             
-;; ** Section for os61 Start
-[RTL8703bs.ndi.NT]
-AddReg				= NDIS_61.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, WowlanAllEnable.reg, KFREE_COMMON.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8703bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8703bs.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[RTL8703bs.ndi.NT]
-AddReg				= NDIS_62.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, KFREE_COMMON.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8703bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8703bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[RTL8703bs.ndi.NT]
-AddReg				= NDIS_63.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, KFREE_COMMON.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8703bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8703bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[RTL8703bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, KFREE_COMMON.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8703bs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8703bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-
-;; $$ ICtype 8703B End
-
-;; $$ ICtype 8188F Start
-;;----------------------------------------------------------------------------
-;; Realtek 8188fs default installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[RTL8188fs.ndi.NT]
-AddReg				= NDIS_51.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis5Set.reg, 11nWirelessMode.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[RTL8188fs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[RTL8188fs.ndi.NT]
-AddReg				= NDIS_60.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[RTL8188fs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os60 End
-             
-;; ** Section for os61 Start
-[RTL8188fs.ndi.NT]
-AddReg				= NDIS_61.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8188fs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8188fs.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[RTL8188fs.ndi.NT]
-AddReg				= NDIS_62.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, CIHVS.reg, PnpPreTransOn.reg, AutoChnlSelon.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8188fs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8188fs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[RTL8188fs.ndi.NT]
-AddReg				= NDIS_63.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, CIHVS.reg, PnpPreTransOn.reg, AutoChnlSelon.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8188fs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8188fs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[RTL8188fs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, CIHVS.reg, PnpPreTransOn.reg, AutoChnlSelon.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8188fs.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8188fs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-
-;; $$ ICtype 8188F End
-;; $$ ICtype 8822B Start
-;;----------------------------------------------------------------------------
-;; Realtek 8822bs default installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[RTL8822bs_os51.ndi.NT]
-AddReg				= NDIS_51.reg, RTL8822bs.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis5Set.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[RTL8822bs_os51.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[RTL8822bs_os60.ndi.NT]
-AddReg				= NDIS_60.reg, RTL8822bs.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[RTL8822bs_os60.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; ** Section for os60 End
-
-;; ** Section for os61 Start
-[RTL8822bs_os61.ndi.NT]
-AddReg				= NDIS_61.reg, RTL8822bs.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8822bs_os61.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8822bs_os61.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[RTL8822bs_os62.ndi.NT]
-AddReg				= NDIS_62.reg, RTL8822bs.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8822bs_os62.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8822bs_os62.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[RTL8822bs_os63.ndi.NT]
-AddReg				= NDIS_63.reg, RTL8822bs.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8822bs_os63.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8822bs_os63.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[RTL8822bs_os64.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8822bs.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8822bs_os64.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8822bs_os64.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-
-;; $$ ICtype 8822B End
-
-;; $$ ICtype 8723D Start
-;;----------------------------------------------------------------------------
-;; Realtek 8723ds default installation
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[RTL8723ds_os51.ndi.NT]
-AddReg				= NDIS_51.reg, RTL8723ds.common.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis5Set.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-
-[RTL8723ds_os51.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os51 End
-
-;; ** Section for os60 Start
-[RTL8723ds_os60.ndi.NT]
-AddReg				= NDIS_60.reg, RTL8723ds.common.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          	; NdisPhysicalMediumNative802_11
-
-[RTL8723ds_os60.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-;; ** Section for os60 End
-
-;; ** Section for os61 Start
-[RTL8723ds_os61.ndi.NT]
-AddReg				= NDIS_61.reg, RTL8723ds.common.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723ds_os61.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723ds_os61.ndi.NT.HW]
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.PnPFilterRegistration
-;; ** Section for os61 End
-
-;; ** Section for os62 Start
-[RTL8723ds_os62.ndi.NT]
-AddReg				= NDIS_62.reg, RTL8723ds.common.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723ds_os62.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723ds_os62.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os62 End
-
-;; ** Section for os63 Start
-[RTL8723ds.ndi.NT]
-AddReg				= NDIS_63.reg, RTL8723ds.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, CIHVS.reg, PnpPreTransOn.reg, AutoChnlSelon.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723ds.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723ds.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os63 End
-
-;; ** Section for os64 Start
-[RTL8723ds.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723ds.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, CIHVS.reg, PnpPreTransOn.reg, AutoChnlSelon.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723ds.ndi.NT.Services]
-;; $$ AddServiceName Start
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-;; $$ AddServiceName End
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723ds.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;; ** Section for os64 End
-
-;; $$ ICtype 8723D End
-;;----------------------------------------------------------------------------
-;; OS relative registry.
-;;----------------------------------------------------------------------------
-;; ** Section for os51 Start
-[NDIS_51.reg]
-HKR, Ndi\Interfaces,	UpperRange, 0, "ndis5"
-HKR, Ndi\Interfaces,	LowerRange, 0, "ethernet"
-;; $$ ServiceName Start
-HKR, Ndi,				Service,    0, "RtlWlans"
-;; $$ ServiceName End
-;; ** Section for os51 End
-;; ** Section for os60 Start
-[NDIS_60.reg]
-HKR, Ndi\Interfaces,	UpperRange, 0, "ndis5,mdcwifi"
-HKR, Ndi\Interfaces,	LowerRange, 0, "wlan,ethernet"
-;; $$ ServiceName Start
-HKR, Ndi,				Service,    0, "RtlWlans"
-;; $$ ServiceName End
-;; ** Section for os60 End
-;; ** Section for os61 Start
-[NDIS_61.reg]
-HKR, Ndi\Interfaces,	UpperRange, 0, "ndis5,mdcwifi"
-HKR, Ndi\Interfaces,	LowerRange, 0, "wlan,ethernet,vwifi"
-;; $$ ServiceName Start
-HKR, Ndi,				Service,    0, "RtlWlans"
-;; $$ ServiceName End
-;; ** Section for os61 End
-;; ** Section for os62 Start
-[NDIS_62.reg]
-HKR, Ndi\Interfaces,	UpperRange, 0, "ndis5,mdcwifi"
-HKR, Ndi\Interfaces,	LowerRange, 0, "wlan,ethernet,vwifi"
-;; $$ ServiceName Start
-HKR, Ndi,				Service,    0, "RtlWlans"
-;; $$ ServiceName End
-;; ** Section for os62 End
-;; ** Section for os63 Start
-[NDIS_63.reg]
-HKR, Ndi\Interfaces,	UpperRange, 0, "ndis5,mdcwifi"
-HKR, Ndi\Interfaces,	LowerRange, 0, "wlan,ethernet,vwifi"
-;; $$ ServiceName Start
-HKR, Ndi,				Service,    0, "RtlWlans"
-;; $$ ServiceName End
-;; ** Section for os63 End
-;; ** Section for os64 Start
-[NDIS_64.reg]
-HKR, Ndi\Interfaces,	UpperRange, 0, "ndis5,mdcwifi"
-HKR, Ndi\Interfaces,	LowerRange, 0, "wlan,ethernet,vwifi"
-;; $$ ServiceName Start
-HKR, Ndi,				Service,    0, "RtlWlans"
-;; $$ ServiceName End
-;; ** Section for os64 End
-;;
-;; OS relative service.
-;;
-[RtlWlans.Service]
-DisplayName    	= %RtlWlans.DeviceDesc.DispName%
-ServiceType    	= 1		; %SERVICE_KERNEL_DRIVER%
-StartType      	= 3		; %SERRVICE_DEMAND_START%
-ErrorControl   	= 1		; %SERRVICE_ERROR_NORMAL%
-;; $$ DriverName Start
-ServiceBinary  	= %12%\rtwlans.sys
-;; $$ DriverName End
-LoadOrderGroup 	= NDIS
-
-;;
-;; OS relative event log.
-;;
-[RtlWlans.EventLog]
-AddReg 			= RtlWlans.AddEventLog.reg
-
-[RtlWlans.AddEventLog.reg]
-HKR, , EventMessageFile, 0x00020000, "%%SystemRoot%%\System32\netevent.dll"
-HKR, , TypesSupported  , 0x00010001, 7
-
-[CIHVS.reg]
-HKR, Ndi\IHVExtensions, ExtensibilityDLL,       0,  "%SystemRoot%\system32\Rtlihvs.dll"
-HKR, Ndi\IHVExtensions, UIExtensibilityCLSID,   0,  "{6C2A8CCA-B2A2-4d81-A3B2-4E15F445C312}"
-HKR, Ndi\IHVExtensions, GroupName,              0,  "Realtek CCX SDK IHV Service"
-HKR, Ndi\IHVExtensions, AdapterOUI,             0x00010001, 0x00e04c
-
-;*******************************************************************************
-; WAPI section
-;*******************************************************************************
-[wapi.reg]
-HKR,defaults,WapiSupport,0,"1"
-HKR,,WapiSupport,0,"1"
-
-;; $$ ICtype 8723A Start
-;*******************************************************************************
-; RTL8723as common paramters
-;*******************************************************************************
-[RTL8723as.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-;; $$ ICtype 8723A End
-
-;; $$ ICtype 8723B Start
-;*******************************************************************************
-; RTL8723bs common paramters
-;*******************************************************************************
-[RTL8723bs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,RomDLFwEnable,0,"1"
-HKR,,RomDLFwEnable,0,"1"
-
-HKR,defaults,bFwCtrlPwrOff,0,"1"
-HKR,,bFwCtrlPwrOff,0,"1"
-
-;;HKR,defaults,EnableAdaptivity,0,"0"
-;;HKR,,EnableAdaptivity,0,"0"
-
-HKR,defaults,EnableCarrierSense,0,"0"
-HKR,,EnableCarrierSense,0,"0"
-
-; AOAC reconnect
-HKR,defaults,PnpKeepLink,0,"1"
-HKR,,PnpKeepLink,0,"1"
-
-;; $$ End of RTL8723bs.common.reg
-
-[HP8723bs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,RomDLFwEnable,0,"1"
-HKR,,RomDLFwEnable,0,"1"
-
-HKR,defaults,bFwCtrlPwrOff,0,"1"
-HKR,,bFwCtrlPwrOff,0,"1"
-
-; Enable Adaptivity
-;;HKR,defaults,EnableAdaptivity,0,"1"
-;;HKR,,EnableAdaptivity,0,"1"
-
-HKR,defaults,EnableCarrierSense,0,"0"
-HKR,,EnableCarrierSense,0,"0"
-
-; Enable Customeized PowerLimit Table
-HKR,,EnableTxPowerLimit,0,"1"
-HKR,,DecryptCustomFile,,"1"
-HKR,,PwrLimitFile,0,"TXPWR_LMT_IEC0921_Enc.txt"
-
-; Regulation WorldWide
-HKR,defaults,PwrTblSel,0,"4"
-HKR,,PwrTblSel,0,"4"
-
-; AOAC reconnect
-HKR,defaults,PnpKeepLink,0,"1"
-HKR,,PnpKeepLink,0,"1"
-
-;; $$ End of HP8723bs.common.reg
-;; $$ ICtype 8723B End
-
-;; $$ ICtype 8703B Start
-;*******************************************************************************
-; RTL8703bs common paramters
-;*******************************************************************************
-[RTL8703bs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,RomDLFwEnable,0,"1"
-HKR,,RomDLFwEnable,0,"1"
-
-HKR,defaults,bFwCtrlPwrOff,0,"1"
-HKR,,bFwCtrlPwrOff,0,"1"
-
-;; $$ ICtype 8703B End
-
-;; $$ ICtype 8188F Start
-;*******************************************************************************
-; RTL8188Fs common paramters
-;*******************************************************************************
-[RTL8188fs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,RomDLFwEnable,0,"0"
-HKR,,RomDLFwEnable,0,"0"
-
-HKR,defaults,bFwCtrlPwrOff,0,"1"
-HKR,,bFwCtrlPwrOff,0,"1"
-
-;; $$ ICtype 8703B End
-
-;; $$ ICtype 8821A Start
-;*******************************************************************************
-; RTL8821as common paramters
-;*******************************************************************************
-[RTL8821as.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-HKR,,StbcCap,0,"17"
-HKR,,LdpcCap,0,"34"
-HKR,,BeamformCap,0,"34"
-
-;; $$ ICtype 8821A End
-
-;; $$ ICtype 8814A Start
-;*******************************************************************************
-; RTL8814as common paramters
-;*******************************************************************************
-[RTL8814as.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-;; Add for 8814AS, based on 8821AS's modification
-HKR,,StbcCap,0,"17"
-HKR,,LdpcCap,0,"34"
-HKR,,BeamformCap,0,"34"
-
-;; $$ ICtype 8814A End
-
-;; $$ ICtype 8192E Start
-;*******************************************************************************
-; RTL8192es common paramters
-;*******************************************************************************
-[RTL8192es.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-;; $$ ICtype 8192E End
-
-;; $$ ICtype 8822B Start
-;*******************************************************************************
-; RTL8822bs common paramters
-;*******************************************************************************
-[RTL8822bs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-HKR,,StbcCap,0,"17"
-HKR,,LdpcCap,0,"34"
-HKR,,BeamformCap,0,"34"
-HKR,,ValidRFPath,0,"51"
-HKR,,PreInitMem,0,"1"
-
-;; $$ ICtype 8822B End
-
-;; $$ ICtype 8723D Start
-;*******************************************************************************
-; RTL8723ds common paramters
-;*******************************************************************************
-[RTL8723ds.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-HKR,defaults,LdpcCap,0,"0"
-
-;; $$ ICtype 8723D End
-
-;;----------------------------------------------------------------------------
-;; Realtek WLAN NIC parameters
-;;----------------------------------------------------------------------------
-[RTLWLAN.reg]
-
-; Enable Adaptivity
-HKR,,EnableAdaptivity,0,"1"
-
-HKR,defaults,Channel,0,"1"
-HKR,,Channel,0,"1"
-
-;; Antenna Diversity Type
-HKR,defaults,AntennaDivType,0,"0"
-HKR,,AntennaDivType,0,"0"
-
-HKR,defaults,NetworkType,0,"1"
-HKR,,NetworkType,0,"1"
-
-HKR,defaults,StaUapsd,0,"0"
-HKR,,StaUapsd,0,"0"
-
-; For B/G mode and B/G/N mode switch, we will use different wireless mode registry in later section
-HKR,Ndi\params\WirelessMode, 			ParamDesc, 	0, %WL_MODE_STR%
-HKR,Ndi\params\WirelessMode, 			type, 		0, "enum"
-HKR,Ndi\params\WirelessMode, 			default, 	0, "8"
-HKR,Ndi\params\WirelessMode\enum, 		"2", 		0, %IEEE_802_11B_STR%
-HKR,Ndi\params\WirelessMode\enum, 		"4", 		0, %IEEE_802_11BG_STR%
-HKR,Ndi\params\WirelessMode\enum, 		"8", 		0, %IEEE_802_11BGN_STR%
-HKR,defaults,WirelessMode, 0, "8"
-HKR,,WirelessMode, 0, "8"
-
-
-;; For WiFi test, 1: WiFi Config and 0: Performance Config
-HKR,defaults,WiFiConfg,0,"0"
-HKR,,WiFiConfg,0,"0"
-
-HKR,defaults,RxReorder,0,"1"
-HKR,,RxReorder,0,"1"
-
-HKR,,DefaultKeyID,,"0"
-HKR,,DefaultKey0,,""
-HKR,,DefaultKey1,,""
-HKR,,DefaultKey2,,""
-HKR,,DefaultKey3,,""
-
-;Inactive Power Save
-HKR,defaults,InactivePs,0,"0"
-HKR,,InactivePs,0,"0"
-
-;Leisure Power Save
-HKR,defaults,bLeisurePs,0,"2"
-HKR,,bLeisurePs,0,"2"
-
-;Fw Control LPS
-HKR,defaults,bFwCtrlLPS,0,"1"
-HKR,,bFwCtrlLPS,0,"1"
-
-;; LPS Interval
-;HKR,defaults,LPSIntvl,0,"3"
-HKR,,LPSIntvl,0,"3"
-
-HKR,,WEPinNmode,0,"0"
-
-HKR,defaults,RxSC,0,"0"
-HKR,,RxSC,0,"0"
-
-HKR,defaults,TxSC,0,"0"
-HKR,,TxSC,0,"0"
-
-HKR,defaults,NblRacingWA,0,"1"
-HKR,,NblRacingWA,0,"1"
-
-HKR,defaults,SuspendTimerInLowPwr,0,"1"
-HKR,,SuspendTimerInLowPwr,0,"1"
-
-;; Rx reorder pending time
-HKR,,RxReorder_PendTime,0,"100"
-
-;Antenna Diversity
-HKR,Ndi\params\AntDiv,			ParamDesc, 		0, "Antenna Diversity"
-HKR,Ndi\params\AntDiv, 			default, 		0, "0"
-HKR,Ndi\params\AntDiv, 			type, 		    0, "enum"
-HKR,Ndi\params\AntDiv\enum,  	"0",        	0, %DISABLED_STR%
-HKR,Ndi\params\AntDiv\enum,   	"1",        	0, %ENABLED_STR%
-
-HKLM, SYSTEM\CurrentControlSet\Services\RtlWlans\Parameters, "BtAntennaInHw", 0x00010001,2
-
-[Ndis5Set.reg]
-HKR,Ndi\params\PSPXlinkMode,			ParamDesc,  0, %PSP_XLINK_STR%
-HKR,Ndi\params\PSPXlinkMode,			type,       0, "enum"
-HKR,Ndi\params\PSPXlinkMode,			default,    0, "0"
-HKR,Ndi\params\PSPXlinkMode\enum,		"0",        0, %DISABLE_STR%
-HKR,Ndi\params\PSPXlinkMode\enum,		"1",        0, %ENABLE_STR%
-HKR,defaults,PSPXlinkMode,0,"0"
-HKR,,PSPXlinkMode,0,"0"
-
-;Inactive Power Save
-HKR,defaults,InactivePs,0,"0"
-HKR,,InactivePs,0,"0"
-
-
-[Ndis6Set.reg]
-;Inactive Power Save
-HKR,defaults,InactivePs,0,"2"
-HKR,,InactivePs,0,"2"
-
-
-;;----------------------------------------------------------------------------
-;; Wireless mode option parameters
-;;----------------------------------------------------------------------------
-[11nWirelessMode.reg]
-HKR,Ndi\params\WirelessMode, 		ParamDesc, 	0, %WL_MODE_STR%
-HKR,Ndi\params\WirelessMode, 		type, 		0, "enum"
-HKR,Ndi\params\WirelessMode, 		default, 	0, "8"
-HKR,Ndi\params\WirelessMode\enum, 	"2", 		0, %IEEE_802_11B_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"4", 		0, %IEEE_802_11BG_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"8", 		0, %IEEE_802_11BGN_STR%
-HKR,defaults,WirelessMode, 0, "8"
-HKR,,WirelessMode, 0, "8"
-
-;; 40MHz Support in 11n
-HKR,Ndi\params\BWSetting, 			ParamDesc, 	0, "Bandwidth"
-HKR,Ndi\params\BWSetting, 			type, 		0, "enum"
-HKR,Ndi\params\BWSetting, 			default, 	0, "1"
-HKR,Ndi\params\BWSetting\enum, 		"0", 		0, "20MHz Only"
-HKR,Ndi\params\BWSetting\enum, 		"1", 		0, "20_40MHz"
-HKR,defaults,BWSetting,0,"1"
-HKR,,BWSetting,0,"1"
-HKR,,BWSetting,,"1"
-
-HKR,,Channel,0,"10"
-
-[11gWirelessMode.reg]
-HKR,Ndi\params\WirelessMode, 		ParamDesc, 	0, %WL_MODE_STR%
-HKR,Ndi\params\WirelessMode, 		type, 		0, "enum"
-HKR,Ndi\params\WirelessMode, 		default, 	0, "8"
-HKR,Ndi\params\WirelessMode\enum, 	"2", 		0, %IEEE_802_11B_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"4", 		0, %IEEE_802_11BG_STR%
-HKR,defaults,WirelessMode, 0, "4"
-HKR,,WirelessMode, 0, "4"
-
-HKR,,BWSetting,0,"0"
-
-HKR,,Channel,0,"10"
-
-[11acWirelessMode.reg]
-HKR,Ndi\params\WirelessMode, 		ParamDesc, 	0, %WL_MODE_STR%
-HKR,Ndi\params\WirelessMode, 		type, 		0, "enum"
-HKR,Ndi\params\WirelessMode, 		default, 	0, "8"
-HKR,Ndi\params\WirelessMode\enum, 	"8", 		0, %AUTO_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"1", 		0, %IEEE_802_11A_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"2", 		0, %IEEE_802_11B_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"4", 		0, %IEEE_802_11BG_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"16", 		0, %IEEE_802_11BGN_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"32", 		0, %IEEE_802_11AN_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"64", 		0, %IEEE_802_11ANAC_STR%
-HKR,defaults,WirelessMode, 0, "8"
-HKR,,WirelessMode, 0, "8"
-
-HKR,,Channel,0,"36"
-
-;; RF Type
-HKR,,RFType,0,"15"
-
-
-HKR,defaults,BWSetting,0,"2"
-HKR,,BWSetting,0,"2"
-
-;;----------------------------------------------------------------------------
-;; LPS 32k Control Parameters
-;;----------------------------------------------------------------------------
-[32kEnable.reg]
-HKR,,bLowPowerEnable,0,"1"
-[32kDisable.reg]
-HKR,,bLowPowerEnable,0,"0"
-
-;-------------------------------------------------------------------------------
-;	PnP pre-transition handling
-;-------------------------------------------------------------------------------
-[PnpPreTransOn.reg]
-HKR,,PreTransPnP,0,"1"
-[PnpPreTransOff.reg]
-HKR,,PreTransPnP,0,"0"
-
-;;----------------------------------------------------------------------------
-;; WOWLAN Control Parameters
-;;----------------------------------------------------------------------------
-[WowlanAllEnable.reg]
-HKR,,WoWLANLPSLevel,0,"2"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "1"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"1"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "1"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"1"
-
-[WowlanDisable.reg]
-HKR,,WoWLANLPSLevel,0,"0"
-HKR,,ARPOffloadEnable,0,"0"
-HKR,,GTKOffloadEnable,0,"0"
-
-[WowlanAllEnableNoLPS.reg]
-HKR,,WoWLANLPSLevel,0,"0"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "1"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"1"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "1"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"1"
-
-[WowlanEnableNoPatternMatch.reg]
-HKR,,WoWLANLPSLevel,0,"2"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "1"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"1"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "0"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"0"
-
-[WowlanEnableNoLPSNoPatternMatch.reg]
-HKR,,WoWLANLPSLevel,0,"0"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "1"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"1"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "0"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"0"
-
-[ConnectedStandbyEnable.reg]
-HKR,,WoWLANLPSLevel,0,"2"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-HKR,,D2ListenIntvl,0,"4"
-HKR,,NSOffloadEnable,0,"1"
-HKR,,NLOEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "0"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"0"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "1"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"1"
-
-;; Packet coalescing should be enabled in WHCK test
-HKR,defaults,*PacketCoalescing,0,"0"
-HKR,,*PacketCoalescing,0,"0"
-
-;-------------------------------------------------------------------------------
-;	Auto Channel Selection
-;-------------------------------------------------------------------------------
-[AutoChnlSelon.reg]
-HKR,,AutoChnlSel,0,"1"
-[AutoChnlSeloff.reg]
-HKR,,AutoChnlSel,0,"0"
-
-;;----------------------------------------------------------------------------
-;; RSSI to Grid Mode Parameters
-;;----------------------------------------------------------------------------
-[RSSI2GridRealMode.reg]
-HKR,,RSSI2GridMode,0,"1"
-[RSSI2GridMode_2.reg]
-HKR,,RSSI2GridMode,0,"2"
-[RSSI2GridMode_4.reg]
-HKR,,RSSI2GridMode,0,"4"
-
-;;----------------------------------------------------------------------------
-;; KFREE parameters
-;;----------------------------------------------------------------------------
-[KFREE_COMMON.reg]
-HKR,,RfKFreeEnable,0,"0"
-
-;*******************************************************************************
-; Customer reg section
-;*******************************************************************************
-[ScanType.reg]
-HKR,defaults,PassiveScan, 0, "0"
-HKR,,PassiveScan, 0, "0"
-
-;*******************************************************************************
-; Multi-Channel Concurrent section
-;*******************************************************************************
-[MCC.reg]
-HKR,Ndi\params\MultiChannelFcsMode, 		ParamDesc, 	0, %MCC_STR%
-HKR,Ndi\params\MultiChannelFcsMode, 		type, 		0, "enum"
-HKR,Ndi\params\MultiChannelFcsMode, 		default, 	0, "0"
-HKR,Ndi\params\MultiChannelFcsMode\enum, 	"0", 		0, %DISABLED_STR%
-HKR,Ndi\params\MultiChannelFcsMode\enum, 	"4", 		0, %ENABLED_STR%
-HKR,defaults,MultiChannelFcsMode, 0, "0"
-HKR,,MultiChannelFcsMode, 0, "0"
-
-;*******************************************************************************
-; Destination Directory
-;*******************************************************************************
-[RTWlanS.CopyFiles]
-;; $$ DriverName Start
-rtwlans.sys,,,2
-;; $$ DriverName End
-
-[DestinationDirs]
-DefaultDestDir     	= 11
-RTWlanS.CopyFiles	= 12
-CIHVS.CopyFiles					= 11
-RtlUI2.CopyFiles				= 10
-
-;;****************************************************************************
-;; Source Files
-;;****************************************************************************
-[CIHVS.CopyFiles]
-Rtlihvs.dll,,,2
-;; $$ FeatureType WAPI Start
-RtlExtUI.dll,,,2
-;; $$ FeatureType WAPI End
-
-[RegisterUIExt]
-11,,RtlExtUI.dll,1
-
-[RtlUI2.CopyFiles]
-RtlUI2.exe,,,2
-
-[SourceDisksFiles]
-;; $$ DriverName Start
-rtwlans.sys = 1
-Rtlihvs.dll = 1
-;; $$ DriverName End
-;; $$ FeatureType WAPI Start
-RtlExtUI.dll = 1
-;; $$ FeatureType WAPI End
-
-[SourceDisksNames]
-1=%DISKNAME%,,,
-
-
-;*******************************************************************************
-; Strings
-;*******************************************************************************
-[Strings]
-SSID_STR				            = "SSID"
-CHANNEL_STR				            = "Channel"
-NETWORK_TYPE_STR			        = "Network Type"
-LED_CONTROL_STR				        = "LED Control" 
-POWER_SAVE_STR				        = "Power Save Mode"
-WIFI_IBSS_STR				        = "IBSS Default 11b Mode"
-RATE_ADAPTIVE_STR			        = "Rate Adaptive"
-QOS_STR					            = "QoS"
-WiFiConfg_STR	  			        = "WiFiConfg"
-WMM_APSD				            = "WMM APSD"
-CCX_RM_STR				            = "CCX Radio Measurement"
-CCX_OFF_LINE_DUR_UP_LIMIT_STR		= "CCX Max Off-Line Measurement (0: unlimited)"
-FORCE_PRIORITY_STR			        = "Forced Priority"
-HW_PARA_STR				            = "Init from HwParaFile"
-THREE_WIRE_MODE_STR		            = "Three Wire Programming Mode"
-BOARD_TYPE_STR			            = "Board Type"
-PROTECTION_MODE_STR		            = "Protection Mode"
-TPC_STR					            = "Transmit Power Control"
-TPC_POLARITY_STR		            = "TPC Polarity Select"
-HIGH_POWER_STR			            = "High Power Mechanism"
-INIT_GAIN_STR			            = "Initial Gain State"
-CW_MAX_MIN_STR			            = "Contention Window"
-PSP_XLINK_STR			            = "PSP XLink Mode"
-DISABLE_STR				            = "Disable"
-ENABLE_STR				            = "Enable"
-DISABLED_STR				            = "Disabled"
-ENABLED_STR				            = "Enabled"
-AUTO_STR							= "Auto"
-AD_HOC_STR				            = "Ad Hoc"
-INFRASTRUCTURE_STR		            = "Infrastructure"
-AUTO_SELECT				            = "Auto select"
-WL_MODE_STR				            = "Wireless Mode"
-RX_REORDER_STR			            = "Rx Reorder"
-CAM_STR					            = "CAM"
-MAX_PSP_STR				            = "MAX_PSP"
-Fast_PSP_STR				        = "Fast_PSP"
-NO_AC_STR					        = "No AC (Disable)"
-ALL_AC_STR				            = "ALL AC"
-IEEE_802_11A_STR 					= "IEEE 802.11a"
-IEEE_802_11B_STR 			        = "IEEE 802.11b"
-IEEE_802_11BG_STR 			        = "IEEE 802.11b/g"
-IEEE_802_11BGN_STR 			        = "IEEE 802.11b/g/n"
-IEEE_802_11AN_STR					= "IEEE 802.11a/n"	
-IEEE_802_11ANAC_STR					= "IEEE 802.11a/n/ac"
-IEEE_802_11AC_STR					= "IEEE 802.11 ac"
-WakeOnMagicPacket					= "Wake on Magic Packet"
-WakeOnPattern						= "Wake on Pattern Match"                                                 
-MCC_STR								= "Multi-Channel Concurrent"
-
-;*******************************************************************************
-; manufacture description
-;*******************************************************************************
-Realtek					            = "Realtek Semiconductor Corp."
-
-
-;*******************************************************************************
-;	Source disk name
-;*******************************************************************************
-;; $$ CDISKNAME Start
-DISKNAME							= "Realtek Wireless LAN 802.11n SDIO Network Adapter Driver Disk"
-RtlWlans.DeviceDesc 				= "Realtek Wireless LAN 802.11n SDIO Network Adapter"
-RtlWlans.DeviceDesc.DispName		= "Realtek Wireless LAN 802.11n SDIO Network Adapter"
-;; $$ CDISKNAME End
-
-;; $$ ICtype 8723A Start
-;*******************************************************************************
-; RTL8723as Device description
-;*******************************************************************************
-RTL8723as.DeviceDesc 				= "Realtek RTL8723AS Wireless LAN 802.11n SDIO Network Adapter"
-RTL8723as.DeviceDesc.DispName		= "Realtek RTL8723AS Wireless LAN 802.11n SDIO Network Adapter"
-;; $$ ICtype 8723A End
-
-
-
-;; $$ ICtype 8723B Start
-;*******************************************************************************
-; RTL8723bs Device description
-;*******************************************************************************
-RTL8723bs.DeviceDesc 				= "Realtek RTL8723BS Wireless LAN 802.11n SDIO Network Adapter"
-RTL8723bs.DeviceDesc.DispName		= "Realtek RTL8723BS Wireless LAN 802.11n SDIO Network Adapter"
-;; $$ ICtype 8723B End
-
-;; $$ ICtype 8814A Start
-;*******************************************************************************
-; RTL8814as Device description
-;*******************************************************************************
-RTL8814as.DeviceDesc 				= "Realtek RTL8814AS Wireless LAN 802.11ac SDIO Network Adapter"
-RTL8814as.DeviceDesc.DispName		= "Realtek RTL8814AS Wireless LAN 802.11ac SDIO Network Adapter"
-;; $$ ICtype 8814A End
-
-;; $$ ICtype 8188E Start
-;*******************************************************************************
-; RTL8188ES Device description
-;*******************************************************************************
-RTL8188es.DeviceDesc 				= "Realtek RTL8189ES Wireless LAN 802.11n USB 2.0 Network Adapter"
-RTL8188es.DeviceDesc.DispName		= "Realtek RTL8189ES Wireless LAN 802.11n USB 2.0 Network Adapter"
-;; $$ ICtype 8188E End
-;; $$ ICtype 8821A Start
-;*******************************************************************************
-; RTL8821as Device description
-;*******************************************************************************
-RTL8821as.DeviceDesc 			= "Realtek RTL8821AS Wireless LAN 802.11ac SDIO 2.0 Network Adapter"
-RTL8821as.DeviceDesc.DispName		= "Realtek RTL8821AS Wireless LAN 802.11ac SDIO 2.0 Network Adapter"
-;; $$ ICtype 8821A End
-;; $$ ICtype 8192E Start
-;*******************************************************************************
-; RTL8192E Device description
-;*******************************************************************************
-RTL8192es.DeviceDesc 				= "Realtek RTL8192ES Wireless LAN 802.11n USB 2.0 Network Adapter"
-RTL8192es.DeviceDesc.DispName		= "Realtek RTL8192ES Wireless LAN 802.11n USB 2.0 Network Adapter"
-;; $$ ICtype 8192E End
-
-;; $$ ICtype 8703B Start
-;*******************************************************************************
-; RTL8703bs Device description
-;*******************************************************************************
-RTL8703bs.DeviceDesc 				= "Realtek RTL8703BS Wireless LAN 802.11n SDIO Network Adapter"
-RTL8703bs.DeviceDesc.DispName		= "Realtek RTL8703BS Wireless LAN 802.11n SDIO Network Adapter"
-;; $$ ICtype 8703B End
-
-;; $$ ICtype 8188F Start
-;*******************************************************************************
-; RTL8188Fs Device description
-;*******************************************************************************
-RTL8188fs.DeviceDesc 				= "Realtek RTL8189FTV Wireless LAN 802.11n SDIO Network Adapter"
-RTL8188fs.DeviceDesc.DispName		= "Realtek RTL8189FTV Wireless LAN 802.11n SDIO Network Adapter"
-;; $$ ICtype 8188F End
-;; $$ ICtype 8822B Start
-;*******************************************************************************
-; RTL8822bs Device description
-;*******************************************************************************
-RTL8822bs.DeviceDesc 			= "Realtek RTL8822BS Wireless LAN 802.11ac SDIO 2.0 Network Adapter"
-RTL8822bs.DeviceDesc.DispName		= "Realtek RTL8822BS Wireless LAN 802.11ac SDIO 2.0 Network Adapter"
-;; $$ ICtype 8822B End
-
-;; $$ ICtype 8723D Start
-;*******************************************************************************
-; RTL8723ds Device description
-;*******************************************************************************
-RTL8723ds.DeviceDesc 				= "Realtek RTL8723DS Wireless LAN 802.11n SDIO Network Adapter"
-RTL8723ds.DeviceDesc.DispName		= "Realtek RTL8723DS Wireless LAN 802.11n SDIO Network Adapter"
-;; $$ ICtype 8723D End
-\ No newline at end of file
diff --git a/network/wlan/WDI/PLATFORM/WinInf/SDIO/x64/netrtwlans.inf b/network/wlan/WDI/PLATFORM/WinInf/SDIO/x64/netrtwlans.inf
index 8343a003..e7753ef3 100644
--- a/network/wlan/WDI/PLATFORM/WinInf/SDIO/x64/netrtwlans.inf
+++ b/network/wlan/WDI/PLATFORM/WinInf/SDIO/x64/netrtwlans.inf
diff --git a/network/wlan/WDI/PLATFORM/WinInf/SDIO/x86/netrtwlans.inf b/network/wlan/WDI/PLATFORM/WinInf/SDIO/x86/netrtwlans.inf
deleted file mode 100644
index 5e6b284b..00000000
--- a/network/wlan/WDI/PLATFORM/WinInf/SDIO/x86/netrtwlans.inf
+++ /dev/null
@@ -1,1259 +0,0 @@
-;; netrtwlans.inf 
-;;
-;; Realtek Wireless 802.11b/g/n SDIO Network Adapter
-;;
-;; Copyright (C) 2012 Realtek Semiconductor Corp.
-;;
-;; This release is primarily for WHQL test.
-;;
-
-;; FOR XP/Vista/Win7/Win8
-
-[Version]
-Signature	= "$Windows NT$"
-Class		= Net
-ClassGUID	= {4d36e972-e325-11ce-bfc1-08002be10318}
-Provider	= %Realtek%
-CatalogFile.NT	= netrtwlans.cat		;; for WHQL certified
-DriverVer = 11/23/2015,3008.22.1030.2015
-
-[Manufacturer]
-%Realtek% = Realtek,NTx86.10.0
-
-[ControlFlags]
-ExcludeFromSelect = *
-
-[Realtek.NTx86.10.0]
-;; For 8723 RTK common		================================================================
-
-;; For 8723 RTK common		================================================================
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_8753
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_B723
-;; Acer
-%RTL8723bs.DeviceDesc% = ACER8723bs.ndi, SD\VID_024C&PID_0623
-;; HP
-%RTL8723bs.DeviceDesc% = HP8723bs.ndi, SD\VID_024C&PID_0523
-;; ECS
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_0524
-;; bestbuy
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_0240
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_0241
-;; For Braswell platform
-%RTL8723bs.DeviceDesc% = RTL8723bs.ndi, SD\VID_024C&PID_0626
-;; Reserved
-%RTL8723bs.DeviceDesc% = RSVD8723bs.ndi, SD\VID_024C&PID_0624
-
-;; For 8188E RTK common		================================================================
-%RTL8188es.DeviceDesc% = RTL8188es.ndi, SD\VID_024C&PID_8188
-%RTL8188es.DeviceDesc% = RTL8188es.ndi, SD\VID_024C&PID_8179 
-
-;; For 8812A RTK common		================================================================
-
-;; For 8814A RTK common		================================================================
-%RTL8814as.DeviceDesc% = RTL8814as.ndi, SD\VID_024C&PID_8813
-
-;; For 8821A RTK common		================================================================
-%RTL8821as.DeviceDesc% = RTL8821as.ndi, SD\VID_024C&PID_8821
-
-;; For 8192ES RTK common		================================================================
-%RTL8192es.DeviceDesc% = RTL8192es.ndi, SD\VID_024C&PID_818B
-
-
-;; For 8703 RTK common		================================================================
-%RTL8703bs.DeviceDesc% = RTL8703bs.ndi, SD\VID_024C&PID_B703
-
-;; For 8188 RTK common		================================================================
-%RTL8188fs.DeviceDesc% = RTL8188fs.ndi, SD\VID_024C&PID_F179
-
-;; For 8822B RTK common		================================================================
-%RTL8822bs.DeviceDesc% = RTL8822bs.ndi, SD\VID_024C&PID_B822
-
-;; For 8723D RTK common		================================================================
-%RTL8723ds.DeviceDesc% = RTL8723ds.ndi, SD\VID_024C&PID_D723
-
-;;----------------------------------------------------------------------------
-;; Realtek 8723as default installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[RTL8723as.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723as.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723as.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723as.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8723bs default installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[RTL8723bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, MCC.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723bs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;;----------------------------------------------------------------------------
-;; Acer 8723bs installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[ACER8723bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, RSSI2GridMode_2.reg, MCC.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[ACER8723bs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[ACER8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-;;----------------------------------------------------------------------------
-;; HP 8723bs installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[HP8723bs.ndi.NT]
-AddReg				= NDIS_64.reg, HP8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[HP8723bs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[HP8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; RSVD 8723bs installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[RSVD8723bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, WowlanDisable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RSVD8723bs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RSVD8723bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8188eu default installation
-;;----------------------------------------------------------------------------
-
-
-
-
-
-[RTL8188es.ndi.NT]
-AddReg				= NDIS_64.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8188es.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8188es.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8821as default installation
-;;----------------------------------------------------------------------------
-
-
-
-
-
-[RTL8821as.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8821as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8821as.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8821as.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8814as default installation
-;;----------------------------------------------------------------------------
-
-
-
-
-
-[RTL8814as.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8814as.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8814as.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8814as.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8192es default installation
-;;----------------------------------------------------------------------------
-
-
-
-
-
-[RTL8192es.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8192es.common.reg, RTLWLAN.reg, 11nWirelessMode.reg, Ndis6Set.reg, CIHVS.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8192es.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8192es.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8703bs default installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[RTL8703bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, AutoChnlSelon.reg, CIHVS.reg, KFREE_COMMON.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8703bs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8703bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8188fs default installation
-;;----------------------------------------------------------------------------
-
-             
-
-
-
-[RTL8188fs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8703bs.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, CIHVS.reg, PnpPreTransOn.reg, AutoChnlSelon.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8188fs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8188fs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-;;----------------------------------------------------------------------------
-;; Realtek 8822bs default installation
-;;----------------------------------------------------------------------------
-
-
-
-
-
-[RTL8822bs.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8822bs.common.reg, RTLWLAN.reg, 11acWirelessMode.reg, Ndis6Set.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8822bs.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8822bs.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-
-;;----------------------------------------------------------------------------
-;; Realtek 8723ds default installation
-;;----------------------------------------------------------------------------
-
-
-
-
-
-[RTL8723ds.ndi.NT]
-AddReg				= NDIS_64.reg, RTL8723ds.common.reg, RTLWLAN.reg, Ndis6Set.reg, 11nWirelessMode.reg, ConnectedStandbyEnable.reg, 32kEnable.reg, CIHVS.reg, PnpPreTransOn.reg, AutoChnlSelon.reg
-Include         	= netvwifibus.inf
-Needs				= VWiFiBus.CopyFiles
-Characteristics		= 0x84
-BusType				= 15 
-CopyFiles			= RTWlanS.CopyFiles
-*IfType				= 71            ; IF_TYPE_IEEE80211
-*MediaType			= 16            ; NdisMediumNative802_11
-*PhysicalMediaType	= 9          ; NdisPhysicalMediumNative802_11
-
-[RTL8723ds.ndi.NT.Services]
-AddService			= RtlWlans, 2, RtlWlans.Service, RtlWlans.EventLog
-Include 			= netvwifibus.inf
-Needs 				= VWiFiBus.Services
-
-[RTL8723ds.ndi.NT.HW]
-Include = netvwifibus.inf
-Needs 	= VWiFiBus.PnPFilterRegistration
-
-;;----------------------------------------------------------------------------
-;; OS relative registry.
-;;----------------------------------------------------------------------------
-[NDIS_64.reg]
-HKR, Ndi\Interfaces,	UpperRange, 0, "ndis5,mdcwifi"
-HKR, Ndi\Interfaces,	LowerRange, 0, "wlan,ethernet,vwifi"
-HKR, Ndi,				Service,    0, "RtlWlans"
-;;
-;; OS relative service.
-;;
-[RtlWlans.Service]
-DisplayName    	= %RtlWlans.DeviceDesc.DispName%
-ServiceType    	= 1		; %SERVICE_KERNEL_DRIVER%
-StartType      	= 3		; %SERRVICE_DEMAND_START%
-ErrorControl   	= 1		; %SERRVICE_ERROR_NORMAL%
-ServiceBinary  	= %12%\rtwlans.sys
-LoadOrderGroup 	= NDIS
-
-;;
-;; OS relative event log.
-;;
-[RtlWlans.EventLog]
-AddReg 			= RtlWlans.AddEventLog.reg
-
-[RtlWlans.AddEventLog.reg]
-HKR, , EventMessageFile, 0x00020000, "%%SystemRoot%%\System32\netevent.dll"
-HKR, , TypesSupported  , 0x00010001, 7
-
-[CIHVS.reg]
-HKR, Ndi\IHVExtensions, ExtensibilityDLL,       0,  "%SystemRoot%\system32\Rtlihvs.dll"
-HKR, Ndi\IHVExtensions, UIExtensibilityCLSID,   0,  "{6C2A8CCA-B2A2-4d81-A3B2-4E15F445C312}"
-HKR, Ndi\IHVExtensions, GroupName,              0,  "Realtek CCX SDK IHV Service"
-HKR, Ndi\IHVExtensions, AdapterOUI,             0x00010001, 0x00e04c
-
-;*******************************************************************************
-; WAPI section
-;*******************************************************************************
-[wapi.reg]
-HKR,defaults,WapiSupport,0,"1"
-HKR,,WapiSupport,0,"1"
-
-;*******************************************************************************
-; RTL8723as common paramters
-;*******************************************************************************
-[RTL8723as.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-
-;*******************************************************************************
-; RTL8723bs common paramters
-;*******************************************************************************
-[RTL8723bs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,RomDLFwEnable,0,"1"
-HKR,,RomDLFwEnable,0,"1"
-
-HKR,defaults,bFwCtrlPwrOff,0,"1"
-HKR,,bFwCtrlPwrOff,0,"1"
-
-;;HKR,defaults,EnableAdaptivity,0,"0"
-;;HKR,,EnableAdaptivity,0,"0"
-
-HKR,defaults,EnableCarrierSense,0,"0"
-HKR,,EnableCarrierSense,0,"0"
-
-; AOAC reconnect
-HKR,defaults,PnpKeepLink,0,"1"
-HKR,,PnpKeepLink,0,"1"
-
-;; $$ End of RTL8723bs.common.reg
-
-[HP8723bs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,RomDLFwEnable,0,"1"
-HKR,,RomDLFwEnable,0,"1"
-
-HKR,defaults,bFwCtrlPwrOff,0,"1"
-HKR,,bFwCtrlPwrOff,0,"1"
-
-; Enable Adaptivity
-;;HKR,defaults,EnableAdaptivity,0,"1"
-;;HKR,,EnableAdaptivity,0,"1"
-
-HKR,defaults,EnableCarrierSense,0,"0"
-HKR,,EnableCarrierSense,0,"0"
-
-; Enable Customeized PowerLimit Table
-HKR,,EnableTxPowerLimit,0,"1"
-HKR,,DecryptCustomFile,,"1"
-HKR,,PwrLimitFile,0,"TXPWR_LMT_IEC0921_Enc.txt"
-
-; Regulation WorldWide
-HKR,defaults,PwrTblSel,0,"4"
-HKR,,PwrTblSel,0,"4"
-
-; AOAC reconnect
-HKR,defaults,PnpKeepLink,0,"1"
-HKR,,PnpKeepLink,0,"1"
-
-;; $$ End of HP8723bs.common.reg
-
-;*******************************************************************************
-; RTL8703bs common paramters
-;*******************************************************************************
-[RTL8703bs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,RomDLFwEnable,0,"1"
-HKR,,RomDLFwEnable,0,"1"
-
-HKR,defaults,bFwCtrlPwrOff,0,"1"
-HKR,,bFwCtrlPwrOff,0,"1"
-
-
-;*******************************************************************************
-; RTL8188Fs common paramters
-;*******************************************************************************
-[RTL8188fs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,RomDLFwEnable,0,"0"
-HKR,,RomDLFwEnable,0,"0"
-
-HKR,defaults,bFwCtrlPwrOff,0,"1"
-HKR,,bFwCtrlPwrOff,0,"1"
-
-
-;*******************************************************************************
-; RTL8821as common paramters
-;*******************************************************************************
-[RTL8821as.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-HKR,,StbcCap,0,"17"
-HKR,,LdpcCap,0,"34"
-HKR,,BeamformCap,0,"34"
-
-
-;*******************************************************************************
-; RTL8814as common paramters
-;*******************************************************************************
-[RTL8814as.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-;; Add for 8814AS, based on 8821AS's modification
-HKR,,StbcCap,0,"17"
-HKR,,LdpcCap,0,"34"
-HKR,,BeamformCap,0,"34"
-
-
-;*******************************************************************************
-; RTL8192es common paramters
-;*******************************************************************************
-[RTL8192es.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-;*******************************************************************************
-; RTL8822bs common paramters
-;*******************************************************************************
-[RTL8822bs.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-HKR,,StbcCap,0,"17"
-HKR,,LdpcCap,0,"34"
-HKR,,BeamformCap,0,"34"
-HKR,,ValidRFPath,0,"51"
-HKR,,PreInitMem,0,"1"
-
-
-;*******************************************************************************
-; RTL8723ds common paramters
-;*******************************************************************************
-[RTL8723ds.common.reg]
-HKR,defaults,LedCtrl,0,"1"
-HKR,,LedCtrl,0,"1"
-
-HKR,defaults,QoS,0,"1"
-HKR,,QoS,0,"1"
-
-HKR,defaults,CcxRm,0,"1"
-HKR,,CcxRm,0,"1"
-
-HKR,defaults,CcxOffLineDurUpLimit,0,"0"
-HKR,,CcxOffLineDurUpLimit,0,"0"
-
-HKR,defaults,UsbRxAggMode,0,"1"
-HKR,,UsbRxAggMode,0,"1"
-
-HKR,defaults,bEarlymodeEnable,0,"0"
-HKR,,bEarlymodeEnable,0,"0"
-
-HKR,defaults,LdpcCap,0,"0"
-
-
-;;----------------------------------------------------------------------------
-;; Realtek WLAN NIC parameters
-;;----------------------------------------------------------------------------
-[RTLWLAN.reg]
-
-; Enable Adaptivity
-HKR,,EnableAdaptivity,0,"1"
-
-HKR,defaults,Channel,0,"1"
-HKR,,Channel,0,"1"
-
-;; Antenna Diversity Type
-HKR,defaults,AntennaDivType,0,"0"
-HKR,,AntennaDivType,0,"0"
-
-HKR,defaults,NetworkType,0,"1"
-HKR,,NetworkType,0,"1"
-
-HKR,defaults,StaUapsd,0,"0"
-HKR,,StaUapsd,0,"0"
-
-; For B/G mode and B/G/N mode switch, we will use different wireless mode registry in later section
-HKR,Ndi\params\WirelessMode, 			ParamDesc, 	0, %WL_MODE_STR%
-HKR,Ndi\params\WirelessMode, 			type, 		0, "enum"
-HKR,Ndi\params\WirelessMode, 			default, 	0, "8"
-HKR,Ndi\params\WirelessMode\enum, 		"2", 		0, %IEEE_802_11B_STR%
-HKR,Ndi\params\WirelessMode\enum, 		"4", 		0, %IEEE_802_11BG_STR%
-HKR,Ndi\params\WirelessMode\enum, 		"8", 		0, %IEEE_802_11BGN_STR%
-HKR,defaults,WirelessMode, 0, "8"
-HKR,,WirelessMode, 0, "8"
-
-
-;; For WiFi test, 1: WiFi Config and 0: Performance Config
-HKR,defaults,WiFiConfg,0,"0"
-HKR,,WiFiConfg,0,"0"
-
-HKR,defaults,RxReorder,0,"1"
-HKR,,RxReorder,0,"1"
-
-HKR,,DefaultKeyID,,"0"
-HKR,,DefaultKey0,,""
-HKR,,DefaultKey1,,""
-HKR,,DefaultKey2,,""
-HKR,,DefaultKey3,,""
-
-;Inactive Power Save
-HKR,defaults,InactivePs,0,"0"
-HKR,,InactivePs,0,"0"
-
-;Leisure Power Save
-HKR,defaults,bLeisurePs,0,"2"
-HKR,,bLeisurePs,0,"2"
-
-;Fw Control LPS
-HKR,defaults,bFwCtrlLPS,0,"1"
-HKR,,bFwCtrlLPS,0,"1"
-
-;; LPS Interval
-;HKR,defaults,LPSIntvl,0,"3"
-HKR,,LPSIntvl,0,"3"
-
-HKR,,WEPinNmode,0,"0"
-
-HKR,defaults,RxSC,0,"0"
-HKR,,RxSC,0,"0"
-
-HKR,defaults,TxSC,0,"0"
-HKR,,TxSC,0,"0"
-
-HKR,defaults,NblRacingWA,0,"1"
-HKR,,NblRacingWA,0,"1"
-
-HKR,defaults,SuspendTimerInLowPwr,0,"1"
-HKR,,SuspendTimerInLowPwr,0,"1"
-
-;; Rx reorder pending time
-HKR,,RxReorder_PendTime,0,"100"
-
-;Antenna Diversity
-HKR,Ndi\params\AntDiv,			ParamDesc, 		0, "Antenna Diversity"
-HKR,Ndi\params\AntDiv, 			default, 		0, "0"
-HKR,Ndi\params\AntDiv, 			type, 		    0, "enum"
-HKR,Ndi\params\AntDiv\enum,  	"0",        	0, %DISABLED_STR%
-HKR,Ndi\params\AntDiv\enum,   	"1",        	0, %ENABLED_STR%
-
-HKLM, SYSTEM\CurrentControlSet\Services\RtlWlans\Parameters, "BtAntennaInHw", 0x00010001,2
-
-[Ndis5Set.reg]
-HKR,Ndi\params\PSPXlinkMode,			ParamDesc,  0, %PSP_XLINK_STR%
-HKR,Ndi\params\PSPXlinkMode,			type,       0, "enum"
-HKR,Ndi\params\PSPXlinkMode,			default,    0, "0"
-HKR,Ndi\params\PSPXlinkMode\enum,		"0",        0, %DISABLE_STR%
-HKR,Ndi\params\PSPXlinkMode\enum,		"1",        0, %ENABLE_STR%
-HKR,defaults,PSPXlinkMode,0,"0"
-HKR,,PSPXlinkMode,0,"0"
-
-;Inactive Power Save
-HKR,defaults,InactivePs,0,"0"
-HKR,,InactivePs,0,"0"
-
-
-[Ndis6Set.reg]
-;Inactive Power Save
-HKR,defaults,InactivePs,0,"2"
-HKR,,InactivePs,0,"2"
-
-
-;;----------------------------------------------------------------------------
-;; Wireless mode option parameters
-;;----------------------------------------------------------------------------
-[11nWirelessMode.reg]
-HKR,Ndi\params\WirelessMode, 		ParamDesc, 	0, %WL_MODE_STR%
-HKR,Ndi\params\WirelessMode, 		type, 		0, "enum"
-HKR,Ndi\params\WirelessMode, 		default, 	0, "8"
-HKR,Ndi\params\WirelessMode\enum, 	"2", 		0, %IEEE_802_11B_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"4", 		0, %IEEE_802_11BG_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"8", 		0, %IEEE_802_11BGN_STR%
-HKR,defaults,WirelessMode, 0, "8"
-HKR,,WirelessMode, 0, "8"
-
-;; 40MHz Support in 11n
-HKR,Ndi\params\BWSetting, 			ParamDesc, 	0, "Bandwidth"
-HKR,Ndi\params\BWSetting, 			type, 		0, "enum"
-HKR,Ndi\params\BWSetting, 			default, 	0, "1"
-HKR,Ndi\params\BWSetting\enum, 		"0", 		0, "20MHz Only"
-HKR,Ndi\params\BWSetting\enum, 		"1", 		0, "20_40MHz"
-HKR,defaults,BWSetting,0,"1"
-HKR,,BWSetting,0,"1"
-HKR,,BWSetting,,"1"
-
-HKR,,Channel,0,"10"
-
-[11gWirelessMode.reg]
-HKR,Ndi\params\WirelessMode, 		ParamDesc, 	0, %WL_MODE_STR%
-HKR,Ndi\params\WirelessMode, 		type, 		0, "enum"
-HKR,Ndi\params\WirelessMode, 		default, 	0, "8"
-HKR,Ndi\params\WirelessMode\enum, 	"2", 		0, %IEEE_802_11B_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"4", 		0, %IEEE_802_11BG_STR%
-HKR,defaults,WirelessMode, 0, "4"
-HKR,,WirelessMode, 0, "4"
-
-HKR,,BWSetting,0,"0"
-
-HKR,,Channel,0,"10"
-
-[11acWirelessMode.reg]
-HKR,Ndi\params\WirelessMode, 		ParamDesc, 	0, %WL_MODE_STR%
-HKR,Ndi\params\WirelessMode, 		type, 		0, "enum"
-HKR,Ndi\params\WirelessMode, 		default, 	0, "8"
-HKR,Ndi\params\WirelessMode\enum, 	"8", 		0, %AUTO_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"1", 		0, %IEEE_802_11A_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"2", 		0, %IEEE_802_11B_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"4", 		0, %IEEE_802_11BG_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"16", 		0, %IEEE_802_11BGN_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"32", 		0, %IEEE_802_11AN_STR%
-HKR,Ndi\params\WirelessMode\enum, 	"64", 		0, %IEEE_802_11ANAC_STR%
-HKR,defaults,WirelessMode, 0, "8"
-HKR,,WirelessMode, 0, "8"
-
-HKR,,Channel,0,"36"
-
-;; RF Type
-HKR,,RFType,0,"15"
-
-
-HKR,defaults,BWSetting,0,"2"
-HKR,,BWSetting,0,"2"
-
-;;----------------------------------------------------------------------------
-;; LPS 32k Control Parameters
-;;----------------------------------------------------------------------------
-[32kEnable.reg]
-HKR,,bLowPowerEnable,0,"1"
-[32kDisable.reg]
-HKR,,bLowPowerEnable,0,"0"
-
-;-------------------------------------------------------------------------------
-;	PnP pre-transition handling
-;-------------------------------------------------------------------------------
-[PnpPreTransOn.reg]
-HKR,,PreTransPnP,0,"1"
-[PnpPreTransOff.reg]
-HKR,,PreTransPnP,0,"0"
-
-;;----------------------------------------------------------------------------
-;; WOWLAN Control Parameters
-;;----------------------------------------------------------------------------
-[WowlanAllEnable.reg]
-HKR,,WoWLANLPSLevel,0,"2"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "1"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"1"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "1"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"1"
-
-[WowlanDisable.reg]
-HKR,,WoWLANLPSLevel,0,"0"
-HKR,,ARPOffloadEnable,0,"0"
-HKR,,GTKOffloadEnable,0,"0"
-
-[WowlanAllEnableNoLPS.reg]
-HKR,,WoWLANLPSLevel,0,"0"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "1"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"1"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "1"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"1"
-
-[WowlanEnableNoPatternMatch.reg]
-HKR,,WoWLANLPSLevel,0,"2"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "1"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"1"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "0"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"0"
-
-[WowlanEnableNoLPSNoPatternMatch.reg]
-HKR,,WoWLANLPSLevel,0,"0"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "1"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"1"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "0"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"0"
-
-[ConnectedStandbyEnable.reg]
-HKR,,WoWLANLPSLevel,0,"2"
-HKR,,ARPOffloadEnable,0,"1"
-HKR,,GTKOffloadEnable,0,"1"
-HKR,,D2ListenIntvl,0,"4"
-HKR,,NSOffloadEnable,0,"1"
-HKR,,NLOEnable,0,"1"
-
-HKR, Ndi\params\*WakeOnMagicPacket,         ParamDesc,  0, %WakeOnMagicPacket%
-HKR, Ndi\params\*WakeOnMagicPacket,         default,    0, "0"
-HKR, Ndi\params\*WakeOnMagicPacket,         type,       0, "enum"
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnMagicPacket\enum,    "1",        0, %ENABLED_STR%
-HKR,,*WakeOnMagicPacket,0,"0"
-
-HKR, Ndi\params\*WakeOnPattern ,            ParamDesc,  0, %WakeOnPattern%
-HKR, Ndi\params\*WakeOnPattern,             default,    0, "1"
-HKR, Ndi\params\*WakeOnPattern,             type,       0, "enum"
-HKR, Ndi\params\*WakeOnPattern\enum,        "0",        0, %DISABLED_STR%
-HKR, Ndi\params\*WakeOnPattern\enum,        "1",        0, %ENABLED_STR%
-HKR,,*WakeOnPattern,0,"1"
-
-;; Packet coalescing should be enabled in WHCK test
-HKR,defaults,*PacketCoalescing,0,"0"
-HKR,,*PacketCoalescing,0,"0"
-
-;-------------------------------------------------------------------------------
-;	Auto Channel Selection
-;-------------------------------------------------------------------------------
-[AutoChnlSelon.reg]
-HKR,,AutoChnlSel,0,"1"
-[AutoChnlSeloff.reg]
-HKR,,AutoChnlSel,0,"0"
-
-;;----------------------------------------------------------------------------
-;; RSSI to Grid Mode Parameters
-;;----------------------------------------------------------------------------
-[RSSI2GridRealMode.reg]
-HKR,,RSSI2GridMode,0,"1"
-[RSSI2GridMode_2.reg]
-HKR,,RSSI2GridMode,0,"2"
-[RSSI2GridMode_4.reg]
-HKR,,RSSI2GridMode,0,"4"
-
-;;----------------------------------------------------------------------------
-;; KFREE parameters
-;;----------------------------------------------------------------------------
-[KFREE_COMMON.reg]
-HKR,,RfKFreeEnable,0,"0"
-
-;*******************************************************************************
-; Customer reg section
-;*******************************************************************************
-[ScanType.reg]
-HKR,defaults,PassiveScan, 0, "0"
-HKR,,PassiveScan, 0, "0"
-
-;*******************************************************************************
-; Multi-Channel Concurrent section
-;*******************************************************************************
-[MCC.reg]
-HKR,Ndi\params\MultiChannelFcsMode, 		ParamDesc, 	0, %MCC_STR%
-HKR,Ndi\params\MultiChannelFcsMode, 		type, 		0, "enum"
-HKR,Ndi\params\MultiChannelFcsMode, 		default, 	0, "0"
-HKR,Ndi\params\MultiChannelFcsMode\enum, 	"0", 		0, %DISABLED_STR%
-HKR,Ndi\params\MultiChannelFcsMode\enum, 	"4", 		0, %ENABLED_STR%
-HKR,defaults,MultiChannelFcsMode, 0, "0"
-HKR,,MultiChannelFcsMode, 0, "0"
-
-;*******************************************************************************
-; Destination Directory
-;*******************************************************************************
-[RTWlanS.CopyFiles]
-rtwlans.sys,,,2
-
-[DestinationDirs]
-DefaultDestDir     	= 11
-RTWlanS.CopyFiles	= 12
-CIHVS.CopyFiles					= 11
-RtlUI2.CopyFiles				= 10
-
-;;****************************************************************************
-;; Source Files
-;;****************************************************************************
-[CIHVS.CopyFiles]
-Rtlihvs.dll,,,2
-
-[RegisterUIExt]
-11,,RtlExtUI.dll,1
-
-[RtlUI2.CopyFiles]
-RtlUI2.exe,,,2
-
-[SourceDisksFiles]
-rtwlans.sys = 1
-Rtlihvs.dll = 1
-
-[SourceDisksNames]
-1=%DISKNAME%,,,
-
-
-;*******************************************************************************
-; Strings
-;*******************************************************************************
-[Strings]
-SSID_STR				            = "SSID"
-CHANNEL_STR				            = "Channel"
-NETWORK_TYPE_STR			        = "Network Type"
-LED_CONTROL_STR				        = "LED Control" 
-POWER_SAVE_STR				        = "Power Save Mode"
-WIFI_IBSS_STR				        = "IBSS Default 11b Mode"
-RATE_ADAPTIVE_STR			        = "Rate Adaptive"
-QOS_STR					            = "QoS"
-WiFiConfg_STR	  			        = "WiFiConfg"
-WMM_APSD				            = "WMM APSD"
-CCX_RM_STR				            = "CCX Radio Measurement"
-CCX_OFF_LINE_DUR_UP_LIMIT_STR		= "CCX Max Off-Line Measurement (0: unlimited)"
-FORCE_PRIORITY_STR			        = "Forced Priority"
-HW_PARA_STR				            = "Init from HwParaFile"
-THREE_WIRE_MODE_STR		            = "Three Wire Programming Mode"
-BOARD_TYPE_STR			            = "Board Type"
-PROTECTION_MODE_STR		            = "Protection Mode"
-TPC_STR					            = "Transmit Power Control"
-TPC_POLARITY_STR		            = "TPC Polarity Select"
-HIGH_POWER_STR			            = "High Power Mechanism"
-INIT_GAIN_STR			            = "Initial Gain State"
-CW_MAX_MIN_STR			            = "Contention Window"
-PSP_XLINK_STR			            = "PSP XLink Mode"
-DISABLE_STR				            = "Disable"
-ENABLE_STR				            = "Enable"
-DISABLED_STR				            = "Disabled"
-ENABLED_STR				            = "Enabled"
-AUTO_STR							= "Auto"
-AD_HOC_STR				            = "Ad Hoc"
-INFRASTRUCTURE_STR		            = "Infrastructure"
-AUTO_SELECT				            = "Auto select"
-WL_MODE_STR				            = "Wireless Mode"
-RX_REORDER_STR			            = "Rx Reorder"
-CAM_STR					            = "CAM"
-MAX_PSP_STR				            = "MAX_PSP"
-Fast_PSP_STR				        = "Fast_PSP"
-NO_AC_STR					        = "No AC (Disable)"
-ALL_AC_STR				            = "ALL AC"
-IEEE_802_11A_STR 					= "IEEE 802.11a"
-IEEE_802_11B_STR 			        = "IEEE 802.11b"
-IEEE_802_11BG_STR 			        = "IEEE 802.11b/g"
-IEEE_802_11BGN_STR 			        = "IEEE 802.11b/g/n"
-IEEE_802_11AN_STR					= "IEEE 802.11a/n"	
-IEEE_802_11ANAC_STR					= "IEEE 802.11a/n/ac"
-IEEE_802_11AC_STR					= "IEEE 802.11 ac"
-WakeOnMagicPacket					= "Wake on Magic Packet"
-WakeOnPattern						= "Wake on Pattern Match"                                                 
-MCC_STR								= "Multi-Channel Concurrent"
-
-;*******************************************************************************
-; manufacture description
-;*******************************************************************************
-Realtek					            = "Realtek Semiconductor Corp."
-
-
-;*******************************************************************************
-;	Source disk name
-;*******************************************************************************
-DISKNAME							= "Realtek Wireless LAN 802.11n SDIO Network Adapter Driver Disk"
-RtlWlans.DeviceDesc 				= "Realtek Wireless LAN 802.11n SDIO Network Adapter"
-RtlWlans.DeviceDesc.DispName		= "Realtek Wireless LAN 802.11n SDIO Network Adapter"
-
-;*******************************************************************************
-; RTL8723as Device description
-;*******************************************************************************
-RTL8723as.DeviceDesc 				= "Realtek RTL8723AS Wireless LAN 802.11n SDIO Network Adapter"
-RTL8723as.DeviceDesc.DispName		= "Realtek RTL8723AS Wireless LAN 802.11n SDIO Network Adapter"
-
-
-
-;*******************************************************************************
-; RTL8723bs Device description
-;*******************************************************************************
-RTL8723bs.DeviceDesc 				= "Realtek RTL8723BS Wireless LAN 802.11n SDIO Network Adapter"
-RTL8723bs.DeviceDesc.DispName		= "Realtek RTL8723BS Wireless LAN 802.11n SDIO Network Adapter"
-
-;*******************************************************************************
-; RTL8814as Device description
-;*******************************************************************************
-RTL8814as.DeviceDesc 				= "Realtek RTL8814AS Wireless LAN 802.11ac SDIO Network Adapter"
-RTL8814as.DeviceDesc.DispName		= "Realtek RTL8814AS Wireless LAN 802.11ac SDIO Network Adapter"
-
-;*******************************************************************************
-; RTL8188ES Device description
-;*******************************************************************************
-RTL8188es.DeviceDesc 				= "Realtek RTL8189ES Wireless LAN 802.11n USB 2.0 Network Adapter"
-RTL8188es.DeviceDesc.DispName		= "Realtek RTL8189ES Wireless LAN 802.11n USB 2.0 Network Adapter"
-;*******************************************************************************
-; RTL8821as Device description
-;*******************************************************************************
-RTL8821as.DeviceDesc 			= "Realtek RTL8821AS Wireless LAN 802.11ac SDIO 2.0 Network Adapter"
-RTL8821as.DeviceDesc.DispName		= "Realtek RTL8821AS Wireless LAN 802.11ac SDIO 2.0 Network Adapter"
-;*******************************************************************************
-; RTL8192E Device description
-;*******************************************************************************
-RTL8192es.DeviceDesc 				= "Realtek RTL8192ES Wireless LAN 802.11n USB 2.0 Network Adapter"
-RTL8192es.DeviceDesc.DispName		= "Realtek RTL8192ES Wireless LAN 802.11n USB 2.0 Network Adapter"
-
-;*******************************************************************************
-; RTL8703bs Device description
-;*******************************************************************************
-RTL8703bs.DeviceDesc 				= "Realtek RTL8703BS Wireless LAN 802.11n SDIO Network Adapter"
-RTL8703bs.DeviceDesc.DispName		= "Realtek RTL8703BS Wireless LAN 802.11n SDIO Network Adapter"
-
-;*******************************************************************************
-; RTL8188Fs Device description
-;*******************************************************************************
-RTL8188fs.DeviceDesc 				= "Realtek RTL8189FTV Wireless LAN 802.11n SDIO Network Adapter"
-RTL8188fs.DeviceDesc.DispName		= "Realtek RTL8189FTV Wireless LAN 802.11n SDIO Network Adapter"
-;*******************************************************************************
-; RTL8822bs Device description
-;*******************************************************************************
-RTL8822bs.DeviceDesc 			= "Realtek RTL8822BS Wireless LAN 802.11ac SDIO 2.0 Network Adapter"
-RTL8822bs.DeviceDesc.DispName		= "Realtek RTL8822BS Wireless LAN 802.11ac SDIO 2.0 Network Adapter"
-
-;*******************************************************************************
-; RTL8723ds Device description
-;*******************************************************************************
-RTL8723ds.DeviceDesc 				= "Realtek RTL8723DS Wireless LAN 802.11n SDIO Network Adapter"
-RTL8723ds.DeviceDesc.DispName		= "Realtek RTL8723DS Wireless LAN 802.11n SDIO Network Adapter"
diff --git a/network/wlan/WDI/windows.msbuild.rtwssample.sln b/network/wlan/WDI/windows.msbuild.rtwssample.sln
index 0d8732a8..291992f1 100644
--- a/network/wlan/WDI/windows.msbuild.rtwssample.sln
+++ b/network/wlan/WDI/windows.msbuild.rtwssample.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33530.505
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdio", "PLATFORM\NDIS6\SDIO\sdio.vcxproj", "{105EA485-B9B6-48AE-B8B0-96BBEA575973}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -15,68 +15,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NdisComm", "PLATFORM\NdisCo
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Win10 Debug|Arm = Win10 Debug|Arm
-		Win10 Debug|Win32 = Win10 Debug|Win32
-		Win10 Debug|x64 = Win10 Debug|x64
-		Win10 Release|Arm = Win10 Release|Arm
-		Win10 Release|Win32 = Win10 Release|Win32
-		Win10 Release|x64 = Win10 Release|x64
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Debug|Arm.ActiveCfg = Win10 Debug|Arm
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Debug|Arm.Build.0 = Win10 Debug|Arm
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Debug|Arm.Deploy.0 = Win10 Debug|Arm
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Debug|Win32.ActiveCfg = Win10 Debug|Win32
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Debug|Win32.Build.0 = Win10 Debug|Win32
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Debug|Win32.Deploy.0 = Win10 Debug|Win32
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Debug|x64.ActiveCfg = Win10 Debug|x64
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Debug|x64.Build.0 = Win10 Debug|x64
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Debug|x64.Deploy.0 = Win10 Debug|x64
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Release|Arm.ActiveCfg = Win10 Release|Arm
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Release|Arm.Build.0 = Win10 Release|Arm
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Release|Arm.Deploy.0 = Win10 Release|Arm
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Release|Win32.ActiveCfg = Win10 Release|Win32
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Release|Win32.Build.0 = Win10 Release|Win32
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Release|Win32.Deploy.0 = Win10 Release|Win32
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Release|x64.ActiveCfg = Win10 Release|x64
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Release|x64.Build.0 = Win10 Release|x64
-		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Win10 Release|x64.Deploy.0 = Win10 Release|x64
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Debug|Arm.ActiveCfg = Win10 Debug|Arm
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Debug|Arm.Build.0 = Win10 Debug|Arm
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Debug|Arm.Deploy.0 = Win10 Debug|Arm
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Debug|Win32.ActiveCfg = Win10 Debug|Win32
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Debug|Win32.Build.0 = Win10 Debug|Win32
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Debug|Win32.Deploy.0 = Win10 Debug|Win32
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Debug|x64.ActiveCfg = Win10 Debug|x64
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Debug|x64.Build.0 = Win10 Debug|x64
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Debug|x64.Deploy.0 = Win10 Debug|x64
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Release|Arm.ActiveCfg = Win10 Release|Arm
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Release|Arm.Build.0 = Win10 Release|Arm
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Release|Arm.Deploy.0 = Win10 Release|Arm
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Release|Win32.ActiveCfg = Win10 Release|Win32
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Release|Win32.Build.0 = Win10 Release|Win32
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Release|Win32.Deploy.0 = Win10 Release|Win32
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Release|x64.ActiveCfg = Win10 Release|x64
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Release|x64.Build.0 = Win10 Release|x64
-		{956B060D-1055-4584-9CF4-9FE14C428545}.Win10 Release|x64.Deploy.0 = Win10 Release|x64
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Debug|Arm.ActiveCfg = Win10 Debug|Arm
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Debug|Arm.Build.0 = Win10 Debug|Arm
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Debug|Arm.Deploy.0 = Win10 Debug|Arm
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Debug|Win32.ActiveCfg = Win10 Debug|Win32
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Debug|Win32.Build.0 = Win10 Debug|Win32
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Debug|Win32.Deploy.0 = Win10 Debug|Win32
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Debug|x64.ActiveCfg = Win10 Debug|x64
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Debug|x64.Build.0 = Win10 Debug|x64
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Debug|x64.Deploy.0 = Win10 Debug|x64
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Release|Arm.ActiveCfg = Win10 Release|Arm
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Release|Arm.Build.0 = Win10 Release|Arm
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Release|Arm.Deploy.0 = Win10 Release|Arm
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Release|Win32.ActiveCfg = Win10 Release|Win32
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Release|Win32.Build.0 = Win10 Release|Win32
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Release|Win32.Deploy.0 = Win10 Release|Win32
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Release|x64.ActiveCfg = Win10 Release|x64
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Release|x64.Build.0 = Win10 Release|x64
-		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Win10 Release|x64.Deploy.0 = Win10 Release|x64
+		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Debug|x64.ActiveCfg = Debug|x64
+		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Debug|x64.Build.0 = Debug|x64
+		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Debug|x64.Deploy.0 = Debug|x64
+		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Release|x64.ActiveCfg = Release|x64
+		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Release|x64.Build.0 = Release|x64
+		{105EA485-B9B6-48AE-B8B0-96BBEA575973}.Release|x64.Deploy.0 = Release|x64
+		{956B060D-1055-4584-9CF4-9FE14C428545}.Debug|x64.ActiveCfg = Debug|x64
+		{956B060D-1055-4584-9CF4-9FE14C428545}.Debug|x64.Build.0 = Debug|x64
+		{956B060D-1055-4584-9CF4-9FE14C428545}.Debug|x64.Deploy.0 = Debug|x64
+		{956B060D-1055-4584-9CF4-9FE14C428545}.Release|x64.ActiveCfg = Release|x64
+		{956B060D-1055-4584-9CF4-9FE14C428545}.Release|x64.Build.0 = Release|x64
+		{956B060D-1055-4584-9CF4-9FE14C428545}.Release|x64.Deploy.0 = Release|x64
+		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Debug|x64.ActiveCfg = Debug|x64
+		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Debug|x64.Build.0 = Debug|x64
+		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Debug|x64.Deploy.0 = Debug|x64
+		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Release|x64.ActiveCfg = Release|x64
+		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Release|x64.Build.0 = Release|x64
+		{C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Release|x64.Deploy.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/network/wlan/ihvsampleui/IHVSampleUI.vcxproj b/network/wlan/ihvsampleui/IHVSampleUI.vcxproj
index 36ff1126..09f3dad7 100644
--- a/network/wlan/ihvsampleui/IHVSampleUI.vcxproj
+++ b/network/wlan/ihvsampleui/IHVSampleUI.vcxproj
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
@@ -22,7 +14,7 @@
     <ProjectGuid>{1EE6DF41-8C0B-4C74-98D2-FCDF020E7128}</ProjectGuid>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
+    <Platform Condition="'$(Platform)' == ''">x64</Platform>
     <SampleGuid>{C7745B6F-E931-4E1C-A12B-5BF1C854C635}</SampleGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -42,22 +34,6 @@
     <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <PropertyGroup>
     <OutDir>$(IntDir)</OutDir>
@@ -68,12 +44,6 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
   <ItemGroup Label="WrappedTaskItems" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>IHVSampleUI</TargetName>
@@ -81,12 +51,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>IHVSampleUI</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>IHVSampleUI</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>IHVSampleUI</TargetName>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;WIN32</PreprocessorDefinitions>
@@ -98,8 +62,7 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;WIN32</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
+      <EntryPointSymbol>_DllMainCRTStartup</EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -113,38 +76,7 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;WIN32</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;WIN32</PreprocessorDefinitions>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;WIN32</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;WIN32</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;WIN32</PreprocessorDefinitions>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;WIN32</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;WIN32</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
+      <EntryPointSymbol>_DllMainCRTStartup</EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -187,46 +119,6 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
     </Midl>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions)  /EHa</AdditionalOptions>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);ole32.lib;oleaut32.lib;user32.lib;uuid.lib;Kernel32.lib;Advapi32.lib;comctl32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>IHVSampleUI.def</ModuleDefinitionFile>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions)  /EHa</AdditionalOptions>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);ole32.lib;oleaut32.lib;user32.lib;uuid.lib;Kernel32.lib;Advapi32.lib;comctl32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>IHVSampleUI.def</ModuleDefinitionFile>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
-    </Midl>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="IHVClassFactory.cpp" />
     <ClCompile Include="IHVRegistryHelper.cpp" />
author	Adonais Romero González <[email protected]>	2024-05-06 16:21:31 -0700
committer	GitHub <[email protected]>	2024-05-06 16:21:31 -0700
commit	a74a241c664c4e1d7c0838287b34076c19d9858a (patch)
tree	6ff7562612967b122acf8acf8a69c4dcfd5905db /network/wlan
parent	def8e8e34ed2b7b1deb2fc9112ac4255f1a0f2ba (diff)
parent	15477ce52bbb6b42ca591ecdfb484cac089f89ab (diff)