Code clean-up

Removed redundant headers
Removed obsolete types
2025-08-10 00:52:17 +00:00 · 2020-05-14 16:44:37 +02:00 · 2020-05-14 16:43:41 +02:00 · 2020-05-14 16:41:08 +02:00 · 2020-05-14 15:03:59 +02:00 · 2020-05-14 14:09:46 +02:00
50 changed files with 5200 additions and 6933 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+patreon: nefarius
+custom: ["https://paypal.me/NefariusMaximus"]
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ mono_crash.*
 [Rr]eleases/
 x64/
 x86/
+[Ww][Ii][Nn]32/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
 bld/
@@ -61,6 +62,9 @@ project.lock.json
 project.fragment.lock.json
 artifacts/

+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
 # StyleCop
 StyleCopReport.xml

@@ -350,4 +354,7 @@ healthchecksdb
 MigrationBackup/

 # Ionide (cross platform F# VS Code tools) working folder
-.ionide/
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
--- a/.nuke
+++ b/.nuke
@@ -1 +0,0 @@
-ViGEmBus.sln
--- a/README.md
+++ b/README.md
@@ -2,12 +2,19 @@

 Windows kernel-mode driver emulating well-known USB game controllers.

-[![Build status](https://ci.appveyor.com/api/projects/status/rv74ufluwib52dq2?svg=true)](https://ci.appveyor.com/project/nefarius/vigembus) [![Discord](https://img.shields.io/discord/346756263763378176.svg)](https://discord.vigem.org) [![Website](https://img.shields.io/website-up-down-green-red/https/vigem.org.svg?label=ViGEm.org)](https://vigem.org/) [![PayPal Donate](https://img.shields.io/badge/paypal-donate-blue.svg)](<https://paypal.me/NefariusMaximus>) [![Support on Patreon](https://img.shields.io/badge/patreon-donate-orange.svg)](<https://www.patreon.com/nefarius>) [![GitHub followers](https://img.shields.io/github/followers/nefarius.svg?style=social&label=Follow)](https://github.com/nefarius) [![Twitter Follow](https://img.shields.io/twitter/follow/nefariusmaximus.svg?style=social&label=Follow)](https://twitter.com/nefariusmaximus)
+[![Build status](https://ci.appveyor.com/api/projects/status/rv74ufluwib52dq2?svg=true)](https://ci.appveyor.com/project/nefarius/vigembus) [![Discord](https://img.shields.io/discord/346756263763378176.svg)](https://discord.vigem.org) [![Website](https://img.shields.io/website-up-down-green-red/https/vigem.org.svg?label=ViGEm.org)](https://vigem.org/) [![GitHub followers](https://img.shields.io/github/followers/nefarius.svg?style=social&label=Follow)](https://github.com/nefarius) [![Twitter Follow](https://img.shields.io/twitter/follow/nefariusmaximus.svg?style=social&label=Follow)](https://twitter.com/nefariusmaximus)
+
+<sub>(This project is available under a free and permissive license, but needs financial support to sustain its continued improvements. In addition to maintenance and stability there are many desirable features yet to be added. If your company is using components of ViGEm, please consider reaching out.)</sub>
+
+Businesses: support continued development via invoiced technical support, maintenance, sponsoring contracts:
+<br>&nbsp;&nbsp;_E-mail: vigem @ nefarius dot at_
+
+Individuals: support continued maintenance and development via [PayPal](https://paypal.me/NefariusMaximus) donations.
+
+----

 ## About

-**Disclaimer:** this project is for software developers. To make it do something useful you'll also need a [feeder application](<https://docs.vigem.org/#!vigem-feeder.md>).  
-
 The `ViGEmBus` driver and `ViGEmClient` libraries represent the core of the Virtual Gamepad Emulation Framework (or `ViGEm` , for short). `ViGEm` aims for a 100% accurate [emulation](<https://en.wikipedia.org/wiki/Emulator>) of well-known gaming peripherals as pure software-based devices at kernel level. As it mimics "the real thing" games and other processes require no additional modification whatsoever to detect `ViGEm`-based devices (no Proxy-DLLs or API-Hooking) and simply work out of the box. While the (now obsolete) [Scarlett.Crush Productions Virtual Bus Driver](<https://github.com/nefarius/ScpVBus>) is the spiritual father of this project, `ViGEm` has been designed and written from the ground up utilizing Microsoft's [Kernel-Mode Driver Framework](https://en.wikipedia.org/wiki/Kernel-Mode_Driver_Framework).

 ### Emulated devices
@@ -34,17 +41,9 @@ The driver is built for Windows 7/8.1/10 (x86 and amd64).

 ## How to build

-### Prerequisites
+[Install Visual Studio 2019 and WDK for Windows 10, version 1903](https://docs.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk#wdk-for-windows-10-version-1903).

- Visual Studio **2017** ([Community Edition](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) is just fine)
- [WDK for Windows 10, version 1803](https://developer.microsoft.com/en-us/windows/hardware/windows-driver-kit)
- [.NET Core SDK 2.1](https://www.microsoft.com/net/download/dotnet-core/2.1) (or greater, required for building only)
-
-You can either build directly within Visual Studio or in PowerShell by running the build script:
-
-```PowerShell
-.\build.ps1 -configuration release
-```
+You can build directly within Visual Studio.

 Do bear in mind that you'll need to **sign** the driver to use it without [test mode](<https://technet.microsoft.com/en-us/ff553484(v=vs.96)>).

@@ -54,7 +53,7 @@ Do bear in mind that you'll need to **sign** the driver to use it without [test

 Found a bug and want it fixed? Open a detailed issue on the [GitHub issue tracker](../../issues)!

-Have an idea for a new feature? [Check out the project board](https://projects.vigem.org/public/board/27281599595f5fbe5f915884fb9ca2de92726e74173f1ac434300b2d40af), maybe it's already on there! If not, let's have a chat about your request on [Discord](https://discord.vigem.org) or the [community forums](https://forums.vigem.org).
+Have an idea for a new feature? Let's have a chat about your request on [Discord](https://discord.vigem.org) or the [community forums](https://forums.vigem.org).

 ### Questions & Support

@@ -77,7 +76,9 @@ Sponsors listed here have helped the project flourish by either financial suppor

 ## Known users of ViGEm

-A brief listing of projects/companies/vendors known to build upon the powers of ViGEm. This list is non-exhaustive, if you'd like to see your project included, contact us!
+A brief listing of projects/companies/vendors known to build upon the powers of ViGEm.
+
+This list is non-exhaustive, if you'd like to see your project included, contact us!

 - [3dRudder](https://www.3drudder.com/)
 - [Parsec](https://parsecgaming.com/)
@@ -91,3 +92,8 @@ A brief listing of projects/companies/vendors known to build upon the powers of
 - [HP](https://www8.hp.com/us/en/campaigns/gamingpcs/overview.html)
 - [DS4Windows](https://ryochan7.github.io/ds4windows-site/)
 - [XOutput](https://github.com/csutorasa/XOutput)
+- [RdpGamepad](https://github.com/microsoft/RdpGamepad)
+
+## License
+
+The `ViGEm` Bus Driver is licensed under the MIT License, see [LICENSE](./LICENSE.md) for more information.
--- a/ViGEmBus.sln
+++ b/ViGEmBus.sln
@@ -1,12 +1,10 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2024
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ViGEmBus", "sys\ViGEmBus.vcxproj", "{040101B0-EE5C-4EF1-99EE-9F81C795C001}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{E1E264A8-6100-429F-BA23-F00FFF7D126B}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -27,10 +25,6 @@ Global
 		{040101B0-EE5C-4EF1-99EE-9F81C795C001}.Release|x86.ActiveCfg = Release|Win32
 		{040101B0-EE5C-4EF1-99EE-9F81C795C001}.Release|x86.Build.0 = Release|Win32
 		{040101B0-EE5C-4EF1-99EE-9F81C795C001}.Release|x86.Deploy.0 = Release|Win32
-		{E1E264A8-6100-429F-BA23-F00FFF7D126B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E1E264A8-6100-429F-BA23-F00FFF7D126B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E1E264A8-6100-429F-BA23-F00FFF7D126B}.Release|x64.ActiveCfg = Release|Any CPU
-		{E1E264A8-6100-429F-BA23-F00FFF7D126B}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,21 +1,25 @@
-version: 1.16.{build}.0
-image: Visual Studio 2017
+version: 1.17.{build}.0
+image: Visual Studio 2019
+platform:
+- x86
+- x64
+configuration:
+- Release
 install:
 - cmd: git submodule -q update --init
-build_script:
- ps: .\build.ps1 -configuration release
+before_build:
+- ps: Invoke-WebRequest "https://downloads.vigem.org/other/nefarius/vpatch/vpatch.exe" -OutFile vpatch.exe
+- cmd: vpatch.exe --stamp-version "%APPVEYOR_BUILD_VERSION%" --target-file ".\sys\ViGEmBus.vcxproj" --vcxproj.inf-time-stamp
+- cmd: vpatch.exe --stamp-version "%APPVEYOR_BUILD_VERSION%" --target-file ".\sys\ViGEmBus.rc" --resource.file-version --resource.product-version
+build:
+  project: $(APPVEYOR_BUILD_FOLDER)\$(APPVEYOR_PROJECT_NAME).sln
 after_build:
- ps: |
-    Invoke-WebRequest "https://downloads.vigem.org/other/pavel-a/ddverpatch/verpatch-1.0.15.1-x86-codeplex.zip" -OutFile verpatch-1.0.15.1-x86-codeplex.zip
-    Expand-Archive verpatch-1.0.15.1-x86-codeplex.zip -DestinationPath .
-    .\verpatch.exe .\artifacts\x64\ViGEmBus.sys "$env:APPVEYOR_BUILD_VERSION"
-    .\verpatch.exe .\artifacts\x64\ViGEmBus.sys /pv "$env:APPVEYOR_BUILD_VERSION"
-    .\verpatch.exe .\artifacts\x86\ViGEmBus.sys "$env:APPVEYOR_BUILD_VERSION"
-    .\verpatch.exe .\artifacts\x86\ViGEmBus.sys /pv "$env:APPVEYOR_BUILD_VERSION"
-    makecab.exe /f ViGEmBus.ddf
+#- cmd: makecab.exe /f ViGEmBus.ddf
 artifacts:
- path: disk1\ViGEmBus.cab
-  name: ViGEmBus_unsigned_x86_amd64
+- path: 'bin**\$(APPVEYOR_PROJECT_NAME)\*.inf'
+- path: 'bin**\$(APPVEYOR_PROJECT_NAME)\*.sys'
+- path: 'bin**\$(APPVEYOR_PROJECT_NAME)\*.dll'
+- path: 'bin**\*.pdb'
 deploy:
 - provider: Environment
  name: BUILDBOT
--- a/build.ps1
+++ b/build.ps1
@@ -1,65 +0,0 @@
-[CmdletBinding()]
-Param(
-    #[switch]$CustomParam,
-    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
-    [string[]]$BuildArguments
-)
-
-Write-Output "Windows PowerShell $($Host.Version)"
-
-Set-StrictMode -Version 2.0; $ErrorActionPreference = "Stop"; $ConfirmPreference = "None"; trap { $host.SetShouldExit(1) }
-$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
-
-###########################################################################
-# CONFIGURATION
-###########################################################################
-
-$BuildProjectFile = "$PSScriptRoot\build\_build.csproj"
-$TempDirectory = "$PSScriptRoot\\.tmp"
-
-$DotNetGlobalFile = "$PSScriptRoot\\global.json"
-$DotNetInstallUrl = "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1"
-$DotNetReleasesUrl = "https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json"
-
-$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
-$env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
-$env:NUGET_XMLDOC_MODE = "skip"
-
-###########################################################################
-# EXECUTION
-###########################################################################
-
-function ExecSafe([scriptblock] $cmd) {
-    & $cmd
-    if ($LASTEXITCODE) { exit $LASTEXITCODE }
-}
-
-# If global.json exists, load expected version
-if (Test-Path $DotNetGlobalFile) {
-    $DotNetVersion = $(Get-Content $DotNetGlobalFile | Out-String | ConvertFrom-Json).sdk.version
-}
-
-# If dotnet is installed locally, and expected version is not set or installation matches the expected version
-if ((Get-Command "dotnet" -ErrorAction SilentlyContinue) -ne $null -and `
-     (!(Test-Path variable:DotNetVersion) -or $(& dotnet --version) -eq $DotNetVersion)) {
-    $env:DOTNET_EXE = (Get-Command "dotnet").Path
-}
-else {
-    $DotNetDirectory = "$TempDirectory\dotnet-win"
-    $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
-
-    # If expected version is not set, get latest version
-    if (!(Test-Path variable:DotNetVersion)) {
-        $DotNetVersion = $(Invoke-WebRequest -UseBasicParsing $DotNetReleasesUrl | ConvertFrom-Json)[0]."version-sdk"
-    }
-
-    # Download and execute install script
-    $DotNetInstallFile = "$TempDirectory\dotnet-install.ps1"
-    md -force $TempDirectory > $null
-    (New-Object System.Net.WebClient).DownloadFile($DotNetInstallUrl, $DotNetInstallFile)
-    ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
-}
-
-Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)"
-
-ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile -- $BuildArguments }
--- a/build.sh
+++ b/build.sh
@@ -1,68 +0,0 @@
-#!/usr/bin/env bash
-
-echo $(bash --version 2>&1 | head -n 1)
-
-#CUSTOMPARAM=0
-BUILD_ARGUMENTS=()
-for i in "$@"; do
-    case $(echo $1 | awk '{print tolower($0)}') in
-        # -custom-param) CUSTOMPARAM=1;;
-        *) BUILD_ARGUMENTS+=("$1") ;;
-    esac
-    shift
-done
-
-set -eo pipefail
-SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
-
-###########################################################################
-# CONFIGURATION
-###########################################################################
-
-BUILD_PROJECT_FILE="$SCRIPT_DIR/build/_build.csproj"
-TEMP_DIRECTORY="$SCRIPT_DIR//.tmp"
-
-DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
-DOTNET_INSTALL_URL="https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh"
-DOTNET_RELEASES_URL="https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json"
-
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-export NUGET_XMLDOC_MODE="skip"
-
-###########################################################################
-# EXECUTION
-###########################################################################
-
-function FirstJsonValue {
-    perl -nle 'print $1 if m{"'$1'": "([^"\-]+)",?}' <<< ${@:2}
-}
-
-# If global.json exists, load expected version
-if [ -f "$DOTNET_GLOBAL_FILE" ]; then
-    DOTNET_VERSION=$(FirstJsonValue "version" $(cat "$DOTNET_GLOBAL_FILE"))
-fi
-
-# If dotnet is installed locally, and expected version is not set or installation matches the expected version
-if [[ -x "$(command -v dotnet)" && (-z ${DOTNET_VERSION+x} || $(dotnet --version) == "$DOTNET_VERSION") ]]; then
-    export DOTNET_EXE="$(command -v dotnet)"
-else
-    DOTNET_DIRECTORY="$TEMP_DIRECTORY/dotnet-unix"
-    export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
-    
-    # If expected version is not set, get latest version
-    if [ -z ${DOTNET_VERSION+x} ]; then
-        DOTNET_VERSION=$(FirstJsonValue "version-sdk" $(curl -s "$DOTNET_RELEASES_URL"))
-    fi
-    
-    # Download and execute install script
-    DOTNET_INSTALL_FILE="$TEMP_DIRECTORY/dotnet-install.sh"
-    mkdir -p "$TEMP_DIRECTORY"
-    curl -Lsfo "$DOTNET_INSTALL_FILE" "$DOTNET_INSTALL_URL"
-    chmod +x "$DOTNET_INSTALL_FILE"
-    "$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "$DOTNET_VERSION" --no-path
-fi
-
-echo "Microsoft (R) .NET Core SDK version $("$DOTNET_EXE" --version)"
-
-"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" -- ${BUILD_ARGUMENTS[@]}
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -1,111 +0,0 @@
-using System;
-using System.IO;
-using Nuke.Common;
-using Nuke.Common.BuildServers;
-using Nuke.Common.Git;
-using Nuke.Common.ProjectModel;
-using Nuke.Common.Tools.GitVersion;
-using Nuke.Common.Tools.MSBuild;
-using Vestris.ResourceLib;
-using static Nuke.Common.EnvironmentInfo;
-using static Nuke.Common.IO.FileSystemTasks;
-using static Nuke.Common.IO.PathConstruction;
-using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
-
-internal class Build : NukeBuild
-{
-    [GitRepository] private readonly GitRepository GitRepository;
-    [GitVersion] private readonly GitVersion GitVersion;
-
-    [Solution("ViGEmBus.sln")] private readonly Solution Solution;
-
-    private AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";
-
-    private Target Clean => _ => _
-        .Executes(() => { EnsureCleanDirectory(ArtifactsDirectory); });
-
-    private Target Restore => _ => _
-        .DependsOn(Clean)
-        .Executes(() =>
-        {
-            MSBuild(s => s
-                .SetTargetPath(Solution)
-                .SetTargets("Restore"));
-        });
-
-    private Target Compile => _ => _
-        .DependsOn(Restore)
-        .Executes(() =>
-        {
-            MSBuild(s => s
-                .SetTargetPath(Solution)
-                .SetTargets("Rebuild")
-                .SetConfiguration(Configuration)
-                .SetMaxCpuCount(Environment.ProcessorCount)
-                .SetNodeReuse(IsLocalBuild)
-                .SetTargetPlatform(MSBuildTargetPlatform.x64));
-
-            MSBuild(s => s
-                .SetTargetPath(Solution)
-                .SetTargets("Rebuild")
-                .SetConfiguration(Configuration)
-                .SetMaxCpuCount(Environment.ProcessorCount)
-                .SetNodeReuse(IsLocalBuild)
-                .SetTargetPlatform(MSBuildTargetPlatform.x86));
-
-            #region Ugly hack, fix me!
-
-            EnsureExistingDirectory(Path.Combine(ArtifactsDirectory, @"x64"));
-            EnsureExistingDirectory(Path.Combine(ArtifactsDirectory, @"x86"));
-
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x64\ViGEmBus.inf"),
-                Path.Combine(ArtifactsDirectory, @"ViGEmBus.inf")
-            );
-
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x64\ViGEmBus.pdb"),
-                Path.Combine(ArtifactsDirectory, @"x64\ViGEmBus.pdb")
-            );
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x64\ViGEmBus\ViGEmBus.sys"),
-                Path.Combine(ArtifactsDirectory, @"x64\ViGEmBus.sys")
-            );
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x64\ViGEmBus\WdfCoinstaller01009.dll"),
-                Path.Combine(ArtifactsDirectory, @"x64\WdfCoinstaller01009.dll")
-            );
-
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x86\ViGEmBus.pdb"),
-                Path.Combine(ArtifactsDirectory, @"x86\ViGEmBus.pdb")
-            );
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x86\ViGEmBus\ViGEmBus.sys"),
-                Path.Combine(ArtifactsDirectory, @"x86\ViGEmBus.sys")
-            );
-            File.Copy(
-                Path.Combine(WorkingDirectory, @"bin\x86\ViGEmBus\WdfCoinstaller01009.dll"),
-                Path.Combine(ArtifactsDirectory, @"x86\WdfCoinstaller01009.dll")
-            );
-
-            #endregion
-        });
-
-    private Target Pack => _ => _
-        .DependsOn(Compile)
-        .Executes(() =>
-        {
-            MSBuild(s => s
-                .SetTargetPath(Solution)
-                .SetTargets("Restore", "Pack")
-                .SetPackageOutputPath(ArtifactsDirectory)
-                .SetConfiguration(Configuration)
-                .EnableIncludeSymbols());
-        });
-
-    public static int Main()
-    {
-        return Execute<Build>(x => x.Compile);
-    }
-}
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -1,38 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <RootNamespace></RootNamespace>
-    <IsPackable>False</IsPackable>
-    <NoWarn>CS0649;CS0169</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="0.9.1" />
-    <PackageReference Include="GitVersion.CommandLine" Version="3.6.5" />
-    <PackageReference Include="Vestris.ResourceLib" Version="2.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <NukeMetadata Include="**\*.json" Exclude="bin\**;obj\**" />
-    <NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
-    <None Remove="*.csproj.DotSettings;*.ref.*.txt" />
-    <None Remove="default.json" />
-    <NukeMetadata Remove="default.json" />
-    <EmbeddedResource Include="default.json" />
-    
-    <!-- Common build related files -->
-    <None Include="..\build.ps1" />
-    <None Include="..\build.sh" />
-    <None Include="..\.nuke" />     
-    <None Include="..\global.json" Condition="Exists('..\global.json')" />
-    <None Include="..\nuget.config" Condition="Exists('..\nuget.config')" />
-    <None Include="..\Jenkinsfile" Condition="Exists('..\Jenkinsfile')" />
-    <None Include="..\appveyor.yml" Condition="Exists('..\appveyor.yml')" />
-    <None Include="..\.travis.yml" Condition="Exists('..\.travis.yml')" />
-    <None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
-  </ItemGroup>
-
-</Project>
--- a/build/default.json
+++ b/build/default.json
@@ -1,10 +0,0 @@
-{
-  "Version": {
-    "CompanyName": "Benjamin Hoeglinger-Stelzer",
-    "FileDescription": "Virtual Gamepad Emulation Framework Bus Driver",
-    "InternalName": "ViGEmBus.sys",
-    "LegalCopyright": "Copyright (C) 2016-2018 Benjamin Hoeglinger-Stelzer All Rights Reserved",
-    "OriginalFilename": "ViGEmBus.sys",
-    "ProductName": "Virtual Gamepad Emulation Framework Bus Driver"
-  }
-}
--- a/2
+++ b/2
--- a/include/ViGEmBusDriver.h
+++ b/include/ViGEmBusDriver.h
@@ -3,7 +3,7 @@
 * 
 * MIT License
 * 
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
+* Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
 * 
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -36,52 +36,3 @@ DEFINE_GUID(GUID_DEVCLASS_VIGEM_RAWPDO,

 #pragma once

-
-//
-// Describes the current stage a PDO completed
-// 
-typedef enum _VIGEM_PDO_STAGE
-{
-    ViGEmPdoCreate,
-    ViGEmPdoPrepareHardware,
-    ViGEmPdoInitFinished
-
-} VIGEM_PDO_STAGE, *PVIGEM_PDO_STAGE;
-
-//
-// PDO stage result callback definition
-// 
-typedef
-VOID
-(*PVIGEM_BUS_PDO_STAGE_RESULT)(
-    _In_ PINTERFACE InterfaceHeader,
-    _In_ VIGEM_PDO_STAGE Stage,
-    _In_ ULONG Serial,
-    _In_ NTSTATUS Status
-    );
-
-typedef struct _VIGEM_BUS_INTERFACE {
-    // 
-    // Standard interface header, must be present
-    // 
-    INTERFACE InterfaceHeader;
-
-    //
-    // PDO stage result callback
-    // 
-    PVIGEM_BUS_PDO_STAGE_RESULT BusPdoStageResult;
-
-} VIGEM_BUS_INTERFACE, *PVIGEM_BUS_INTERFACE;
-
-#define VIGEM_BUS_INTERFACE_VERSION      1
-
-VOID FORCEINLINE BUS_PDO_REPORT_STAGE_RESULT(
-    VIGEM_BUS_INTERFACE Interface, 
-    VIGEM_PDO_STAGE Stage,
-    ULONG Serial,
-    NTSTATUS Status
-)
-{
-    (*Interface.BusPdoStageResult)(&Interface.InterfaceHeader, Stage, Serial, Status);
-}
-
--- a/sys/ByteArray.c
+++ b/sys/ByteArray.c
@@ -1,218 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#include "ByteArray.h"
-#include "trace.h"
-#include "bytearray.tmh"
-
-//
-// Helpers
-//
-
-ULONG_PTR align_to_page_size(ULONG_PTR val)
-{
-    return (val + (PAGE_SIZE - 1)) & -PAGE_SIZE;
-}
-
-
-//
-// Forward declarations
-//
-
-NTSTATUS IncreaseCapacityByteArray(IN PBYTE_ARRAY Array, IN ULONG NumElements);
-
-
-//
-// Implementation
-//
-
-NTSTATUS InitByteArray(IN OUT PBYTE_ARRAY Array)
-{
-    //
-    // Initialize size and default capacity
-    Array->Size = 0;
-    Array->Capacity = INITIAL_ARRAY_CAPACITY;
-
-    //
-    // Allocate memory
-    Array->Data = (UCHAR*)ExAllocatePoolWithTag(PagedPool, Array->Capacity, ARRAY_POOL_TAG);
-    if (Array->Data == NULL)
-        return STATUS_INSUFFICIENT_RESOURCES;
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS AppendElementByteArray(IN PBYTE_ARRAY Array, IN PVOID Element)
-{
-    //
-    // Make sure there is room to expand into
-    if (((Array->Size + 1) * sizeof(UCHAR)) > Array->Capacity)
-    {
-        //
-        // Increase capacity
-        NTSTATUS status = IncreaseCapacityByteArray(Array, sizeof(UCHAR));
-        if (!NT_SUCCESS(status))
-            return status;
-    }
-
-    //
-    // Append the element and increment the size
-    RtlCopyMemory(Array->Data + (Array->Size * sizeof(UCHAR)), Element, sizeof(UCHAR));
-
-    //
-    // Increment size
-    Array->Size += 1;
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS AppendElementsByteArray(IN PBYTE_ARRAY Array, IN PVOID Elements, IN ULONG NumElements)
-{
-    //
-    // Make sure there is room to expand into
-    if ((Array->Size + NumElements) * sizeof(UCHAR) > Array->Capacity)
-    {
-        //
-        // Increase capacity
-        NTSTATUS status = IncreaseCapacityByteArray(Array, NumElements);
-        if (!NT_SUCCESS(status))
-            return status;
-    }
-
-    //
-    // Append the elements and increase the size
-    RtlCopyMemory(Array->Data + (Array->Size * sizeof(UCHAR)), Elements, NumElements * sizeof(UCHAR));
-
-    //
-    // Increase size
-    Array->Size += NumElements;
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS IncreaseCapacityByteArray(IN PBYTE_ARRAY Array, IN ULONG NumElements)
-{
-    UCHAR* NewData = NULL;
-
-    //
-    // Align new size to the immediate next page boundary
-    Array->Capacity = align_to_page_size((Array->Size + NumElements) * sizeof(UCHAR));
-
-    //
-    // Allocate new data with new capacity
-    NewData = (UCHAR*)ExAllocatePoolWithTag(PagedPool, Array->Capacity, ARRAY_POOL_TAG);
-    if (NewData == NULL)
-        return STATUS_INSUFFICIENT_RESOURCES;
-
-    //
-    // Copy old data over
-    RtlCopyMemory(NewData, Array->Data, Array->Size * sizeof(UCHAR));
-
-    //
-    // Free old data
-    ExFreePoolWithTag(Array->Data, ARRAY_POOL_TAG);
-
-    //
-    // Set data pointer to new allocation
-    Array->Data = NewData;
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS GetElementByteArray(IN PBYTE_ARRAY Array, IN ULONG Index, OUT PVOID Element)
-{
-    //
-    // Check array bounds
-    if (Index >= Array->Size || (LONG)Index < 0)
-        return STATUS_ARRAY_BOUNDS_EXCEEDED;
-
-    //
-    // Copy data over
-    RtlCopyMemory(Element, Array->Data + (Index * sizeof(UCHAR)), sizeof(UCHAR));
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS GetElementsByteArray(IN PBYTE_ARRAY Array, IN ULONG Index, OUT PVOID Elements, IN ULONG NumElements)
-{
-    //
-    // Check array bounds
-    if (Index >= Array->Size || (LONG)Index < 0)
-        return STATUS_ARRAY_BOUNDS_EXCEEDED;
-
-    //
-    // Copy data over
-    RtlCopyMemory(Elements, Array->Data + (Index * sizeof(UCHAR)), NumElements * sizeof(UCHAR));
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS SetElementByteArray(IN PBYTE_ARRAY Array, IN ULONG Index, IN PVOID Element)
-{
-    //
-    // Check array bounds
-    if (Index >= Array->Size || (LONG)Index < 0)
-        return STATUS_ARRAY_BOUNDS_EXCEEDED;
-
-    //
-    // Copy data over
-    RtlCopyMemory(Array->Data + (Index * sizeof(UCHAR)), Element, sizeof(UCHAR));
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS SetElementsByteArray(IN PBYTE_ARRAY Array, IN ULONG Index, IN PVOID Elements, IN ULONG NumElements)
-{
-    //
-    // Check array bounds
-    if (Index >= Array->Size || (LONG)Index < 0)
-        return STATUS_ARRAY_BOUNDS_EXCEEDED;
-
-    //
-    // Copy data over
-    RtlCopyMemory(Array->Data + (Index * sizeof(UCHAR)), Elements, NumElements * sizeof(UCHAR));
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS FreeByteArray(IN PBYTE_ARRAY Array)
-{
-    if (Array->Data == NULL)
-        return STATUS_MEMORY_NOT_ALLOCATED;
-
-    //
-    // Free data
-    ExFreePoolWithTag(Array->Data, ARRAY_POOL_TAG);
-
-    //
-    // Null out everything
-    Array->Data = NULL;
-    Array->Size = 0;
-    Array->Capacity = 0;
-
-    return STATUS_SUCCESS;
-}
--- a/sys/ByteArray.h
+++ b/sys/ByteArray.h
@@ -1,56 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#pragma once
-
-#include <ntifs.h>
-
-#define INITIAL_ARRAY_CAPACITY PAGE_SIZE
-#define ARRAY_POOL_TAG    'arrA'
-
-typedef struct _BYTE_ARRAY
-{
-    UCHAR* Data;        //> array of data we're storing
-    ULONG_PTR Size;        //> slots used so far
-    ULONG_PTR Capacity;    //> total available memory
-} BYTE_ARRAY, *PBYTE_ARRAY;
-
-NTSTATUS InitByteArray(IN OUT PBYTE_ARRAY Array);
-
-NTSTATUS AppendElementByteArray(IN PBYTE_ARRAY Array, IN PVOID Element);
-
-NTSTATUS AppendElementsByteArray(IN PBYTE_ARRAY Array, IN PVOID Elements, IN ULONG NumElements);
-
-NTSTATUS GetElementByteArray(IN PBYTE_ARRAY Array, IN ULONG Index, OUT PVOID Element);
-
-NTSTATUS GetElementsByteArray(IN PBYTE_ARRAY Array, IN ULONG Index, OUT PVOID Elements, IN ULONG NumElements);
-
-NTSTATUS SetElementByteArray(IN PBYTE_ARRAY Array, IN ULONG Index, IN PVOID Element);
-
-NTSTATUS SetElementsByteArray(IN PBYTE_ARRAY Array, IN ULONG Index, IN PVOID Elements, IN ULONG NumElements);
-
-NTSTATUS FreeByteArray(IN PBYTE_ARRAY Array);
--- a/sys/CRTCPP.hpp
+++ b/sys/CRTCPP.hpp
@@ -0,0 +1,157 @@
+/*
+* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
+*
+* MIT License
+*
+* Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
+
+#pragma once
+
+constexpr auto cpp_pool_tag = 'EGiV';
+
+#ifdef _AMD64_
+
+void* operator new
+(
+    size_t size
+    )
+{
+    return ExAllocatePoolWithTag(NonPagedPoolNx, size, cpp_pool_tag);
+}
+
+void* operator new[]
+(
+    size_t size
+    )
+{
+    return ExAllocatePoolWithTag(NonPagedPoolNx, size, cpp_pool_tag);
+}
+
+void operator delete
+(
+    void* what
+    )
+{
+    if (what == nullptr)
+    {
+        return;
+    }
+	
+    ExFreePoolWithTag(what, cpp_pool_tag);
+}
+
+void operator delete
+(
+    void* what,
+    size_t size
+    )
+{
+    UNREFERENCED_PARAMETER(size);
+	
+    if (what == nullptr)
+    {
+        return;
+    }
+
+    ExFreePoolWithTag(what, cpp_pool_tag);
+}
+
+void operator delete[]
+(
+    void* what,
+    size_t size
+    )
+{
+    UNREFERENCED_PARAMETER(size);
+	
+    if (what == nullptr)
+    {
+        return;
+    }
+	
+    ExFreePoolWithTag(what, cpp_pool_tag);
+}
+
+#else
+
+void* __CRTDECL operator new
+(
+    size_t size
+    )
+{
+    return ExAllocatePoolWithTag(NonPagedPoolNx, size, cpp_pool_tag);
+}
+
+void* __CRTDECL operator new[]
+(
+    size_t size
+    )
+{
+    return ExAllocatePoolWithTag(NonPagedPoolNx, size, cpp_pool_tag);
+}
+
+void __CRTDECL operator delete
+(
+    void* what
+    )
+{
+    if (what == nullptr)
+    {
+        return;
+    }
+
+    ExFreePoolWithTag(what, cpp_pool_tag);
+}
+
+void __CRTDECL operator delete
+(
+    void* what,
+    size_t size
+    )
+{
+    UNREFERENCED_PARAMETER(size);
+
+    if (what == nullptr)
+    {
+        return;
+    }
+
+    ExFreePoolWithTag(what, cpp_pool_tag);
+}
+
+void __CRTDECL operator delete[]
+(
+    void* what,
+    size_t size
+    )
+{
+    UNREFERENCED_PARAMETER(size);
+
+    if (what == nullptr)
+    {
+        return;
+    }
+
+    ExFreePoolWithTag(what, cpp_pool_tag);
+}
+
+#endif
--- a/sys/Context.h
+++ b/sys/Context.h
@@ -1,196 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#pragma once
-
-//
-// Used to identify children in the device list of the bus.
-// 
-typedef struct _PDO_IDENTIFICATION_DESCRIPTION
-{
-    WDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER Header; // should contain this header
-
-    //
-    // Unique serial number of the device on the bus
-    // 
-    ULONG SerialNo;
-
-    // 
-    // PID of the process creating this PDO
-    // 
-    DWORD OwnerProcessId;
-
-    //
-    // Device type this PDO is emulating
-    // 
-    VIGEM_TARGET_TYPE TargetType;
-
-    //
-    // If set, the vendor ID the emulated device is reporting
-    // 
-    USHORT VendorId;
-
-    //
-    // If set, the product ID the emulated device is reporting
-    // 
-    USHORT ProductId;
-
-    //
-    // Is the current device owner another driver?
-    // 
-    BOOLEAN OwnerIsDriver;
-
-    //
-    // SessionId associated with file handle.  Used to map file handles to emulated gamepad devices
-    // 
-    LONG SessionId;
-
-} PDO_IDENTIFICATION_DESCRIPTION, *PPDO_IDENTIFICATION_DESCRIPTION;
-
-//
-// The PDO device-extension (context).
-//
-typedef struct _PDO_DEVICE_DATA
-{
-    //
-    // Unique serial number of the device on the bus
-    // 
-    ULONG SerialNo;
-
-    // 
-    // PID of the process creating this PDO
-    // 
-    DWORD OwnerProcessId;
-
-    //
-    // Device type this PDO is emulating
-    // 
-    VIGEM_TARGET_TYPE TargetType;
-
-    //
-    // If set, the vendor ID the emulated device is reporting
-    // 
-    USHORT VendorId;
-
-    //
-    // If set, the product ID the emulated device is reporting
-    // 
-    USHORT ProductId;
-
-    //
-    // Interface for PDO to FDO communication
-    // 
-    VIGEM_BUS_INTERFACE BusInterface;
-
-    //
-    // Queue for incoming data interrupt transfer
-    //
-    WDFQUEUE PendingUsbInRequests;
-
-    //
-    // Queue for inverted calls
-    //
-    WDFQUEUE PendingNotificationRequests;
-
-} PDO_DEVICE_DATA, *PPDO_DEVICE_DATA;
-
-WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(PDO_DEVICE_DATA, PdoGetData)
-
-//
-// FDO (bus device) context data
-// 
-typedef struct _FDO_DEVICE_DATA
-{
-    //
-    // Counter of interface references
-    // 
-    LONG InterfaceReferenceCounter;
-
-    //
-    // Next SessionId to assign to a file handle
-    // 
-    LONG NextSessionId;
-
-    //
-    // Collection holding pending plugin requests
-    // 
-    WDFCOLLECTION PendingPluginRequests;
-
-    //
-    // Sync lock for pending request collection
-    // 
-    WDFSPINLOCK PendingPluginRequestsLock;
-
-    //
-    // Periodic timer sweeping up orphaned requests
-    // 
-    WDFTIMER PendingPluginRequestsCleanupTimer;
-
-} FDO_DEVICE_DATA, *PFDO_DEVICE_DATA;
-
-#define FDO_FIRST_SESSION_ID 100
-
-WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(FDO_DEVICE_DATA, FdoGetData)
-
-// 
-// Context data associated with file objects created by user mode applications
-// 
-typedef struct _FDO_FILE_DATA
-{
-    //
-    // SessionId associated with file handle.  Used to map file handles to emulated gamepad devices
-    // 
-    LONG SessionId;
-
-} FDO_FILE_DATA, *PFDO_FILE_DATA;
-
-WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(FDO_FILE_DATA, FileObjectGetData)
-
-//
-// Context data for plugin requests
-// 
-typedef struct _FDO_PLUGIN_REQUEST_DATA
-{
-    //
-    // Unique serial number of the device on the bus
-    // 
-    ULONG Serial;
-
-    //
-    // High resolution timestamp taken when this request got moved to pending state
-    // 
-    LARGE_INTEGER Timestamp;
-
-    //
-    // Performance counter system frequency taken upon fetching timestamp
-    // 
-    LARGE_INTEGER Frequency;
-
-} FDO_PLUGIN_REQUEST_DATA, *PFDO_PLUGIN_REQUEST_DATA;
-
-WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(FDO_PLUGIN_REQUEST_DATA, PluginRequestGetData)
-
--- a/sys/Driver.cpp
+++ b/sys/Driver.cpp
@@ -3,7 +3,7 @@
 *
 * MIT License
 *
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
+* Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -26,8 +26,8 @@


 #include "busenum.h"
-#include <wdmguid.h>
 #include "driver.tmh"
+#include <wdmguid.h>

 #ifdef ALLOC_PRAGMA
 #pragma alloc_text (INIT, DriverEntry)
@@ -35,10 +35,21 @@
 #pragma alloc_text (PAGE, Bus_DeviceFileCreate)
 #pragma alloc_text (PAGE, Bus_FileClose)
 #pragma alloc_text (PAGE, Bus_EvtDriverContextCleanup)
-#pragma alloc_text (PAGE, Bus_PdoStageResult)
 #endif


+#include "EmulationTargetPDO.hpp"
+#include "XusbPdo.hpp"
+#include "Ds4Pdo.hpp"
+
+using ViGEm::Bus::Core::PDO_IDENTIFICATION_DESCRIPTION;
+using ViGEm::Bus::Core::EmulationTargetPDO;
+using ViGEm::Bus::Targets::EmulationTargetXUSB;
+using ViGEm::Bus::Targets::EmulationTargetDS4;
+
+
+EXTERN_C_START
+
 //
 // Driver entry routine.
 // 
@@ -94,12 +105,7 @@ NTSTATUS Bus_EvtDeviceAdd(IN WDFDRIVER Driver, IN PWDFDEVICE_INIT DeviceInit)
    WDF_FILEOBJECT_CONFIG       foConfig;
    WDF_OBJECT_ATTRIBUTES       fdoAttributes;
    WDF_OBJECT_ATTRIBUTES       fileHandleAttributes;
-    WDF_OBJECT_ATTRIBUTES       collectionAttributes;
-    WDF_OBJECT_ATTRIBUTES       timerAttributes;
    PFDO_DEVICE_DATA            pFDOData;
-    VIGEM_BUS_INTERFACE         busInterface;
-    PINTERFACE                  interfaceHeader;
-    WDF_TIMER_CONFIG            reqTimerCfg;

    UNREFERENCED_PARAMETER(Driver);

@@ -162,104 +168,11 @@ NTSTATUS Bus_EvtDeviceAdd(IN WDFDRIVER Driver, IN PWDFDEVICE_INIT DeviceInit)

 #pragma endregion

-#pragma region Create pending requests collection & lock
-
-    WDF_OBJECT_ATTRIBUTES_INIT(&collectionAttributes);
-    collectionAttributes.ParentObject = device;
-
-    status = WdfCollectionCreate(&collectionAttributes, &pFDOData->PendingPluginRequests);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DRIVER,
-            "WdfCollectionCreate failed with status %!STATUS!",
-            status);
-        return STATUS_UNSUCCESSFUL;
-    }
-
-    WDF_OBJECT_ATTRIBUTES_INIT(&collectionAttributes);
-    collectionAttributes.ParentObject = device;
-
-    status = WdfSpinLockCreate(&collectionAttributes, &pFDOData->PendingPluginRequestsLock);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DRIVER,
-            "WdfSpinLockCreate failed with status %!STATUS!",
-            status);
-        return STATUS_UNSUCCESSFUL;
-    }
-
-#pragma endregion
-
-#pragma region Create timer for sweeping up orphaned requests
-
-    WDF_TIMER_CONFIG_INIT_PERIODIC(
-        &reqTimerCfg,
-        Bus_PlugInRequestCleanUpEvtTimerFunc,
-        ORC_TIMER_START_DELAY
-    );
-    WDF_OBJECT_ATTRIBUTES_INIT(&timerAttributes);
-    timerAttributes.ParentObject = device;
-
-    status = WdfTimerCreate(&reqTimerCfg, &timerAttributes, &pFDOData->PendingPluginRequestsCleanupTimer);
-    if (!NT_SUCCESS(status)) {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DRIVER,
-            "WdfTimerCreate failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-#pragma endregion
-
-#pragma region Add query interface
-
-    // 
-    // Set up the common interface header
-    // 
-    interfaceHeader = &busInterface.InterfaceHeader;
-
-    interfaceHeader->Size = sizeof(VIGEM_BUS_INTERFACE);
-    interfaceHeader->Version = VIGEM_BUS_INTERFACE_VERSION;
-    interfaceHeader->Context = (PVOID)device;
-
-    // 
-    // We don't pay any particular attention to the reference
-    // counting of this interface, but we MUST specify routines for
-    // it. Luckily the framework provides dummy routines
-    // 
-    interfaceHeader->InterfaceReference = WdfDeviceInterfaceReferenceNoOp;
-    interfaceHeader->InterfaceDereference = WdfDeviceInterfaceDereferenceNoOp;
-
-    busInterface.BusPdoStageResult = Bus_PdoStageResult;
-
-    WDF_QUERY_INTERFACE_CONFIG queryInterfaceConfig;
-
-    WDF_QUERY_INTERFACE_CONFIG_INIT(&queryInterfaceConfig,
-        interfaceHeader,
-        &GUID_VIGEM_INTERFACE_PDO,
-        WDF_NO_EVENT_CALLBACK);
-
-    status = WdfDeviceAddQueryInterface(device,
-        &queryInterfaceConfig);
-
-    if (!NT_SUCCESS(status)) {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DRIVER,
-            "WdfDeviceAddQueryInterface failed with status %!STATUS!",
-            status);
-        return(status);
-    }
-
-#pragma endregion
-
 #pragma region Create default I/O queue for FDO

    WDF_IO_QUEUE_CONFIG_INIT_DEFAULT_QUEUE(&queueConfig, WdfIoQueueDispatchParallel);

    queueConfig.EvtIoDeviceControl = Bus_EvtIoDeviceControl;
-    queueConfig.EvtIoInternalDeviceControl = Bus_EvtIoInternalDeviceControl;
    queueConfig.EvtIoDefault = Bus_EvtIoDefault;

    __analysis_assume(queueConfig.EvtIoStop != 0);
@@ -442,21 +355,20 @@ Bus_FileClose(
            break;
        }

-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_DRIVER,
-            "PDO properties: status = %!STATUS!, pdoPID = %d, curPID = %d, pdoSID = %d, curSID = %d, internal = %d",
-            (int)childInfo.Status,
-            (int)description.OwnerProcessId,
-            (int)CURRENT_PROCESS_ID(),
-            (int)description.SessionId,
-            (int)pFileData->SessionId,
-            (int)description.OwnerIsDriver
-        );
+        //TraceEvents(TRACE_LEVEL_VERBOSE,
+        //    TRACE_DRIVER,
+        //    "PDO properties: status = %!STATUS!, pdoPID = %d, curPID = %d, pdoSID = %d, curSID = %d, internal = %d",
+        //    (int)childInfo.Status,
+        //    (int)description.OwnerProcessId,
+        //    (int)CURRENT_PROCESS_ID(),
+        //    (int)description.SessionId,
+        //    (int)pFileData->SessionId,
+        //    (int)description.OwnerIsDriver
+        //);

        // Only unplug devices with matching session id
        if (childInfo.Status == WdfChildListRetrieveDeviceSuccess
-            && description.SessionId == pFileData->SessionId
-            && !description.OwnerIsDriver)
+            && description.SessionId == pFileData->SessionId)
        {
            TraceEvents(TRACE_LEVEL_INFORMATION,
                TRACE_DRIVER,
@@ -512,151 +424,4 @@ Return Value:

 }

-//
-// Called by PDO when a boot-up stage has been completed
-// 
-_Use_decl_annotations_
-VOID
-Bus_PdoStageResult(
-    _In_ PINTERFACE InterfaceHeader,
-    _In_ VIGEM_PDO_STAGE Stage,
-    _In_ ULONG Serial,
-    _In_ NTSTATUS Status
-)
-{
-    ULONG               i;
-    PFDO_DEVICE_DATA    pFdoData;
-    WDFREQUEST          curRequest;
-    ULONG               curSerial;
-    ULONG               items;
-
-    UNREFERENCED_PARAMETER(InterfaceHeader);
-
-    PAGED_CODE();
-
-    TraceEvents(TRACE_LEVEL_INFORMATION,
-        TRACE_DRIVER,
-        "%!FUNC! Entry (stage = %d, serial = %d, status = %!STATUS!)",
-        Stage, Serial, Status);
-
-    pFdoData = FdoGetData(InterfaceHeader->Context);
-
-    //
-    // If any stage fails or is last stage, get associated request and complete it
-    // 
-    if (!NT_SUCCESS(Status) || Stage == ViGEmPdoInitFinished)
-    {
-        WdfSpinLockAcquire(pFdoData->PendingPluginRequestsLock);
-
-        items = WdfCollectionGetCount(pFdoData->PendingPluginRequests);
-
-        TraceEvents(TRACE_LEVEL_INFORMATION,
-            TRACE_DRIVER,
-            "Items count: %d",
-            items);
-
-        for (i = 0; i < items; i++)
-        {
-            curRequest = WdfCollectionGetItem(pFdoData->PendingPluginRequests, i);
-            curSerial = PluginRequestGetData(curRequest)->Serial;
-
-            TraceEvents(TRACE_LEVEL_INFORMATION,
-                TRACE_DRIVER,
-                "Serial: %d, curSerial: %d",
-                Serial, curSerial);
-
-            if (Serial == curSerial)
-            {
-                WdfRequestComplete(curRequest, Status);
-
-                WdfCollectionRemove(pFdoData->PendingPluginRequests, curRequest);
-
-                TraceEvents(TRACE_LEVEL_INFORMATION,
-                    TRACE_DRIVER,
-                    "Removed item with serial: %d",
-                    curSerial);
-
-                break;
-            }
-        }
-        WdfSpinLockRelease(pFdoData->PendingPluginRequestsLock);
-    }
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_DRIVER, "%!FUNC! Exit");
-}
-
-_Use_decl_annotations_
-VOID
-Bus_PlugInRequestCleanUpEvtTimerFunc(
-    WDFTIMER  Timer
-)
-{
-    ULONG                       i;
-    PFDO_DEVICE_DATA            pFdoData;
-    WDFREQUEST                  curRequest;
-    ULONG                       items;
-    WDFDEVICE                   device;
-    PFDO_PLUGIN_REQUEST_DATA    pPluginData;
-    LONGLONG                    freq;
-    LARGE_INTEGER               pcNow;
-    LONGLONG                    ellapsed;
-
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_DRIVER, "%!FUNC! Entry");
-
-    device = WdfTimerGetParentObject(Timer);
-    pFdoData = FdoGetData(device);
-
-    WdfSpinLockAcquire(pFdoData->PendingPluginRequestsLock);
-
-    items = WdfCollectionGetCount(pFdoData->PendingPluginRequests);
-
-    TraceEvents(TRACE_LEVEL_INFORMATION,
-        TRACE_DRIVER,
-        "Items count: %d",
-        items);
-
-    //
-    // Collection is empty; no need to keep timer running
-    // 
-    if (items == 0)
-    {
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_DRIVER,
-            "Collection is empty, stopping periodic timer");
-        WdfTimerStop(Timer, FALSE);
-    }
-
-    for (i = 0; i < items; i++)
-    {
-        curRequest = WdfCollectionGetItem(pFdoData->PendingPluginRequests, i);
-        pPluginData = PluginRequestGetData(curRequest);
-
-        freq = pPluginData->Frequency.QuadPart / ORC_PC_FREQUENCY_DIVIDER;
-        pcNow = KeQueryPerformanceCounter(NULL);
-        ellapsed = (pcNow.QuadPart - pPluginData->Timestamp.QuadPart) / freq;
-
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_DRIVER,
-            "PDO (serial = %d) plugin request age: %llu ms",
-            pPluginData->Serial, ellapsed);
-
-        if (ellapsed >= ORC_REQUEST_MAX_AGE)
-        {
-            WdfRequestComplete(curRequest, STATUS_SUCCESS);
-
-            WdfCollectionRemove(pFdoData->PendingPluginRequests, curRequest);
-
-            TraceEvents(TRACE_LEVEL_INFORMATION,
-                TRACE_DRIVER,
-                "Removed item with serial: %d",
-                pPluginData->Serial);
-
-            break;
-        }
-    }
-    WdfSpinLockRelease(pFdoData->PendingPluginRequestsLock);
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_DRIVER, "%!FUNC! Exit");
-}
-
+EXTERN_C_END
--- a/sys/Ds4.c
+++ b/sys/Ds4.c
@@ -1,468 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#include "busenum.h"
-#include <hidclass.h>
-#include "ds4.tmh"
-
-NTSTATUS Ds4_PreparePdo(PWDFDEVICE_INIT DeviceInit, PUNICODE_STRING DeviceId, PUNICODE_STRING DeviceDescription)
-{
-    NTSTATUS status;
-    UNICODE_STRING buffer;
-
-    // prepare device description
-    status = RtlUnicodeStringInit(DeviceDescription, L"Virtual DualShock 4 Controller");
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "RtlUnicodeStringInit failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    // Set hardware IDs
-    RtlUnicodeStringInit(&buffer, L"USB\\VID_054C&PID_05C4&REV_0100");
-
-    status = WdfPdoInitAddHardwareID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "WdfPdoInitAddHardwareID failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    RtlUnicodeStringCopy(DeviceId, &buffer);
-
-    RtlUnicodeStringInit(&buffer, L"USB\\VID_054C&PID_05C4");
-
-    status = WdfPdoInitAddHardwareID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "WdfPdoInitAddHardwareID failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    // Set compatible IDs
-    RtlUnicodeStringInit(&buffer, L"USB\\Class_03&SubClass_00&Prot_00");
-
-    status = WdfPdoInitAddCompatibleID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "WdfPdoInitAddCompatibleID (#01) failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    RtlUnicodeStringInit(&buffer, L"USB\\Class_03&SubClass_00");
-
-    status = WdfPdoInitAddCompatibleID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "WdfPdoInitAddCompatibleID (#02) failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    RtlUnicodeStringInit(&buffer, L"USB\\Class_03");
-
-    status = WdfPdoInitAddCompatibleID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "WdfPdoInitAddCompatibleID (#03) failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS Ds4_PrepareHardware(WDFDEVICE Device)
-{
-    NTSTATUS status;
-    WDF_QUERY_INTERFACE_CONFIG ifaceCfg;
-    INTERFACE devinterfaceHid;
-
-    devinterfaceHid.Size = sizeof(INTERFACE);
-    devinterfaceHid.Version = 1;
-    devinterfaceHid.Context = (PVOID)Device;
-
-    devinterfaceHid.InterfaceReference = WdfDeviceInterfaceReferenceNoOp;
-    devinterfaceHid.InterfaceDereference = WdfDeviceInterfaceDereferenceNoOp;
-
-    // Expose GUID_DEVINTERFACE_HID so HIDUSB can initialize
-    WDF_QUERY_INTERFACE_CONFIG_INIT(&ifaceCfg, (PINTERFACE)&devinterfaceHid, &GUID_DEVINTERFACE_HID, NULL);
-
-    status = WdfDeviceAddQueryInterface(Device, &ifaceCfg);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "WdfDeviceAddQueryInterface failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    PDS4_DEVICE_DATA ds4Data = Ds4GetData(Device);
-
-    // Set default HID input report (everything zero`d)
-    UCHAR DefaultHidReport[DS4_REPORT_SIZE] =
-    {
-        0x01, 0x82, 0x7F, 0x7E, 0x80, 0x08, 0x00, 0x58,
-        0x00, 0x00, 0xFD, 0x63, 0x06, 0x03, 0x00, 0xFE,
-        0xFF, 0xFC, 0xFF, 0x79, 0xFD, 0x1B, 0x14, 0xD1,
-        0xE9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, 0x00,
-        0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80,
-        0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
-        0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00,
-        0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00
-    };
-
-    // Initialize HID reports to defaults
-    RtlCopyBytes(ds4Data->Report, DefaultHidReport, DS4_REPORT_SIZE);
-    RtlZeroMemory(&ds4Data->OutputReport, sizeof(DS4_OUTPUT_REPORT));
-
-    // Start pending IRP queue flush timer
-    WdfTimerStart(ds4Data->PendingUsbInRequestsTimer, DS4_QUEUE_FLUSH_PERIOD);
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS Ds4_AssignPdoContext(WDFDEVICE Device, PPDO_IDENTIFICATION_DESCRIPTION Description)
-{
-    NTSTATUS            status;
-    PDS4_DEVICE_DATA    ds4 = Ds4GetData(Device);
-
-    // Initialize periodic timer
-    WDF_TIMER_CONFIG timerConfig;
-    WDF_TIMER_CONFIG_INIT_PERIODIC(&timerConfig, Ds4_PendingUsbRequestsTimerFunc, DS4_QUEUE_FLUSH_PERIOD);
-
-    // Timer object attributes
-    WDF_OBJECT_ATTRIBUTES timerAttribs;
-    WDF_OBJECT_ATTRIBUTES_INIT(&timerAttribs);
-
-    // PDO is parent
-    timerAttribs.ParentObject = Device;
-
-    // Create timer
-    status = WdfTimerCreate(&timerConfig, &timerAttribs, &ds4->PendingUsbInRequestsTimer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "WdfTimerCreate failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    // Load/generate MAC address
-
-    // TODO: tidy up this region
-
-    WDFKEY keyParams, keyTargets, keyDS, keySerial;
-    UNICODE_STRING keyName, valueName;
-
-    status = WdfDriverOpenParametersRegistryKey(WdfGetDriver(), STANDARD_RIGHTS_ALL, WDF_NO_OBJECT_ATTRIBUTES, &keyParams);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "WdfDriverOpenParametersRegistryKey failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    RtlUnicodeStringInit(&keyName, L"Targets");
-
-    status = WdfRegistryCreateKey(
-        keyParams,
-        &keyName,
-        KEY_ALL_ACCESS,
-        REG_OPTION_NON_VOLATILE,
-        NULL,
-        WDF_NO_OBJECT_ATTRIBUTES,
-        &keyTargets
-    );
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "WdfRegistryCreateKey failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    RtlUnicodeStringInit(&keyName, L"DualShock");
-
-    status = WdfRegistryCreateKey(
-        keyTargets,
-        &keyName,
-        KEY_ALL_ACCESS,
-        REG_OPTION_NON_VOLATILE,
-        NULL,
-        WDF_NO_OBJECT_ATTRIBUTES,
-        &keyDS
-    );
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "WdfRegistryCreateKey failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    DECLARE_UNICODE_STRING_SIZE(serialPath, 4);
-    RtlUnicodeStringPrintf(&serialPath, L"%04d", Description->SerialNo);
-
-    status = WdfRegistryCreateKey(
-        keyDS,
-        &serialPath,
-        KEY_ALL_ACCESS,
-        REG_OPTION_NON_VOLATILE,
-        NULL,
-        WDF_NO_OBJECT_ATTRIBUTES,
-        &keySerial
-    );
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "WdfRegistryCreateKey failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    RtlUnicodeStringInit(&valueName, L"TargetMacAddress");
-
-    status = WdfRegistryQueryValue(keySerial, &valueName, sizeof(MAC_ADDRESS), &ds4->TargetMacAddress, NULL, NULL);
-
-    TraceEvents(TRACE_LEVEL_INFORMATION,
-        TRACE_DS4,
-        "MAC-Address: %02X:%02X:%02X:%02X:%02X:%02X\n",
-        ds4->TargetMacAddress.Vendor0,
-        ds4->TargetMacAddress.Vendor1,
-        ds4->TargetMacAddress.Vendor2,
-        ds4->TargetMacAddress.Nic0,
-        ds4->TargetMacAddress.Nic1,
-        ds4->TargetMacAddress.Nic2);
-
-    if (status == STATUS_OBJECT_NAME_NOT_FOUND)
-    {
-        GenerateRandomMacAddress(&ds4->TargetMacAddress);
-
-        status = WdfRegistryAssignValue(keySerial, &valueName, REG_BINARY, sizeof(MAC_ADDRESS), (PVOID)&ds4->TargetMacAddress);
-        if (!NT_SUCCESS(status))
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_DS4,
-                "WdfRegistryAssignValue failed with status %!STATUS!",
-                status);
-            return status;
-        }
-    }
-    else if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_DS4,
-            "WdfRegistryQueryValue failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    WdfRegistryClose(keySerial);
-    WdfRegistryClose(keyDS);
-    WdfRegistryClose(keyTargets);
-    WdfRegistryClose(keyParams);
-
-    return STATUS_SUCCESS;
-}
-
-VOID Ds4_GetConfigurationDescriptorType(PUCHAR Buffer, ULONG Length)
-{
-    UCHAR Ds4DescriptorData[DS4_DESCRIPTOR_SIZE] =
-    {
-        0x09,        // bLength
-        0x02,        // bDescriptorType (Configuration)
-        0x29, 0x00,  // wTotalLength 41
-        0x01,        // bNumInterfaces 1
-        0x01,        // bConfigurationValue
-        0x00,        // iConfiguration (String Index)
-        0xC0,        // bmAttributes Self Powered
-        0xFA,        // bMaxPower 500mA
-
-        0x09,        // bLength
-        0x04,        // bDescriptorType (Interface)
-        0x00,        // bInterfaceNumber 0
-        0x00,        // bAlternateSetting
-        0x02,        // bNumEndpoints 2
-        0x03,        // bInterfaceClass
-        0x00,        // bInterfaceSubClass
-        0x00,        // bInterfaceProtocol
-        0x00,        // iInterface (String Index)
-
-        0x09,        // bLength
-        0x21,        // bDescriptorType (HID)
-        0x11, 0x01,  // bcdHID 1.11
-        0x00,        // bCountryCode
-        0x01,        // bNumDescriptors
-        0x22,        // bDescriptorType[0] (HID)
-        0xD3, 0x01,  // wDescriptorLength[0] 467
-
-        0x07,        // bLength
-        0x05,        // bDescriptorType (Endpoint)
-        0x84,        // bEndpointAddress (IN/D2H)
-        0x03,        // bmAttributes (Interrupt)
-        0x40, 0x00,  // wMaxPacketSize 64
-        0x05,        // bInterval 5 (unit depends on device speed)
-
-        0x07,        // bLength
-        0x05,        // bDescriptorType (Endpoint)
-        0x03,        // bEndpointAddress (OUT/H2D)
-        0x03,        // bmAttributes (Interrupt)
-        0x40, 0x00,  // wMaxPacketSize 64
-        0x05,        // bInterval 5 (unit depends on device speed)
-
-                     // 41 bytes
-
-                     // best guess: USB Standard Descriptor
-    };
-
-    RtlCopyBytes(Buffer, Ds4DescriptorData, Length);
-}
-
-VOID Ds4_GetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor, PPDO_DEVICE_DATA pCommon)
-{
-    pDescriptor->bLength = 0x12;
-    pDescriptor->bDescriptorType = USB_DEVICE_DESCRIPTOR_TYPE;
-    pDescriptor->bcdUSB = 0x0200; // USB v2.0
-    pDescriptor->bDeviceClass = 0x00; // per Interface
-    pDescriptor->bDeviceSubClass = 0x00;
-    pDescriptor->bDeviceProtocol = 0x00;
-    pDescriptor->bMaxPacketSize0 = 0x40;
-    pDescriptor->idVendor = pCommon->VendorId;
-    pDescriptor->idProduct = pCommon->ProductId;
-    pDescriptor->bcdDevice = 0x0100;
-    pDescriptor->iManufacturer = 0x01;
-    pDescriptor->iProduct = 0x02;
-    pDescriptor->iSerialNumber = 0x00;
-    pDescriptor->bNumConfigurations = 0x01;
-}
-
-VOID Ds4_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo)
-{
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_DS4,
-        ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d",
-        (int)pInfo->Length,
-        (int)pInfo->InterfaceNumber,
-        (int)pInfo->AlternateSetting,
-        pInfo->NumberOfPipes);
-
-    pInfo->Class = 0x03; // HID
-    pInfo->SubClass = 0x00;
-    pInfo->Protocol = 0x00;
-
-    pInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)0xFFFF0000;
-
-    pInfo->Pipes[0].MaximumTransferSize = 0x00400000;
-    pInfo->Pipes[0].MaximumPacketSize = 0x40;
-    pInfo->Pipes[0].EndpointAddress = 0x84;
-    pInfo->Pipes[0].Interval = 0x05;
-    pInfo->Pipes[0].PipeType = 0x03;
-    pInfo->Pipes[0].PipeHandle = (USBD_PIPE_HANDLE)0xFFFF0084;
-    pInfo->Pipes[0].PipeFlags = 0x00;
-
-    pInfo->Pipes[1].MaximumTransferSize = 0x00400000;
-    pInfo->Pipes[1].MaximumPacketSize = 0x40;
-    pInfo->Pipes[1].EndpointAddress = 0x03;
-    pInfo->Pipes[1].Interval = 0x05;
-    pInfo->Pipes[1].PipeType = 0x03;
-    pInfo->Pipes[1].PipeHandle = (USBD_PIPE_HANDLE)0xFFFF0003;
-    pInfo->Pipes[1].PipeFlags = 0x00;
-}
-
-//
-// Completes pending I/O requests if feeder is too slow.
-// 
-VOID Ds4_PendingUsbRequestsTimerFunc(
-    _In_ WDFTIMER Timer
-)
-{
-    NTSTATUS                status;
-    WDFREQUEST              usbRequest;
-    WDFDEVICE               hChild;
-    PDS4_DEVICE_DATA        ds4Data;
-    PIRP                    pendingIrp;
-    PIO_STACK_LOCATION      irpStack;
-    PPDO_DEVICE_DATA        pdoData;
-
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_DS4, "%!FUNC! Entry");
-
-    hChild = WdfTimerGetParentObject(Timer);
-    pdoData = PdoGetData(hChild);
-    ds4Data = Ds4GetData(hChild);
-
-    // Get pending USB request
-    status = WdfIoQueueRetrieveNextRequest(pdoData->PendingUsbInRequests, &usbRequest);
-
-    if (NT_SUCCESS(status))
-    {
-        // Get pending IRP
-        pendingIrp = WdfRequestWdmGetIrp(usbRequest);
-        irpStack = IoGetCurrentIrpStackLocation(pendingIrp);
-
-        // Get USB request block
-        PURB urb = (PURB)irpStack->Parameters.Others.Argument1;
-
-        // Get transfer buffer
-        PUCHAR Buffer = (PUCHAR)urb->UrbBulkOrInterruptTransfer.TransferBuffer;
-        // Set buffer length to report size
-        urb->UrbBulkOrInterruptTransfer.TransferBufferLength = DS4_REPORT_SIZE;
-
-        // Copy cached report to transfer buffer 
-        if (Buffer)
-            RtlCopyBytes(Buffer, ds4Data->Report, DS4_REPORT_SIZE);
-
-        // Complete pending request
-        WdfRequestComplete(usbRequest, status);
-    }
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_DS4, "%!FUNC! Exit with status %!STATUS!", status);
-}
-
--- a/sys/Ds4.h
+++ b/sys/Ds4.h
@@ -1,114 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#pragma once
-
-#define HID_GET_FEATURE_REPORT_SIZE_0                   0x31
-#define HID_GET_FEATURE_REPORT_SIZE_1                   0x25
-#define HID_GET_FEATURE_REPORT_MAC_ADDRESSES_SIZE       0x10
-
-#define HID_SET_FEATURE_REPORT_SIZE_0                   0x17
-#define HID_SET_FEATURE_REPORT_SIZE_1                   0x11
-
-#define HID_REPORT_ID_0                                 0xA3
-#define HID_REPORT_ID_1                                 0x02
-#define HID_REPORT_MAC_ADDRESSES_ID                     0x12
-#define HID_REPORT_ID_3                                 0x13
-#define HID_REPORT_ID_4                                 0x14
-
-#define DS4_DESCRIPTOR_SIZE                             0x0029
-#if defined(_X86_)
-#define DS4_CONFIGURATION_SIZE                          0x0050
-#else
-#define DS4_CONFIGURATION_SIZE                          0x0070
-#endif
-#define DS4_HID_REPORT_DESCRIPTOR_SIZE                  0x01D3
-
-#define DS4_MANUFACTURER_NAME_LENGTH                    0x38
-#define DS4_PRODUCT_NAME_LENGTH                         0x28
-#define DS4_OUTPUT_BUFFER_OFFSET                        0x04
-#define DS4_OUTPUT_BUFFER_LENGTH                        0x05
-
-#define DS4_REPORT_SIZE                                 0x40
-#define DS4_QUEUE_FLUSH_PERIOD                          0x05
-
-
-//
-// DS4-specific device context data.
-// 
-typedef struct _DS4_DEVICE_DATA
-{
-    //
-    // HID Input Report buffer
-    //
-    UCHAR Report[DS4_REPORT_SIZE];
-
-    //
-    // Output report cache
-    //
-    DS4_OUTPUT_REPORT OutputReport;
-
-    //
-    // Timer for dispatching interrupt transfer
-    //
-    WDFTIMER PendingUsbInRequestsTimer;
-
-    //
-    // Auto-generated MAC address of the target device
-    //
-    MAC_ADDRESS TargetMacAddress;
-
-    //
-    // Default MAC address of the host (not used)
-    //
-    MAC_ADDRESS HostMacAddress;
-
-} DS4_DEVICE_DATA, *PDS4_DEVICE_DATA;
-
-WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(DS4_DEVICE_DATA, Ds4GetData)
-
-
-EVT_WDF_TIMER Ds4_PendingUsbRequestsTimerFunc;
-
-NTSTATUS
-Bus_Ds4SubmitReport(
-    WDFDEVICE Device,
-    ULONG SerialNo,
-    PDS4_SUBMIT_REPORT Report,
-    _In_ BOOLEAN FromInterface
-);
-
-//
-// DS4-specific functions
-// 
-NTSTATUS Ds4_PreparePdo(PWDFDEVICE_INIT DeviceInit, PUNICODE_STRING DeviceId, PUNICODE_STRING DeviceDescription);
-NTSTATUS Ds4_PrepareHardware(WDFDEVICE Device);
-NTSTATUS Ds4_AssignPdoContext(WDFDEVICE Device, PPDO_IDENTIFICATION_DESCRIPTION Description);
-VOID Ds4_GetConfigurationDescriptorType(PUCHAR Buffer, ULONG Length);
-VOID Ds4_GetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor, PPDO_DEVICE_DATA pCommon);
-VOID Ds4_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo);
-
--- a/sys/Ds4Pdo.cpp
+++ b/sys/Ds4Pdo.cpp
--- a/sys/Ds4Pdo.hpp
+++ b/sys/Ds4Pdo.hpp
@@ -0,0 +1,153 @@
+/*
+* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
+*
+* MIT License
+*
+* Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
+
+#pragma once
+
+#include "EmulationTargetPDO.hpp"
+#include <ViGEm/km/BusShared.h>
+
+
+namespace ViGEm::Bus::Targets
+{
+	//
+	// Represents a MAC address.
+	//
+	typedef struct _MAC_ADDRESS
+	{
+		UCHAR Vendor0;
+		UCHAR Vendor1;
+		UCHAR Vendor2;
+		UCHAR Nic0;
+		UCHAR Nic1;
+		UCHAR Nic2;
+	} MAC_ADDRESS, * PMAC_ADDRESS;
+	
+	constexpr unsigned char hid_get_report_id(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST* pReq)
+	{
+		return pReq->Value & 0xFF;
+	}
+
+	constexpr unsigned char hid_get_report_type(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST* pReq)
+	{
+		return (pReq->Value >> 8) & 0xFF;
+	}
+
+	class EmulationTargetDS4 : public Core::EmulationTargetPDO
+	{
+	public:
+		EmulationTargetDS4(ULONG Serial, LONG SessionId, USHORT VendorId = 0x054C, USHORT ProductId = 0x05C4);
+		~EmulationTargetDS4() = default;
+
+		NTSTATUS PdoPrepareDevice(PWDFDEVICE_INIT DeviceInit,
+		                          PUNICODE_STRING DeviceId,
+		                          PUNICODE_STRING DeviceDescription) override;
+
+		NTSTATUS PdoPrepareHardware() override;
+
+		NTSTATUS PdoInitContext() override;
+
+		VOID GetConfigurationDescriptorType(PUCHAR Buffer, ULONG Length) override;
+
+		NTSTATUS UsbGetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor) override;
+
+		NTSTATUS SelectConfiguration(PURB Urb) override;
+
+		void AbortPipe() override;
+		
+		NTSTATUS UsbClassInterface(PURB Urb) override;
+		
+		NTSTATUS UsbGetDescriptorFromInterface(PURB Urb) override;
+		
+		NTSTATUS UsbSelectInterface(PURB Urb) override;
+		
+		NTSTATUS UsbGetStringDescriptorType(PURB Urb) override;
+		
+		NTSTATUS UsbBulkOrInterruptTransfer(_URB_BULK_OR_INTERRUPT_TRANSFER* pTransfer, WDFREQUEST Request) override;
+		
+		NTSTATUS UsbControlTransfer(PURB Urb) override;
+		
+		NTSTATUS SubmitReportImpl(PVOID NewReport) override;
+		
+	private:
+		static EVT_WDF_TIMER PendingUsbRequestsTimerFunc;
+
+		static VOID ReverseByteArray(PUCHAR Array, INT Length);
+
+		static VOID GenerateRandomMacAddress(PMAC_ADDRESS Address);
+		
+		static PCWSTR _deviceDescription;
+
+		static const int HID_REQUEST_GET_REPORT = 0x01;
+		static const int HID_REQUEST_SET_REPORT = 0x09;
+		static const int HID_REPORT_TYPE_FEATURE = 0x03;
+
+		static const int HID_REPORT_ID_0 = 0xA3;
+		static const int HID_REPORT_ID_1 = 0x02;
+		static const int HID_REPORT_MAC_ADDRESSES_ID = 0x12;
+		static const int HID_REPORT_ID_3 = 0x13;
+		static const int HID_REPORT_ID_4 = 0x14;
+
+		static const int DS4_DESCRIPTOR_SIZE = 0x0029;
+#if defined(_X86_)
+		static const int DS4_CONFIGURATION_SIZE = 0x0050;
+#else
+		static const int DS4_CONFIGURATION_SIZE = 0x0070;
+#endif
+
+		static const int DS4_MANUFACTURER_NAME_LENGTH = 0x38;
+		static const int DS4_PRODUCT_NAME_LENGTH = 0x28;
+		static const int DS4_OUTPUT_BUFFER_OFFSET = 0x04;
+		static const int DS4_OUTPUT_BUFFER_LENGTH = 0x05;
+
+		static const int DS4_REPORT_SIZE = 0x40;
+		static const int DS4_QUEUE_FLUSH_PERIOD = 0x05;
+
+		//
+		// HID Input Report buffer
+		//
+		UCHAR _Report[DS4_REPORT_SIZE];
+
+		//
+		// Output report cache
+		//
+		DS4_OUTPUT_REPORT _OutputReport;
+
+		//
+		// Timer for dispatching interrupt transfer
+		//
+		WDFTIMER _PendingUsbInRequestsTimer;
+
+		//
+		// Auto-generated MAC address of the target device
+		//
+		MAC_ADDRESS _TargetMacAddress;
+
+		//
+		// Default MAC address of the host (not used)
+		//
+		MAC_ADDRESS _HostMacAddress;	
+	};
+}
--- a/sys/EmulationTargetPDO.cpp
+++ b/sys/EmulationTargetPDO.cpp
--- a/sys/EmulationTargetPDO.hpp
+++ b/sys/EmulationTargetPDO.hpp
@@ -0,0 +1,257 @@
+/*
+* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
+*
+* MIT License
+*
+* Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
+
+#pragma once
+
+#include <ntddk.h>
+#include <wdf.h>
+#include <ntintsafe.h>
+
+#include <usb.h>
+#include <usbbusif.h>
+
+#include <ViGEm/Common.h>
+#include <initguid.h>
+
+//
+// Some insane macro-magic =3
+// 
+#define P99_PROTECT(...) __VA_ARGS__
+#define COPY_BYTE_ARRAY(_dst_, _bytes_)   do {BYTE b[] = _bytes_; \
+                                            RtlCopyMemory(_dst_, b, RTL_NUMBER_OF_V1(b)); } while (0)
+
+namespace ViGEm::Bus::Core
+{
+	typedef struct _PDO_IDENTIFICATION_DESCRIPTION* PPDO_IDENTIFICATION_DESCRIPTION;
+
+	class EmulationTargetPDO
+	{
+	public:
+		EmulationTargetPDO(ULONG Serial, LONG SessionId, USHORT VendorId, USHORT ProductId);
+
+		virtual ~EmulationTargetPDO() = default;
+		
+		static bool GetPdoByTypeAndSerial(
+			IN WDFDEVICE ParentDevice,
+			IN VIGEM_TARGET_TYPE Type,
+			IN ULONG SerialNo, 
+			OUT EmulationTargetPDO** Object
+		);
+
+		virtual NTSTATUS PdoPrepareDevice(PWDFDEVICE_INIT DeviceInit,
+		                                  PUNICODE_STRING DeviceId,
+		                                  PUNICODE_STRING DeviceDescription) = 0;
+
+		virtual NTSTATUS PdoPrepareHardware() = 0;
+
+		virtual NTSTATUS PdoInitContext() = 0;
+
+		NTSTATUS PdoCreateDevice(_In_ WDFDEVICE ParentDevice,
+		                         _In_ PWDFDEVICE_INIT DeviceInit);
+
+		bool operator==(EmulationTargetPDO& other) const
+		{
+			return (other._SerialNo == this->_SerialNo);
+		}
+
+		virtual NTSTATUS UsbGetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor) = 0;
+
+		NTSTATUS UsbSelectConfiguration(PURB Urb);
+
+		void UsbAbortPipe();
+
+		NTSTATUS UsbGetConfigurationDescriptorType(PURB Urb);
+
+		virtual NTSTATUS UsbClassInterface(PURB Urb) = 0;
+
+		virtual NTSTATUS UsbGetDescriptorFromInterface(PURB Urb) = 0;
+
+		virtual NTSTATUS UsbSelectInterface(PURB Urb) = 0;
+
+		virtual NTSTATUS UsbGetStringDescriptorType(PURB Urb) = 0;
+
+		virtual NTSTATUS UsbBulkOrInterruptTransfer(struct _URB_BULK_OR_INTERRUPT_TRANSFER* pTransfer,
+		                                            WDFREQUEST Request) = 0;
+
+		virtual NTSTATUS UsbControlTransfer(PURB Urb) = 0;
+
+		NTSTATUS SubmitReport(PVOID NewReport);
+
+		NTSTATUS EnqueueNotification(WDFREQUEST Request) const;
+
+		bool IsOwnerProcess() const;
+
+		VIGEM_TARGET_TYPE GetType() const;
+
+		NTSTATUS EnqueuePlugin(WDFREQUEST Request);
+
+		NTSTATUS PdoPrepare(WDFDEVICE ParentDevice);
+	
+	private:
+		static unsigned long current_process_id();
+
+		static EVT_WDF_DEVICE_CONTEXT_CLEANUP EvtDeviceContextCleanup;
+
+		static bool GetPdoBySerial(
+			IN WDFDEVICE ParentDevice,
+			IN ULONG SerialNo,
+			OUT EmulationTargetPDO** Object
+		);
+
+		HANDLE _PluginRequestCompletionWorkerThreadHandle{};
+		
+	protected:
+		static const ULONG _maxHardwareIdLength = 0xFF;
+
+		static const int MAX_INSTANCE_ID_LEN = 80;
+		
+		static PCWSTR _deviceLocation;
+
+		static BOOLEAN USB_BUSIFFN UsbInterfaceIsDeviceHighSpeed(IN PVOID BusContext);
+
+		static NTSTATUS USB_BUSIFFN UsbInterfaceQueryBusInformation(
+			IN PVOID BusContext,
+			IN ULONG Level,
+			IN OUT PVOID BusInformationBuffer,
+			IN OUT PULONG BusInformationBufferLength,
+			OUT PULONG BusInformationActualLength
+		);
+
+		static NTSTATUS USB_BUSIFFN UsbInterfaceSubmitIsoOutUrb(IN PVOID BusContext, IN PURB Urb);
+
+		static NTSTATUS USB_BUSIFFN UsbInterfaceQueryBusTime(IN PVOID BusContext, IN OUT PULONG CurrentUsbFrame);
+
+		static VOID USB_BUSIFFN UsbInterfaceGetUSBDIVersion(
+			IN PVOID BusContext,
+			IN OUT PUSBD_VERSION_INFORMATION VersionInformation,
+			IN OUT PULONG HcdCapabilities
+		);
+
+		static EVT_WDF_DEVICE_PREPARE_HARDWARE EvtDevicePrepareHardware;
+
+		static EVT_WDF_IO_QUEUE_IO_INTERNAL_DEVICE_CONTROL EvtIoInternalDeviceControl;
+
+		static VOID PluginRequestCompletionWorkerRoutine(IN PVOID StartContext);
+		
+		virtual VOID GetConfigurationDescriptorType(PUCHAR Buffer, ULONG Length) = 0;
+
+		virtual NTSTATUS SelectConfiguration(PURB Urb) = 0;
+
+		virtual void AbortPipe() = 0;
+
+		virtual NTSTATUS SubmitReportImpl(PVOID NewReport) = 0;
+		
+		//
+		// Unique serial number of the device on the bus
+		// 
+		ULONG _SerialNo{};
+
+		// 
+		// PID of the process creating this PDO
+		// 
+		DWORD _OwnerProcessId{};
+
+		//
+		// File object session ID
+		// 
+		LONG _SessionId{};
+
+		//
+		// Device type this PDO is emulating
+		// 
+		VIGEM_TARGET_TYPE _TargetType;
+
+		//
+		// If set, the vendor ID the emulated device is reporting
+		// 
+		USHORT _VendorId{};
+
+		//
+		// If set, the product ID the emulated device is reporting
+		// 
+		USHORT _ProductId{};
+
+		//
+		// Queue for blocking plugin requests
+		// 
+		WDFQUEUE _PendingPlugInRequests{};
+		
+		//
+		// Queue for incoming data interrupt transfer
+		//
+		WDFQUEUE _PendingUsbInRequests{};
+
+		//
+		// Queue for inverted calls
+		//
+		WDFQUEUE _PendingNotificationRequests{};
+
+		//
+		// This child objects' device object
+		// 
+		WDFDEVICE _PdoDevice{};
+		
+		//
+		// Configuration descriptor size
+		// 
+		ULONG _UsbConfigurationDescriptionSize{};
+
+		//
+		// Signals the bus that PDO is ready to receive data
+		// 
+		KEVENT _PdoBootNotificationEvent;
+	};
+
+	typedef struct _PDO_IDENTIFICATION_DESCRIPTION
+	{
+		//
+		// List entity header
+		// 
+		WDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER Header;
+
+		//
+		// Primary key to identify PDO
+		// 
+		ULONG SerialNo;
+
+		//
+		// Session ID
+		// 
+		LONG SessionId;
+
+		//
+		// Context object of PDO
+		// 
+		EmulationTargetPDO* Target;
+	} PDO_IDENTIFICATION_DESCRIPTION, *PPDO_IDENTIFICATION_DESCRIPTION;
+
+	typedef struct _EMULATION_TARGET_PDO_CONTEXT
+	{
+		EmulationTargetPDO* Target;
+	} EMULATION_TARGET_PDO_CONTEXT, *PEMULATION_TARGET_PDO_CONTEXT;
+
+	WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(EMULATION_TARGET_PDO_CONTEXT, EmulationTargetPdoGetContext)
+}
--- a/sys/Queue.c
+++ b/sys/Queue.c
@@ -1,460 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#include "busenum.h"
-#include "queue.tmh"
-
-#ifdef ALLOC_PRAGMA
-#pragma alloc_text (PAGE, Bus_EvtIoDefault)
-#endif
-
-//
-// Responds to I/O control requests sent to the FDO.
-// 
-VOID Bus_EvtIoDeviceControl(
-    IN WDFQUEUE Queue,
-    IN WDFREQUEST Request,
-    IN size_t OutputBufferLength,
-    IN size_t InputBufferLength,
-    IN ULONG IoControlCode
-)
-{
-    NTSTATUS                    status = STATUS_INVALID_PARAMETER;
-    WDFDEVICE                   Device;
-    size_t                      length = 0;
-    PXUSB_SUBMIT_REPORT         xusbSubmit = NULL;
-    PXUSB_REQUEST_NOTIFICATION  xusbNotify = NULL;
-    PDS4_SUBMIT_REPORT          ds4Submit = NULL;
-    PDS4_REQUEST_NOTIFICATION   ds4Notify = NULL;
-    PXGIP_SUBMIT_REPORT         xgipSubmit = NULL;
-    PXGIP_SUBMIT_INTERRUPT      xgipInterrupt = NULL;
-    PVIGEM_CHECK_VERSION        pCheckVersion = NULL;
-    PXUSB_GET_USER_INDEX        pXusbGetUserIndex = NULL;
-
-    Device = WdfIoQueueGetDevice(Queue);
-
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_QUEUE, "%!FUNC! Entry (device: 0x%p)", Device);
-
-    switch (IoControlCode)
-    {
-#pragma region IOCTL_VIGEM_CHECK_VERSION
-    case IOCTL_VIGEM_CHECK_VERSION:
-
-        TraceEvents(TRACE_LEVEL_INFORMATION,
-            TRACE_QUEUE,
-            "IOCTL_VIGEM_CHECK_VERSION");
-
-        status = WdfRequestRetrieveInputBuffer(Request, sizeof(VIGEM_CHECK_VERSION), (PVOID)&pCheckVersion, &length);
-
-        if (!NT_SUCCESS(status) || length != sizeof(VIGEM_CHECK_VERSION))
-        {
-            status = STATUS_INVALID_PARAMETER;
-            break;
-        }
-
-        status = (pCheckVersion->Version == VIGEM_COMMON_VERSION) ? STATUS_SUCCESS : STATUS_NOT_SUPPORTED;
-
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_QUEUE,
-            "Requested version: 0x%04X, compiled version: 0x%04X",
-            pCheckVersion->Version, VIGEM_COMMON_VERSION);
-
-        break;
-#pragma endregion 
-
-#pragma region IOCTL_VIGEM_PLUGIN_TARGET
-    case IOCTL_VIGEM_PLUGIN_TARGET:
-
-        TraceEvents(TRACE_LEVEL_INFORMATION,
-            TRACE_QUEUE,
-            "IOCTL_VIGEM_PLUGIN_TARGET");
-
-        status = Bus_PlugInDevice(Device, Request, FALSE, &length);
-
-        break;
-#pragma endregion 
-
-#pragma region IOCTL_VIGEM_UNPLUG_TARGET
-    case IOCTL_VIGEM_UNPLUG_TARGET:
-
-        TraceEvents(TRACE_LEVEL_INFORMATION,
-            TRACE_QUEUE,
-            "IOCTL_VIGEM_UNPLUG_TARGET");
-
-        status = Bus_UnPlugDevice(Device, Request, FALSE, &length);
-
-        break;
-#pragma endregion 
-
-#pragma region IOCTL_XUSB_SUBMIT_REPORT
-    case IOCTL_XUSB_SUBMIT_REPORT:
-
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_QUEUE,
-            "IOCTL_XUSB_SUBMIT_REPORT");
-
-        status = WdfRequestRetrieveInputBuffer(Request, sizeof(XUSB_SUBMIT_REPORT), (PVOID)&xusbSubmit, &length);
-
-        if (!NT_SUCCESS(status))
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_QUEUE,
-                "WdfRequestRetrieveInputBuffer failed with status %!STATUS!",
-                status);
-            break;
-        }
-
-        if ((sizeof(XUSB_SUBMIT_REPORT) == xusbSubmit->Size) && (length == InputBufferLength))
-        {
-            // This request only supports a single PDO at a time
-            if (xusbSubmit->SerialNo == 0)
-            {
-                TraceEvents(TRACE_LEVEL_ERROR,
-                    TRACE_QUEUE,
-                    "Invalid serial 0 submitted");
-
-                status = STATUS_INVALID_PARAMETER;
-                break;
-            }
-
-            status = Bus_XusbSubmitReport(Device, xusbSubmit->SerialNo, xusbSubmit, FALSE);
-        }
-
-        break;
-#pragma endregion 
-
-#pragma region IOCTL_XUSB_REQUEST_NOTIFICATION
-    case IOCTL_XUSB_REQUEST_NOTIFICATION:
-
-        TraceEvents(TRACE_LEVEL_INFORMATION,
-            TRACE_QUEUE,
-            "IOCTL_XUSB_REQUEST_NOTIFICATION");
-
-        // Don't accept the request if the output buffer can't hold the results
-        if (OutputBufferLength < sizeof(XUSB_REQUEST_NOTIFICATION))
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_QUEUE,
-                "Output buffer %d too small, require at least %d",
-                (int)OutputBufferLength, (int)sizeof(XUSB_REQUEST_NOTIFICATION));
-            break;
-        }
-
-        status = WdfRequestRetrieveInputBuffer(Request, sizeof(XUSB_REQUEST_NOTIFICATION), (PVOID)&xusbNotify, &length);
-
-        if (!NT_SUCCESS(status))
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_QUEUE,
-                "WdfRequestRetrieveInputBuffer failed with status %!STATUS!",
-                status);
-            break;
-        }
-
-        if ((sizeof(XUSB_REQUEST_NOTIFICATION) == xusbNotify->Size) && (length == InputBufferLength))
-        {
-            // This request only supports a single PDO at a time
-            if (xusbNotify->SerialNo == 0)
-            {
-                TraceEvents(TRACE_LEVEL_ERROR,
-                    TRACE_QUEUE,
-                    "Invalid serial 0 submitted");
-
-                status = STATUS_INVALID_PARAMETER;
-                break;
-            }
-
-            status = Bus_QueueNotification(Device, xusbNotify->SerialNo, Request);
-        }
-
-        break;
-#pragma endregion 
-
-#pragma region IOCTL_DS4_SUBMIT_REPORT
-    case IOCTL_DS4_SUBMIT_REPORT:
-
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_QUEUE,
-            "IOCTL_DS4_SUBMIT_REPORT");
-
-        status = WdfRequestRetrieveInputBuffer(Request, sizeof(DS4_SUBMIT_REPORT), (PVOID)&ds4Submit, &length);
-
-        if (!NT_SUCCESS(status))
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_QUEUE,
-                "WdfRequestRetrieveInputBuffer failed with status %!STATUS!",
-                status);
-            break;
-        }
-
-        if ((sizeof(DS4_SUBMIT_REPORT) == ds4Submit->Size) && (length == InputBufferLength))
-        {
-            // This request only supports a single PDO at a time
-            if (ds4Submit->SerialNo == 0)
-            {
-                TraceEvents(TRACE_LEVEL_ERROR,
-                    TRACE_QUEUE,
-                    "Invalid serial 0 submitted");
-
-                status = STATUS_INVALID_PARAMETER;
-                break;
-            }
-
-            status = Bus_Ds4SubmitReport(Device, ds4Submit->SerialNo, ds4Submit, FALSE);
-        }
-
-        break;
-#pragma endregion 
-
-#pragma region IOCTL_DS4_REQUEST_NOTIFICATION
-    case IOCTL_DS4_REQUEST_NOTIFICATION:
-
-        TraceEvents(TRACE_LEVEL_INFORMATION,
-            TRACE_QUEUE,
-            "IOCTL_DS4_REQUEST_NOTIFICATION");
-
-        // Don't accept the request if the output buffer can't hold the results
-        if (OutputBufferLength < sizeof(DS4_REQUEST_NOTIFICATION))
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_QUEUE,
-                "Output buffer %d too small, require at least %d",
-                (int)OutputBufferLength, (int)sizeof(DS4_REQUEST_NOTIFICATION));
-            break;
-        }
-
-        status = WdfRequestRetrieveInputBuffer(Request, sizeof(DS4_REQUEST_NOTIFICATION), (PVOID)&ds4Notify, &length);
-
-        if (!NT_SUCCESS(status))
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_QUEUE,
-                "WdfRequestRetrieveInputBuffer failed with status %!STATUS!",
-                status);
-            break;
-        }
-
-        if ((sizeof(DS4_REQUEST_NOTIFICATION) == ds4Notify->Size) && (length == InputBufferLength))
-        {
-            // This request only supports a single PDO at a time
-            if (ds4Notify->SerialNo == 0)
-            {
-                TraceEvents(TRACE_LEVEL_ERROR,
-                    TRACE_QUEUE,
-                    "Invalid serial 0 submitted");
-
-                status = STATUS_INVALID_PARAMETER;
-                break;
-            }
-
-            status = Bus_QueueNotification(Device, ds4Notify->SerialNo, Request);
-        }
-
-        break;
-#pragma endregion 
-
-#pragma region IOCTL_XGIP_SUBMIT_REPORT
-    case IOCTL_XGIP_SUBMIT_REPORT:
-
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_QUEUE,
-            "IOCTL_XGIP_SUBMIT_REPORT");
-
-        status = WdfRequestRetrieveInputBuffer(Request, sizeof(XGIP_SUBMIT_REPORT), (PVOID)&xgipSubmit, &length);
-
-        if (!NT_SUCCESS(status))
-        {
-            KdPrint((DRIVERNAME "WdfRequestRetrieveInputBuffer failed 0x%x\n", status));
-            break;
-        }
-
-        if ((sizeof(XGIP_SUBMIT_REPORT) == xgipSubmit->Size) && (length == InputBufferLength))
-        {
-            // This request only supports a single PDO at a time
-            if (xgipSubmit->SerialNo == 0)
-            {
-                status = STATUS_INVALID_PARAMETER;
-                break;
-            }
-
-            status = Bus_XgipSubmitReport(Device, xgipSubmit->SerialNo, xgipSubmit, FALSE);
-        }
-
-        break;
-#pragma endregion 
-
-#pragma region IOCTL_XGIP_SUBMIT_INTERRUPT
-    case IOCTL_XGIP_SUBMIT_INTERRUPT:
-
-        KdPrint((DRIVERNAME "IOCTL_XGIP_SUBMIT_INTERRUPT\n"));
-
-        status = WdfRequestRetrieveInputBuffer(Request, sizeof(XGIP_SUBMIT_INTERRUPT), (PVOID)&xgipInterrupt, &length);
-
-        if (!NT_SUCCESS(status))
-        {
-            KdPrint((DRIVERNAME "WdfRequestRetrieveInputBuffer failed 0x%x\n", status));
-            break;
-        }
-
-        if ((sizeof(XGIP_SUBMIT_INTERRUPT) == xgipInterrupt->Size) && (length == InputBufferLength))
-        {
-            // This request only supports a single PDO at a time
-            if (xgipInterrupt->SerialNo == 0)
-            {
-                status = STATUS_INVALID_PARAMETER;
-                break;
-            }
-
-            status = Bus_XgipSubmitInterrupt(Device, xgipSubmit->SerialNo, xgipInterrupt, FALSE);
-        }
-
-        break;
-#pragma endregion 
-
-#pragma region IOCTL_XUSB_GET_USER_INDEX
-    case IOCTL_XUSB_GET_USER_INDEX:
-
-        KdPrint((DRIVERNAME "IOCTL_XUSB_GET_USER_INDEX"));
-
-        // Don't accept the request if the output buffer can't hold the results
-        if (OutputBufferLength < sizeof(XUSB_GET_USER_INDEX))
-        {
-            KdPrint((DRIVERNAME "IOCTL_XUSB_GET_USER_INDEX: output buffer too small: %ul\n", OutputBufferLength));
-            break;
-        }
-
-        status = WdfRequestRetrieveInputBuffer(
-            Request, 
-            sizeof(XUSB_GET_USER_INDEX), 
-            (PVOID)&pXusbGetUserIndex, 
-            &length);
-
-        if (!NT_SUCCESS(status))
-        {
-            KdPrint((DRIVERNAME "WdfRequestRetrieveInputBuffer failed 0x%x\n", status));
-            break;
-        }
-
-        if ((sizeof(XUSB_GET_USER_INDEX) == pXusbGetUserIndex->Size) && (length == InputBufferLength))
-        {
-            // This request only supports a single PDO at a time
-            if (pXusbGetUserIndex->SerialNo == 0)
-            {
-                status = STATUS_INVALID_PARAMETER;
-                break;
-            }
-
-            status = Xusb_GetUserIndex(Device, pXusbGetUserIndex);
-        }
-
-        break;
-#pragma endregion
-
-    default:
-
-        TraceEvents(TRACE_LEVEL_WARNING,
-            TRACE_QUEUE,
-            "Unknown I/O control code 0x%X", IoControlCode);
-
-        break; // default status is STATUS_INVALID_PARAMETER
-    }
-
-    if (status != STATUS_PENDING)
-    {
-        WdfRequestCompleteWithInformation(Request, status, length);
-    }
-    
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_QUEUE, "%!FUNC! Exit with status %!STATUS!", status);
-}
-
-//
-// Gets called upon driver-to-driver communication.
-// 
-// TODO: incomplete and unused currently
-// 
-VOID Bus_EvtIoInternalDeviceControl(
-    _In_ WDFQUEUE   Queue,
-    _In_ WDFREQUEST Request,
-    _In_ size_t     OutputBufferLength,
-    _In_ size_t     InputBufferLength,
-    _In_ ULONG      IoControlCode
-)
-{
-    NTSTATUS    status = STATUS_INVALID_PARAMETER;
-    WDFDEVICE   Device;
-    size_t      length = 0;
-
-    UNREFERENCED_PARAMETER(OutputBufferLength);
-    UNREFERENCED_PARAMETER(InputBufferLength);
-
-    Device = WdfIoQueueGetDevice(Queue);
-
-    KdPrint((DRIVERNAME "Bus_EvtIoInternalDeviceControl: 0x%p\n", Device));
-
-    switch (IoControlCode)
-    {
-    case IOCTL_VIGEM_PLUGIN_TARGET:
-
-        KdPrint((DRIVERNAME "IOCTL_VIGEM_PLUGIN_TARGET\n"));
-
-        status = Bus_PlugInDevice(Device, Request, TRUE, &length);
-
-        break;
-
-    case IOCTL_VIGEM_UNPLUG_TARGET:
-
-        KdPrint((DRIVERNAME "IOCTL_VIGEM_UNPLUG_TARGET\n"));
-
-        status = Bus_UnPlugDevice(Device, Request, TRUE, &length);
-
-        break;
-    }
-
-    if (status != STATUS_PENDING)
-    {
-        WdfRequestCompleteWithInformation(Request, status, length);
-    }
-}
-
-//
-// Catches unsupported requests.
-// 
-VOID Bus_EvtIoDefault(
-    _In_ WDFQUEUE Queue,
-    _In_ WDFREQUEST Request
-)
-{
-    UNREFERENCED_PARAMETER(Queue);
-    UNREFERENCED_PARAMETER(Request);
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_QUEUE, "%!FUNC! Entry");
-
-    WdfRequestComplete(Request, STATUS_INVALID_DEVICE_REQUEST);
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_QUEUE, "%!FUNC! Exit");
-}
--- a/sys/Queue.cpp
+++ b/sys/Queue.cpp
@@ -0,0 +1,420 @@
+/*
+* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
+*
+* MIT License
+*
+* Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
+
+
+#include "busenum.h"
+#include "queue.tmh"
+
+#include "EmulationTargetPDO.hpp"
+#include "XusbPdo.hpp"
+#include "Ds4Pdo.hpp"
+
+
+#ifdef ALLOC_PRAGMA
+#pragma alloc_text (PAGE, Bus_EvtIoDefault)
+#endif
+
+using ViGEm::Bus::Core::PDO_IDENTIFICATION_DESCRIPTION;
+using ViGEm::Bus::Core::EmulationTargetPDO;
+using ViGEm::Bus::Targets::EmulationTargetXUSB;
+using ViGEm::Bus::Targets::EmulationTargetDS4;
+
+
+EXTERN_C_START
+
+//
+// Responds to I/O control requests sent to the FDO.
+// 
+VOID Bus_EvtIoDeviceControl(
+	IN WDFQUEUE Queue,
+	IN WDFREQUEST Request,
+	IN size_t OutputBufferLength,
+	IN size_t InputBufferLength,
+	IN ULONG IoControlCode
+)
+{
+	NTSTATUS status = STATUS_INVALID_PARAMETER;
+	WDFDEVICE Device;
+	size_t length = 0;
+	PXUSB_SUBMIT_REPORT xusbSubmit = nullptr;
+	PXUSB_REQUEST_NOTIFICATION xusbNotify = nullptr;
+	PDS4_SUBMIT_REPORT ds4Submit = nullptr;
+	PDS4_REQUEST_NOTIFICATION ds4Notify = nullptr;
+	PVIGEM_CHECK_VERSION pCheckVersion = nullptr;
+	PXUSB_GET_USER_INDEX pXusbGetUserIndex = nullptr;
+	EmulationTargetPDO* pdo;
+
+	Device = WdfIoQueueGetDevice(Queue);
+
+	TraceDbg(TRACE_QUEUE, "%!FUNC! Entry (device: 0x%p)", Device);
+
+	switch (IoControlCode)
+	{
+#pragma region IOCTL_VIGEM_CHECK_VERSION
+
+	case IOCTL_VIGEM_CHECK_VERSION:
+
+		TraceDbg(TRACE_QUEUE, "IOCTL_VIGEM_CHECK_VERSION");
+
+		status = WdfRequestRetrieveInputBuffer(
+			Request,
+			sizeof(VIGEM_CHECK_VERSION),
+			reinterpret_cast<PVOID*>(&pCheckVersion),
+			&length
+		);
+
+		if (!NT_SUCCESS(status) || length != sizeof(VIGEM_CHECK_VERSION))
+		{
+			status = STATUS_INVALID_PARAMETER;
+			break;
+		}
+
+		status = (pCheckVersion->Version == VIGEM_COMMON_VERSION) ? STATUS_SUCCESS : STATUS_NOT_SUPPORTED;
+
+		TraceEvents(TRACE_LEVEL_VERBOSE,
+		            TRACE_QUEUE,
+		            "Requested version: 0x%04X, compiled version: 0x%04X",
+		            pCheckVersion->Version, VIGEM_COMMON_VERSION);
+
+		break;
+
+#pragma endregion
+
+#pragma region IOCTL_VIGEM_PLUGIN_TARGET
+
+	case IOCTL_VIGEM_PLUGIN_TARGET:
+
+		TraceDbg(TRACE_QUEUE, "IOCTL_VIGEM_PLUGIN_TARGET");
+
+		status = Bus_PlugInDevice(Device, Request, FALSE, &length);
+
+		break;
+
+#pragma endregion
+
+#pragma region IOCTL_VIGEM_UNPLUG_TARGET
+
+	case IOCTL_VIGEM_UNPLUG_TARGET:
+
+		TraceDbg(TRACE_QUEUE, "IOCTL_VIGEM_UNPLUG_TARGET");
+
+		status = Bus_UnPlugDevice(Device, Request, FALSE, &length);
+
+		break;
+
+#pragma endregion
+
+#pragma region IOCTL_XUSB_SUBMIT_REPORT
+
+	case IOCTL_XUSB_SUBMIT_REPORT:
+
+		TraceDbg(TRACE_QUEUE, "IOCTL_XUSB_SUBMIT_REPORT");
+
+		status = WdfRequestRetrieveInputBuffer(
+			Request,
+			sizeof(XUSB_SUBMIT_REPORT),
+			reinterpret_cast<PVOID*>(&xusbSubmit),
+			&length
+		);
+
+		if (!NT_SUCCESS(status))
+		{
+			TraceEvents(TRACE_LEVEL_ERROR,
+			            TRACE_QUEUE,
+			            "WdfRequestRetrieveInputBuffer failed with status %!STATUS!",
+			            status);
+			break;
+		}
+
+		if ((sizeof(XUSB_SUBMIT_REPORT) == xusbSubmit->Size) && (length == InputBufferLength))
+		{
+			// This request only supports a single PDO at a time
+			if (xusbSubmit->SerialNo == 0)
+			{
+				TraceEvents(TRACE_LEVEL_ERROR,
+				            TRACE_QUEUE,
+				            "Invalid serial 0 submitted");
+
+				status = STATUS_INVALID_PARAMETER;
+				break;
+			}
+
+			if (!EmulationTargetPDO::GetPdoByTypeAndSerial(Device, Xbox360Wired, xusbSubmit->SerialNo, &pdo))
+				status = STATUS_DEVICE_DOES_NOT_EXIST;
+			else
+				status = pdo->SubmitReport(xusbSubmit);
+		}
+
+		break;
+
+#pragma endregion
+
+#pragma region IOCTL_XUSB_REQUEST_NOTIFICATION
+
+	case IOCTL_XUSB_REQUEST_NOTIFICATION:
+
+		TraceDbg(TRACE_QUEUE, "IOCTL_XUSB_REQUEST_NOTIFICATION");
+
+		// Don't accept the request if the output buffer can't hold the results
+		if (OutputBufferLength < sizeof(XUSB_REQUEST_NOTIFICATION))
+		{
+			TraceEvents(TRACE_LEVEL_ERROR,
+			            TRACE_QUEUE,
+			            "Output buffer %d too small, require at least %d",
+			            static_cast<int>(OutputBufferLength), static_cast<int>(sizeof(XUSB_REQUEST_NOTIFICATION)));
+			break;
+		}
+
+		status = WdfRequestRetrieveInputBuffer(
+			Request,
+			sizeof(XUSB_REQUEST_NOTIFICATION),
+			reinterpret_cast<PVOID*>(&xusbNotify),
+			&length
+		);
+
+		if (!NT_SUCCESS(status))
+		{
+			TraceEvents(TRACE_LEVEL_ERROR,
+			            TRACE_QUEUE,
+			            "WdfRequestRetrieveInputBuffer failed with status %!STATUS!",
+			            status);
+			break;
+		}
+
+		if ((sizeof(XUSB_REQUEST_NOTIFICATION) == xusbNotify->Size) && (length == InputBufferLength))
+		{
+			// This request only supports a single PDO at a time
+			if (xusbNotify->SerialNo == 0)
+			{
+				TraceEvents(TRACE_LEVEL_ERROR,
+				            TRACE_QUEUE,
+				            "Invalid serial 0 submitted");
+
+				status = STATUS_INVALID_PARAMETER;
+				break;
+			}
+
+			if (!EmulationTargetPDO::GetPdoByTypeAndSerial(Device, Xbox360Wired, xusbNotify->SerialNo, &pdo))
+				status = STATUS_DEVICE_DOES_NOT_EXIST;
+			else
+			{
+				status = pdo->EnqueueNotification(Request);
+
+				status = (NT_SUCCESS(status)) ? STATUS_PENDING : status;
+			}
+		}
+
+		break;
+
+#pragma endregion
+
+#pragma region IOCTL_DS4_SUBMIT_REPORT
+
+	case IOCTL_DS4_SUBMIT_REPORT:
+
+		TraceDbg(TRACE_QUEUE, "IOCTL_DS4_SUBMIT_REPORT");
+
+		status = WdfRequestRetrieveInputBuffer(
+			Request,
+			sizeof(DS4_SUBMIT_REPORT),
+			reinterpret_cast<PVOID*>(&ds4Submit),
+			&length
+		);
+
+		if (!NT_SUCCESS(status))
+		{
+			TraceEvents(TRACE_LEVEL_ERROR,
+			            TRACE_QUEUE,
+			            "WdfRequestRetrieveInputBuffer failed with status %!STATUS!",
+			            status);
+			break;
+		}
+
+		if ((sizeof(DS4_SUBMIT_REPORT) == ds4Submit->Size) && (length == InputBufferLength))
+		{
+			// This request only supports a single PDO at a time
+			if (ds4Submit->SerialNo == 0)
+			{
+				TraceEvents(TRACE_LEVEL_ERROR,
+				            TRACE_QUEUE,
+				            "Invalid serial 0 submitted");
+
+				status = STATUS_INVALID_PARAMETER;
+				break;
+			}
+
+			if (!EmulationTargetPDO::GetPdoByTypeAndSerial(Device, DualShock4Wired, ds4Submit->SerialNo, &pdo))
+				status = STATUS_DEVICE_DOES_NOT_EXIST;
+			else
+				status = pdo->SubmitReport(ds4Submit);
+		}
+
+		break;
+
+#pragma endregion
+
+#pragma region IOCTL_DS4_REQUEST_NOTIFICATION
+
+	case IOCTL_DS4_REQUEST_NOTIFICATION:
+
+		TraceDbg(TRACE_QUEUE, "IOCTL_DS4_REQUEST_NOTIFICATION");
+
+		// Don't accept the request if the output buffer can't hold the results
+		if (OutputBufferLength < sizeof(DS4_REQUEST_NOTIFICATION))
+		{
+			TraceEvents(TRACE_LEVEL_ERROR,
+			            TRACE_QUEUE,
+			            "Output buffer %d too small, require at least %d",
+			            static_cast<int>(OutputBufferLength), static_cast<int>(sizeof(DS4_REQUEST_NOTIFICATION)));
+			break;
+		}
+
+		status = WdfRequestRetrieveInputBuffer(
+			Request,
+			sizeof(DS4_REQUEST_NOTIFICATION),
+			reinterpret_cast<PVOID*>(&ds4Notify),
+			&length
+		);
+
+		if (!NT_SUCCESS(status))
+		{
+			TraceEvents(TRACE_LEVEL_ERROR,
+			            TRACE_QUEUE,
+			            "WdfRequestRetrieveInputBuffer failed with status %!STATUS!",
+			            status);
+			break;
+		}
+
+		if ((sizeof(DS4_REQUEST_NOTIFICATION) == ds4Notify->Size) && (length == InputBufferLength))
+		{
+			// This request only supports a single PDO at a time
+			if (ds4Notify->SerialNo == 0)
+			{
+				TraceEvents(TRACE_LEVEL_ERROR,
+				            TRACE_QUEUE,
+				            "Invalid serial 0 submitted");
+
+				status = STATUS_INVALID_PARAMETER;
+				break;
+			}
+
+			if (!EmulationTargetPDO::GetPdoByTypeAndSerial(Device, DualShock4Wired, ds4Notify->SerialNo, &pdo))
+				status = STATUS_DEVICE_DOES_NOT_EXIST;
+			else
+			{
+				status = pdo->EnqueueNotification(Request);
+
+				status = (NT_SUCCESS(status)) ? STATUS_PENDING : status;
+			}
+		}
+
+		break;
+
+#pragma endregion
+
+#pragma region IOCTL_XUSB_GET_USER_INDEX
+
+	case IOCTL_XUSB_GET_USER_INDEX:
+
+		TraceDbg(TRACE_QUEUE, "IOCTL_XUSB_GET_USER_INDEX");
+
+		// Don't accept the request if the output buffer can't hold the results
+		if (OutputBufferLength < sizeof(XUSB_GET_USER_INDEX))
+		{
+			KdPrint((DRIVERNAME "IOCTL_XUSB_GET_USER_INDEX: output buffer too small: %ul\n", OutputBufferLength));
+			break;
+		}
+
+		status = WdfRequestRetrieveInputBuffer(
+			Request,
+			sizeof(XUSB_GET_USER_INDEX),
+			reinterpret_cast<PVOID*>(&pXusbGetUserIndex),
+			&length);
+
+		if (!NT_SUCCESS(status))
+		{
+			KdPrint((DRIVERNAME "WdfRequestRetrieveInputBuffer failed 0x%x\n", status));
+			break;
+		}
+
+		if ((sizeof(XUSB_GET_USER_INDEX) == pXusbGetUserIndex->Size) && (length == InputBufferLength))
+		{
+			// This request only supports a single PDO at a time
+			if (pXusbGetUserIndex->SerialNo == 0)
+			{
+				status = STATUS_INVALID_PARAMETER;
+				break;
+			}
+
+			if (!EmulationTargetPDO::GetPdoByTypeAndSerial(Device, Xbox360Wired, pXusbGetUserIndex->SerialNo, &pdo))
+			{
+				status = STATUS_DEVICE_DOES_NOT_EXIST;
+				break;
+			}
+
+			status = static_cast<EmulationTargetXUSB*>(pdo)->GetUserIndex(&pXusbGetUserIndex->UserIndex);
+		}
+
+		break;
+
+#pragma endregion
+
+	default:
+
+		TraceEvents(TRACE_LEVEL_WARNING,
+		            TRACE_QUEUE,
+		            "Unknown I/O control code 0x%X", IoControlCode);
+
+		break; // default status is STATUS_INVALID_PARAMETER
+	}
+
+	if (status != STATUS_PENDING)
+	{
+		WdfRequestCompleteWithInformation(Request, status, length);
+	}
+
+	TraceDbg(TRACE_QUEUE, "%!FUNC! Exit with status %!STATUS!", status);
+}
+
+//
+// Catches unsupported requests.
+// 
+VOID Bus_EvtIoDefault(
+	_In_ WDFQUEUE Queue,
+	_In_ WDFREQUEST Request
+)
+{
+	UNREFERENCED_PARAMETER(Queue);
+	UNREFERENCED_PARAMETER(Request);
+
+	TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_QUEUE, "%!FUNC! Entry");
+
+	WdfRequestComplete(Request, STATUS_INVALID_DEVICE_REQUEST);
+
+	TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_QUEUE, "%!FUNC! Exit");
+}
+
+EXTERN_C_END
--- a/sys/Queue.hpp
+++ b/sys/Queue.hpp
@@ -3,7 +3,7 @@
 *
 * MIT License
 *
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
+* Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,9 @@

 #pragma once

+EXTERN_C_START
+
 EVT_WDF_IO_QUEUE_IO_DEFAULT Bus_EvtIoDefault;
 EVT_WDF_IO_QUEUE_IO_DEVICE_CONTROL Bus_EvtIoDeviceControl;
-EVT_WDF_IO_QUEUE_IO_INTERNAL_DEVICE_CONTROL Bus_EvtIoInternalDeviceControl;
+
+EXTERN_C_END
--- a/sys/RCa08996
+++ b/sys/RCa08996
--- a/sys/README.md
+++ b/sys/README.md
@@ -1,17 +0,0 @@
-# ViGEm Bus Driver
-
-Currently supports emulation of the following USB gamepads:
- [Microsoft Xbox 360 Controller](https://en.wikipedia.org/wiki/Xbox_360_controller)
- [Sony DualShock 4 Controller](https://en.wikipedia.org/wiki/DualShock#DualShock_4)
- [Microsoft Xbox One Controller](https://en.wikipedia.org/wiki/Xbox_One_Controller)
-  - Experimental; not ready for stable release yet
-
-## Necessary preparations for Windows 7
-Before installing the bus driver on Windows 7 (x86 or x64) the following 3rd party software has to be installed:
- * [Xbox 360 Accessories Software 1.2](https://www.microsoft.com/accessories/en-us/products/gaming/xbox-360-controller-for-windows/52a-00004#techspecs-connect) (contains the missing device drivers)
- * [Microsoft Security Advisory 3033929 Update](https://technet.microsoft.com/en-us/library/security/3033929) has to be installed to support the drivers signature. Download links:
-   * [Security Update for Windows 7 (KB3033929)](https://www.microsoft.com/en-us/download/details.aspx?id=46078)
-   * [Security Update for Windows 7 for x64-based Systems (KB3033929)](https://www.microsoft.com/en-us/download/details.aspx?id=46148)
-
-## Installation
-[Follow the installation instructions](https://github.com/nefarius/ViGEm/wiki/Driver-Installation).
--- a/sys/UsbPdo.h
+++ b/sys/UsbPdo.h
@@ -1,53 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#pragma once
-
-BOOLEAN USB_BUSIFFN UsbPdo_IsDeviceHighSpeed(IN PVOID BusContext);
-NTSTATUS USB_BUSIFFN UsbPdo_QueryBusInformation(
-    IN PVOID BusContext,
-    IN ULONG Level,
-    IN OUT PVOID BusInformationBuffer,
-    IN OUT PULONG BusInformationBufferLength,
-    OUT PULONG BusInformationActualLength
-);
-NTSTATUS USB_BUSIFFN UsbPdo_SubmitIsoOutUrb(IN PVOID BusContext, IN PURB Urb);
-NTSTATUS USB_BUSIFFN UsbPdo_QueryBusTime(IN PVOID BusContext, IN OUT PULONG CurrentUsbFrame);
-VOID USB_BUSIFFN UsbPdo_GetUSBDIVersion(
-    IN PVOID BusContext,
-    IN OUT PUSBD_VERSION_INFORMATION VersionInformation,
-    IN OUT PULONG HcdCapabilities
-);
-NTSTATUS UsbPdo_GetDeviceDescriptorType(PURB urb, PPDO_DEVICE_DATA pCommon);
-NTSTATUS UsbPdo_GetConfigurationDescriptorType(PURB urb, PPDO_DEVICE_DATA pCommon);
-NTSTATUS UsbPdo_GetStringDescriptorType(PURB urb, PPDO_DEVICE_DATA pCommon);
-NTSTATUS UsbPdo_SelectConfiguration(PURB urb, PPDO_DEVICE_DATA pCommon);
-NTSTATUS UsbPdo_SelectInterface(PURB urb, PPDO_DEVICE_DATA pCommon);
-NTSTATUS UsbPdo_BulkOrInterruptTransfer(PURB urb, WDFDEVICE Device, WDFREQUEST Request);
-NTSTATUS UsbPdo_AbortPipe(WDFDEVICE Device);
-NTSTATUS UsbPdo_ClassInterface(PURB urb, WDFDEVICE Device, PPDO_DEVICE_DATA pCommon);
-NTSTATUS UsbPdo_GetDescriptorFromInterface(PURB urb, PPDO_DEVICE_DATA pCommon);
--- a/sys/Util.h
+++ b/sys/Util.h
@@ -1,52 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#pragma once
-
-//
-// Returns the current caller process id.
-// 
-#define CURRENT_PROCESS_ID() ((DWORD)((DWORD_PTR)PsGetCurrentProcessId() & 0xFFFFFFFF))
-
-#define IS_OWNER(_pdo_) (_pdo_->OwnerProcessId == CURRENT_PROCESS_ID())
-
-//
-// Represents a MAC address.
-//
-typedef struct _MAC_ADDRESS
-{
-    UCHAR Vendor0;
-    UCHAR Vendor1;
-    UCHAR Vendor2;
-    UCHAR Nic0;
-    UCHAR Nic1;
-    UCHAR Nic2;
-} MAC_ADDRESS, *PMAC_ADDRESS;
-
-
-VOID ReverseByteArray(PUCHAR Array, INT Length);
-VOID GenerateRandomMacAddress(PMAC_ADDRESS Address);
--- a/sys/ViGEmBus.inf
+++ b/sys/ViGEmBus.inf
@@ -2,7 +2,7 @@
 ; 
 ; MIT License
 ; 
-; Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
+; Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
 ; 
 ; Permission is hereby granted, free of charge, to any person obtaining a copy
 ; of this software and associated documentation files (the "Software"), to deal
--- a/sys/ViGEmBus.rc
+++ b/sys/ViGEmBus.rc
@@ -1,100 +1,49 @@
-// Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
+// Include the necessary resources
 //
-// Generated from the TEXTINCLUDE 2 resource.
+#include <winver.h>
+#include <ntdef.h>
+
+#ifdef RC_INVOKED
+
 //
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// German (Austria) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEA)
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN
-#pragma code_page(1252)
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
+// Set up debug information
 //
+#if DBG
+#define VER_DBG VS_FF_DEBUG
+#else
+#define VER_DBG 0
+#endif

-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
+// ------- version info -------------------------------------------------------

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,14,3,0
- PRODUCTVERSION 1,14,3,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0xe9L
- FILESUBTYPE 0x0L
+FILEVERSION             1,16,200,0
+PRODUCTVERSION          1,16,200,0
+FILEFLAGSMASK           VS_FFI_FILEFLAGSMASK
+FILEFLAGS               VER_DBG
+FILEOS                  VOS_NT
+FILETYPE                VFT_DRV
+FILESUBTYPE             VFT2_DRV_SYSTEM
 BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000904b0"
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
        BEGIN
-            VALUE "CompanyName", "Benjamin H<>glinger-Stelzer"
-            VALUE "FileDescription", "Virtual Gamepad Emulation Bus Driver"
-VALUE "FileVersion", "1.14.3.0"
-            VALUE "InternalName", "Virtual Gamepad Emulation Bus Driver"
-            VALUE "LegalCopyright", "Copyright (C) Benjamin H<>glinger-Stelzer 2016"
-            VALUE "OriginalFilename", "vigembus.sys"
-            VALUE "ProductName", "Virtual Gamepad Emulation Bus Driver"
-VALUE "ProductVersion", "1.14.3.0"
+		VALUE "Comments",         "Virtual Gamepad Emulation Framework Bus Driver"
+		VALUE "CompanyName",      "Nefarius Software Solutions e.U."
+		VALUE "FileDescription",  "Virtual Gamepad Emulation Framework Bus Driver"
+		VALUE "FileVersion",      "1.16.200.0"
+		VALUE "InternalName",     "Virtual Gamepad Emulation Framework Bus Driver"
+		VALUE "LegalCopyright",   "(C) 2016-2019 Nefarius Software Solutions e.U."
+		VALUE "OriginalFilename", "ViGEmBus.sys"
+		VALUE "ProductName",      "Virtual Gamepad Emulation Framework Bus Driver"
+		VALUE "ProductVersion",	  "1.16.200.0"
        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x9, 1200
-    END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x0409,1200
+	END
 END
-
-#endif    // German (Austria) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+#endif
--- a/sys/ViGEmBus.vcxproj
+++ b/sys/ViGEmBus.vcxproj
@@ -122,6 +122,7 @@
      <WppRecorderEnabled>true</WppRecorderEnabled>
      <WppEnabled>true</WppEnabled>
      <WppScanConfigurationData>trace.h</WppScanConfigurationData>
+      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -139,6 +140,7 @@
      <WppRecorderEnabled>true</WppRecorderEnabled>
      <WppEnabled>true</WppEnabled>
      <WppScanConfigurationData>trace.h</WppScanConfigurationData>
+      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -153,6 +155,7 @@
      <WppRecorderEnabled>true</WppRecorderEnabled>
      <WppEnabled>true</WppEnabled>
      <WppScanConfigurationData>trace.h</WppScanConfigurationData>
+      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -171,10 +174,12 @@
      <WppRecorderEnabled>true</WppRecorderEnabled>
      <WppEnabled>true</WppEnabled>
      <WppScanConfigurationData>trace.h</WppScanConfigurationData>
+      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
    <Inf Include="ViGEmBus.inf" />
+    <Inf Include="ViGEmBus_SingleArch.inf" />
  </ItemGroup>
  <ItemGroup>
    <FilesToPackage Include="$(TargetPath)" />
@@ -183,31 +188,25 @@
    <ClInclude Include="$(SolutionDir)\Include\ViGEmBusDriver.h" />
    <ClInclude Include="..\client\include\ViGEm\km\BusShared.h" />
    <ClInclude Include="busenum.h" />
-    <ClInclude Include="ByteArray.h" />
-    <ClInclude Include="Context.h" />
-    <ClInclude Include="Ds4.h" />
-    <ClInclude Include="Queue.h" />
+    <ClInclude Include="CRTCPP.hpp" />
+    <ClInclude Include="Ds4Pdo.hpp" />
+    <ClInclude Include="EmulationTargetPDO.hpp" />
+    <ClInclude Include="Queue.hpp" />
    <ClInclude Include="resource.h" />
    <ClInclude Include="trace.h" />
-    <ClInclude Include="UsbPdo.h" />
-    <ClInclude Include="Util.h" />
-    <ClInclude Include="Xgip.h" />
-    <ClInclude Include="Xusb.h" />
+    <ClInclude Include="XusbPdo.hpp" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="ViGEmBus.rc" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="busenum.c" />
-    <ClCompile Include="buspdo.c" />
-    <ClCompile Include="ByteArray.c" />
-    <ClCompile Include="Driver.c" />
-    <ClCompile Include="Ds4.c" />
-    <ClCompile Include="Queue.c" />
-    <ClCompile Include="UsbPdo.c" />
-    <ClCompile Include="Util.c" />
-    <ClCompile Include="xgip.c" />
-    <ClCompile Include="xusb.c" />
+    <ClCompile Include="busenum.cpp" />
+    <ClCompile Include="buspdo.cpp" />
+    <ClCompile Include="Driver.cpp" />
+    <ClCompile Include="Ds4Pdo.cpp" />
+    <ClCompile Include="EmulationTargetPDO.cpp" />
+    <ClCompile Include="Queue.cpp" />
+    <ClCompile Include="XusbPdo.cpp" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/sys/ViGEmBus.vcxproj.filters
+++ b/sys/ViGEmBus.vcxproj.filters
@@ -20,40 +20,25 @@
    <Filter Include="Header Files\Common">
      <UniqueIdentifier>{bbf85b1d-5a75-4302-af4e-46627fcf0d78}</UniqueIdentifier>
    </Filter>
+    <Filter Include="Header Files\Targets">
+      <UniqueIdentifier>{b00da32a-ce46-490d-9e77-95bb90925995}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Targets">
+      <UniqueIdentifier>{3a87fd70-9882-47c4-a23b-50dd0b42b0f8}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <Inf Include="ViGEmBus.inf">
      <Filter>Driver Files</Filter>
    </Inf>
+    <Inf Include="ViGEmBus_SingleArch.inf">
+      <Filter>Driver Files</Filter>
+    </Inf>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="busenum.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UsbPdo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Xusb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Ds4.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Xgip.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ByteArray.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\Include\ViGEmBusDriver.h">
      <Filter>Header Files\Common</Filter>
    </ClInclude>
@@ -63,37 +48,51 @@
    <ClInclude Include="..\client\include\ViGEm\km\BusShared.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="XusbPdo.hpp">
+      <Filter>Header Files\Targets</Filter>
+    </ClInclude>
+    <ClInclude Include="EmulationTargetPDO.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CRTCPP.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Ds4Pdo.hpp">
+      <Filter>Header Files\Targets</Filter>
+    </ClInclude>
+    <ClInclude Include="Queue.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="busenum.c">
+    <ClCompile Include="XusbPdo.cpp">
+      <Filter>Source Files\Targets</Filter>
+    </ClCompile>
+    <ClCompile Include="EmulationTargetPDO.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="buspdo.c">
+    <ClCompile Include="Ds4Pdo.cpp">
+      <Filter>Source Files\Targets</Filter>
+    </ClCompile>
+    <ClCompile Include="buspdo.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="xusb.c">
+    <ClCompile Include="busenum.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="xgip.c">
+    <ClCompile Include="Queue.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="Queue.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Ds4.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UsbPdo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Util.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Driver.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ByteArray.c">
+    <ClCompile Include="Driver.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ViGEmBus.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
--- a/sys/ViGEmBus_SingleArch.inf
+++ b/sys/ViGEmBus_SingleArch.inf
@@ -0,0 +1,100 @@
+; Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
+; 
+; MIT License
+; 
+; Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
+; 
+; Permission is hereby granted, free of charge, to any person obtaining a copy
+; of this software and associated documentation files (the "Software"), to deal
+; in the Software without restriction, including without limitation the rights
+; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+; copies of the Software, and to permit persons to whom the Software is
+; furnished to do so, subject to the following conditions:
+; 
+; The above copyright notice and this permission notice shall be included in all
+; copies or substantial portions of the Software.
+; 
+; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+; SOFTWARE.
+
+
+[Version]
+Signature="$WINDOWS NT$"
+Class=System
+ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318}
+Provider=%ManufacturerName%
+CatalogFile=ViGEmBus.cat
+DriverVer= ;
+
+[DestinationDirs]
+DefaultDestDir = 12
+ViGEmBus_Device_CoInstaller_CopyFiles = 11
+
+[SourceDisksNames]
+1 = %DiskName%,,,
+
+[SourceDisksFiles]
+ViGEmBus.sys = 1,,
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1
+
+;*****************************************
+; Install Section
+;*****************************************
+
+[Manufacturer]
+%ManufacturerName%=Standard,NTamd64,NTx86
+
+[Standard.NTamd64]
+%ViGEmBus.DeviceDesc%=ViGEmBus_Device, Nefarius\ViGEmBus\Gen1
+
+[Standard.NTx86]
+%ViGEmBus.DeviceDesc%=ViGEmBus_Device, Nefarius\ViGEmBus\Gen1
+
+[ViGEmBus_Device.NT]
+CopyFiles=Drivers_Dir
+
+[Drivers_Dir]
+ViGEmBus.sys
+
+;-------------- Service installation
+[ViGEmBus_Device.NT.Services]
+AddService = ViGEmBus,%SPSVCINST_ASSOCSERVICE%, ViGEmBus_Service_Inst
+
+; -------------- ViGEmBus driver install sections
+[ViGEmBus_Service_Inst]
+DisplayName    = %ViGEmBus.SVCDESC%
+ServiceType    = 1               ; SERVICE_KERNEL_DRIVER
+StartType      = 3               ; SERVICE_DEMAND_START
+ErrorControl   = 1               ; SERVICE_ERROR_NORMAL
+ServiceBinary  = %12%\ViGEmBus.sys
+
+;
+;--- ViGEmBus_Device Coinstaller installation ------
+;
+
+[ViGEmBus_Device.NT.CoInstallers]
+AddReg=ViGEmBus_Device_CoInstaller_AddReg
+CopyFiles=ViGEmBus_Device_CoInstaller_CopyFiles
+
+[ViGEmBus_Device_CoInstaller_AddReg]
+HKR,,CoInstallers32,0x00010000, "WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
+
+[ViGEmBus_Device_CoInstaller_CopyFiles]
+WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll
+
+[ViGEmBus_Device.NT.Wdf]
+KmdfService =  ViGEmBus, ViGEmBus_wdfsect
+[ViGEmBus_wdfsect]
+KmdfLibraryVersion = $KMDFVERSION$
+
+[Strings]
+SPSVCINST_ASSOCSERVICE= 0x00000002
+ManufacturerName="Nefarius Software Solutions e.U."
+DiskName = "ViGEmBus Installation Disk"
+ViGEmBus.DeviceDesc = "Virtual Gamepad Emulation Bus"
+ViGEmBus.SVCDESC = "Virtual Gamepad Emulation Service"
--- a/sys/Xgip.h
+++ b/sys/Xgip.h
@@ -1,101 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-// 
-// For children emulating XGIP devices, the following dummy interfaces 
-// have to be exposed by the PDO or else the child devices won't start
-// 
-
-// Below these interfaces are from wdmguid.h being used as dummies
-// {70211B0E-0AFB-47DB-AFC1-410BF842497A} PNP_LOCATION_INTERFACE
-// {B38290E5-3CD0-4F9D-9937-F5FE2B44D47A} D3COLD_SUPPORT_INTERFACE
-// {2AEB0243-6A6E-486B-82FC-D815F6B97006} REENUMERATE_SELF_INTERFACE_STANDARD
-
-// {DC7A8E51-49B3-4A3A-9E81-625205E7D729} Seems to be GUID_POWER_THREAD_INTERFACE
-// Source: https://github.com/microsoft/Windows-Driver-Frameworks/blob/master/src/framework/shared/irphandlers/pnp/fxpkgpnp.cpp#L63
-DEFINE_GUID(GUID_DEVINTERFACE_XGIP_GUID_POWER_THREAD_INTERFACE_DUMMY,
-    0xDC7A8E51, 0x49B3, 0x4A3A, 0x9E, 0x81, 0x62, 0x52, 0x05, 0xE7, 0xD7, 0x29);
-
-// {DEEE98EA-C0A1-42C3-9738-A04606C84E93}
-DEFINE_GUID(GUID_DEVINTERFACE_XGIP_UNKNOWN_4,
-    0xDEEE98EA, 0xC0A1, 0x42C3, 0x97, 0x38, 0xA0, 0x46, 0x06, 0xC8, 0x4E, 0x93);
-
-
-#pragma once
-
-#define XGIP_DESCRIPTOR_SIZE            0x0040
-#define XGIP_CONFIGURATION_SIZE         0x88
-#define XGIP_REPORT_SIZE                0x12
-#define XGIP_SYS_INIT_PACKETS           0x0F
-#define XGIP_SYS_INIT_PERIOD            0x32
-
-typedef struct _XGIP_DEVICE_DATA
-{
-    UCHAR Report[XGIP_REPORT_SIZE];
-
-    //
-    // Queue for incoming interrupt transfer
-    //
-    WDFQUEUE PendingUsbInRequests;
-
-    //
-    // Queue for inverted calls
-    //
-    WDFQUEUE PendingNotificationRequests;
-
-    WDFCOLLECTION XboxgipSysInitCollection;
-
-    BOOLEAN XboxgipSysInitReady;
-
-    WDFTIMER XboxgipSysInitTimer;
-} XGIP_DEVICE_DATA, *PXGIP_DEVICE_DATA;
-
-WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(XGIP_DEVICE_DATA, XgipGetData)
-
-
-NTSTATUS
-Bus_XgipSubmitInterrupt(
-    WDFDEVICE Device,
-    ULONG SerialNo,
-    PXGIP_SUBMIT_INTERRUPT Report,
-    _In_ BOOLEAN FromInterface
-);
-
-//
-// XGIP-specific functions
-// 
-NTSTATUS Xgip_PreparePdo(
-    PWDFDEVICE_INIT DeviceInit,
-    PUNICODE_STRING DeviceId,
-    PUNICODE_STRING DeviceDescription
-);
-NTSTATUS Xgip_PrepareHardware(WDFDEVICE Device);
-NTSTATUS Xgip_AssignPdoContext(WDFDEVICE Device);
-VOID Xgip_GetConfigurationDescriptorType(PUCHAR Buffer, ULONG Length);
-VOID Xgip_GetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor, PPDO_DEVICE_DATA pCommon);
-VOID Xgip_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo);
-
--- a/sys/Xusb.h
+++ b/sys/Xusb.h
@@ -1,138 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-// 
-// For children emulating XUSB devices, the following dummy interfaces 
-// have to be exposed by the PDO or else the child devices won't start
-// 
-// TODO: that statement might be obsolete, further testing required
-// 
-
-// Below these interfaces are from wdmguid.h being used as dummies
-// {70211B0E-0AFB-47DB-AFC1-410BF842497A} PNP_LOCATION_INTERFACE
-// {B38290E5-3CD0-4F9D-9937-F5FE2B44D47A} D3COLD_SUPPORT_INTERFACE
-// {2AEB0243-6A6E-486B-82FC-D815F6B97006} REENUMERATE_SELF_INTERFACE_STANDARD
-
-#pragma once
-
-#if defined(_X86_)
-#define XUSB_CONFIGURATION_SIZE         0x00E4
-#else
-#define XUSB_CONFIGURATION_SIZE         0x0130
-#endif
-#define XUSB_DESCRIPTOR_SIZE            0x0099
-#define XUSB_RUMBLE_SIZE                0x08
-#define XUSB_LEDSET_SIZE                0x03
-#define XUSB_LEDNUM_SIZE                0x01
-#define XUSB_INIT_STAGE_SIZE            0x03
-#define XUSB_BLOB_STORAGE_SIZE          0x2A
-
-#define XUSB_BLOB_00_OFFSET             0x00
-#define XUSB_BLOB_01_OFFSET             0x03
-#define XUSB_BLOB_02_OFFSET             0x06
-#define XUSB_BLOB_03_OFFSET             0x09
-#define XUSB_BLOB_04_OFFSET             0x0C
-#define XUSB_BLOB_05_OFFSET             0x20
-#define XUSB_BLOB_06_OFFSET             0x23
-#define XUSB_BLOB_07_OFFSET             0x26
-
-#define XUSB_IS_DATA_PIPE(_x_)          ((BOOLEAN)(_x_->PipeHandle == (USBD_PIPE_HANDLE)0xFFFF0081))
-#define XUSB_IS_CONTROL_PIPE(_x_)       ((BOOLEAN)(_x_->PipeHandle == (USBD_PIPE_HANDLE)0xFFFF0083))
-
-typedef struct _XUSB_INTERRUPT_IN_PACKET
-{
-    UCHAR Id;
-
-    UCHAR Size;
-
-    XUSB_REPORT Report;
-
-} XUSB_INTERRUPT_IN_PACKET, *PXUSB_INTERRUPT_IN_PACKET;
-
-//
-// XUSB-specific device context data.
-// 
-typedef struct _XUSB_DEVICE_DATA
-{
-    //
-    // Rumble buffer
-    //
-    UCHAR Rumble[XUSB_RUMBLE_SIZE];
-
-    //
-    // LED number (represents XInput slot index)
-    //
-    CHAR LedNumber;
-
-    //
-    // Report packet
-    //
-    XUSB_INTERRUPT_IN_PACKET Packet;
-
-    //
-    // Queue for incoming control interrupt transfer
-    //
-    WDFQUEUE HoldingUsbInRequests;
-
-    //
-    // Required for XInputGetCapabilities to work
-    // 
-    BOOLEAN ReportedCapabilities;
-
-    //
-    // Required for XInputGetCapabilities to work
-    // 
-    ULONG InterruptInitStage;
-
-    //
-    // Storage of binary blobs (packets) for PDO initialization
-    // 
-    WDFMEMORY InterruptBlobStorage;
-
-} XUSB_DEVICE_DATA, *PXUSB_DEVICE_DATA;
-
-WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(XUSB_DEVICE_DATA, XusbGetData)
-
-
-NTSTATUS
-Bus_XusbSubmitReport(
-    WDFDEVICE Device,
-    ULONG SerialNo,
-    PXUSB_SUBMIT_REPORT Report,
-    _In_ BOOLEAN FromInterface
-);
-
-//
-// XUSB-specific functions
-// 
-NTSTATUS Xusb_PreparePdo(PWDFDEVICE_INIT DeviceInit, USHORT VendorId, USHORT ProductId, PUNICODE_STRING DeviceId, PUNICODE_STRING DeviceDescription);
-NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device);
-NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device);
-VOID Xusb_GetConfigurationDescriptorType(PUCHAR Buffer, ULONG Length);
-VOID Xusb_GetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor, PPDO_DEVICE_DATA pCommon);
-VOID Xusb_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo);
-NTSTATUS Xusb_GetUserIndex(WDFDEVICE Device, PXUSB_GET_USER_INDEX Request);
--- a/sys/XusbPdo.cpp
+++ b/sys/XusbPdo.cpp
--- a/sys/XusbPdo.hpp
+++ b/sys/XusbPdo.hpp
@@ -0,0 +1,151 @@
+/*
+* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
+*
+* MIT License
+*
+* Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
+
+#pragma once
+
+#include "EmulationTargetPDO.hpp"
+
+namespace ViGEm::Bus::Targets
+{
+	constexpr auto XUSB_POOL_TAG = 'EGiV';
+
+	typedef struct _XUSB_INTERRUPT_IN_PACKET
+	{
+		UCHAR Id;
+
+		UCHAR Size;
+
+		XUSB_REPORT Report;
+	} XUSB_INTERRUPT_IN_PACKET, *PXUSB_INTERRUPT_IN_PACKET;
+
+	constexpr bool xusb_is_data_pipe(_URB_BULK_OR_INTERRUPT_TRANSFER* pTransfer)
+	{
+		return (pTransfer->PipeHandle == reinterpret_cast<USBD_PIPE_HANDLE>(0xFFFF0081));
+	}
+
+	constexpr bool xusb_is_control_pipe(_URB_BULK_OR_INTERRUPT_TRANSFER* pTransfer)
+	{
+		return (pTransfer->PipeHandle == reinterpret_cast<USBD_PIPE_HANDLE>(0xFFFF0083));
+	}
+
+	class EmulationTargetXUSB : public Core::EmulationTargetPDO
+	{
+	public:
+		EmulationTargetXUSB(ULONG Serial, LONG SessionId, USHORT VendorId = 0x045E, USHORT ProductId = 0x028E);
+		~EmulationTargetXUSB() = default;
+
+		NTSTATUS PdoPrepareDevice(PWDFDEVICE_INIT DeviceInit,
+		                          PUNICODE_STRING DeviceId,
+		                          PUNICODE_STRING DeviceDescription) override;
+
+		NTSTATUS PdoPrepareHardware() override;
+
+		NTSTATUS PdoInitContext() override;
+
+		VOID GetConfigurationDescriptorType(PUCHAR Buffer, ULONG Length) override;
+
+		NTSTATUS UsbGetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor) override;
+
+		NTSTATUS SelectConfiguration(PURB Urb) override;
+
+		void AbortPipe() override;
+
+		NTSTATUS UsbClassInterface(PURB Urb) override;
+		
+		NTSTATUS UsbGetDescriptorFromInterface(PURB Urb) override;
+		
+		NTSTATUS UsbSelectInterface(PURB Urb) override;
+		
+		NTSTATUS UsbGetStringDescriptorType(PURB Urb) override;
+		
+		NTSTATUS UsbBulkOrInterruptTransfer(_URB_BULK_OR_INTERRUPT_TRANSFER* pTransfer, WDFREQUEST Request) override;
+		
+		NTSTATUS UsbControlTransfer(PURB Urb) override;
+		
+		NTSTATUS SubmitReportImpl(PVOID NewReport) override;
+
+		NTSTATUS GetUserIndex(PULONG UserIndex) const;
+		
+	private:
+		static PCWSTR _deviceDescription;
+
+#if defined(_X86_)
+		static const int XUSB_CONFIGURATION_SIZE = 0x00E4;
+#else
+		static const int XUSB_CONFIGURATION_SIZE = 0x0130;
+#endif
+		static const int XUSB_DESCRIPTOR_SIZE = 0x0099;
+		static const int XUSB_RUMBLE_SIZE = 0x08;
+		static const int XUSB_LEDSET_SIZE = 0x03;
+		static const int XUSB_LEDNUM_SIZE = 0x01;
+		static const int XUSB_INIT_STAGE_SIZE = 0x03;
+		static const int XUSB_BLOB_STORAGE_SIZE = 0x2A;
+
+		static const int XUSB_BLOB_00_OFFSET = 0x00;
+		static const int XUSB_BLOB_01_OFFSET = 0x03;
+		static const int XUSB_BLOB_02_OFFSET = 0x06;
+		static const int XUSB_BLOB_03_OFFSET = 0x09;
+		static const int XUSB_BLOB_04_OFFSET = 0x0C;
+		static const int XUSB_BLOB_05_OFFSET = 0x20;
+		static const int XUSB_BLOB_06_OFFSET = 0x23;
+		static const int XUSB_BLOB_07_OFFSET = 0x26;
+
+		//
+		// Rumble buffer
+		//
+		UCHAR _Rumble[XUSB_RUMBLE_SIZE];
+
+		//
+		// LED number (represents XInput slot index)
+		//
+		CHAR _LedNumber;
+
+		//
+		// Report packet
+		//
+		XUSB_INTERRUPT_IN_PACKET _Packet;
+
+		//
+		// Queue for incoming control interrupt transfer
+		//
+		WDFQUEUE _HoldingUsbInRequests;
+
+		//
+		// Required for XInputGetCapabilities to work
+		// 
+		BOOLEAN _ReportedCapabilities;
+
+		//
+		// Required for XInputGetCapabilities to work
+		// 
+		ULONG _InterruptInitStage;
+
+		//
+		// Storage of binary blobs (packets) for PDO initialization
+		// 
+		WDFMEMORY _InterruptBlobStorage;
+	};
+}
--- a/sys/busenum.c
+++ b/sys/busenum.c
@@ -1,825 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#include "busenum.h"
-#include <wdmguid.h>
-#include <usb.h>
-#include "busenum.tmh"
-
-#ifdef ALLOC_PRAGMA
-#pragma alloc_text (PAGE, Bus_PlugInDevice)
-#pragma alloc_text (PAGE, Bus_UnPlugDevice)
-#endif
-
-
-
-//
-// Simulates a device plug-in event.
-// 
-NTSTATUS Bus_PlugInDevice(
-    _In_ WDFDEVICE Device,
-    _In_ WDFREQUEST Request,
-    _In_ BOOLEAN IsInternal,
-    _Out_ size_t* Transferred)
-{
-    PDO_IDENTIFICATION_DESCRIPTION  description;
-    NTSTATUS                        status;
-    PVIGEM_PLUGIN_TARGET            plugIn;
-    WDFFILEOBJECT                   fileObject;
-    PFDO_FILE_DATA                  pFileData;
-    size_t                          length = 0;
-    WDF_OBJECT_ATTRIBUTES           requestAttribs;
-    PFDO_PLUGIN_REQUEST_DATA        pReqData;
-    PFDO_DEVICE_DATA                pFdoData;
-
-    PAGED_CODE();
-
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSENUM, "%!FUNC! Entry");
-
-    pFdoData = FdoGetData(Device);
-
-    status = WdfRequestRetrieveInputBuffer(Request, sizeof(VIGEM_PLUGIN_TARGET), (PVOID)&plugIn, &length);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "WdfRequestRetrieveInputBuffer failed with status %!STATUS!", status);
-        return status;
-    }
-
-    if ((sizeof(VIGEM_PLUGIN_TARGET) != plugIn->Size) || (length != plugIn->Size))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "sizeof(VIGEM_PLUGIN_TARGET) buffer size mismatch [%d != %d]",
-            sizeof(VIGEM_PLUGIN_TARGET), plugIn->Size);
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    if (plugIn->SerialNo == 0)
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "Serial no. 0 not allowed");
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    *Transferred = length;
-
-    fileObject = WdfRequestGetFileObject(Request);
-    if (fileObject == NULL)
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "WdfRequestGetFileObject failed to fetch WDFFILEOBJECT from request 0x%p",
-            Request);
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    pFileData = FileObjectGetData(fileObject);
-    if (pFileData == NULL)
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "FileObjectGetData failed to get context data for 0x%p",
-            fileObject);
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    //
-    // Initialize the description with the information about the newly
-    // plugged in device.
-    //
-    WDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER_INIT(&description.Header, sizeof(description));
-
-    description.SerialNo = plugIn->SerialNo;
-    description.TargetType = plugIn->TargetType;
-    description.OwnerProcessId = CURRENT_PROCESS_ID();
-    description.SessionId = pFileData->SessionId;
-    description.OwnerIsDriver = IsInternal;
-
-    // Set default IDs if supplied values are invalid
-    if (plugIn->VendorId == 0 || plugIn->ProductId == 0)
-    {
-        switch (plugIn->TargetType)
-        {
-        case Xbox360Wired:
-
-            description.VendorId = 0x045E;
-            description.ProductId = 0x028E;
-
-            break;
-        case DualShock4Wired:
-
-            description.VendorId = 0x054C;
-            description.ProductId = 0x05C4;
-
-            break;
-        case XboxOneWired:
-
-            description.VendorId = 0x0E6F;
-            description.ProductId = 0x0139;
-
-#if !DBG
-            // TODO: implement and remove!
-            return STATUS_NOT_SUPPORTED;
-#endif
-
-            break;
-        }
-    }
-    else
-    {
-        description.VendorId = plugIn->VendorId;
-        description.ProductId = plugIn->ProductId;
-    }
-
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_BUSENUM,
-        "New PDO properties: serial = %d, type = %d, pid = %d, session = %d, internal = %d, vid = 0x%04X, pid = 0x%04X",
-        description.SerialNo,
-        description.TargetType,
-        description.OwnerProcessId,
-        description.SessionId,
-        description.OwnerIsDriver,
-        description.VendorId,
-        description.ProductId
-    );
-
-    WdfSpinLockAcquire(pFdoData->PendingPluginRequestsLock);
-
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_BUSENUM,
-        "Current pending requests count: %d",
-        WdfCollectionGetCount(pFdoData->PendingPluginRequests));
-
-    status = WdfChildListAddOrUpdateChildDescriptionAsPresent(WdfFdoGetDefaultChildList(Device), &description.Header, NULL);
-
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "WdfChildListAddOrUpdateChildDescriptionAsPresent failed with status %!STATUS!",
-            status);
-
-        goto pluginEnd;
-    }
-
-    //
-    // The requested serial number is already in use
-    // 
-    if (status == STATUS_OBJECT_NAME_EXISTS)
-    {
-        status = STATUS_INVALID_PARAMETER;
-
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "The described PDO already exists (%!STATUS!)",
-            status);
-
-        goto pluginEnd;
-    }
-
-    WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&requestAttribs, FDO_PLUGIN_REQUEST_DATA);
-
-    //
-    // Allocate context data to request
-    // 
-    status = WdfObjectAllocateContext(Request, &requestAttribs, (PVOID)&pReqData);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "WdfObjectAllocateContext failed with status %!STATUS!",
-            status);
-
-        goto pluginEnd;
-    }
-
-    //
-    // Glue current serial to request
-    // 
-    pReqData->Serial = plugIn->SerialNo;
-
-    //
-    // Timestamp the request to track its age
-    // 
-    pReqData->Timestamp = KeQueryPerformanceCounter(&pReqData->Frequency);
-
-    //
-    // Keep track of pending request in collection
-    // 
-    status = WdfCollectionAdd(pFdoData->PendingPluginRequests, Request);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "WdfCollectionAdd failed with status %!STATUS!",
-            status);
-
-        goto pluginEnd;
-    }
-
-    TraceEvents(TRACE_LEVEL_INFORMATION,
-        TRACE_BUSENUM,
-        "Added item with serial: %d",
-        plugIn->SerialNo);
-
-    //
-    // At least one request present in the collection; start clean-up timer
-    // 
-    WdfTimerStart(
-        pFdoData->PendingPluginRequestsCleanupTimer,
-        WDF_REL_TIMEOUT_IN_MS(ORC_TIMER_PERIODIC_DUE_TIME)
-    );
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_DRIVER,
-        "Started periodic timer");
-
-    status = NT_SUCCESS(status) ? STATUS_PENDING : status;
-
-pluginEnd:
-
-    WdfSpinLockRelease(pFdoData->PendingPluginRequestsLock);
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSENUM, "%!FUNC! Exit with status %!STATUS!", status);
-
-    return status;
-}
-
-//
-// Simulates a device unplug event.
-// 
-NTSTATUS Bus_UnPlugDevice(
-    _In_ WDFDEVICE Device,
-    _In_ WDFREQUEST Request,
-    _In_ BOOLEAN IsInternal,
-    _Out_ size_t* Transferred)
-{
-    NTSTATUS                            status;
-    WDFDEVICE                           hChild;
-    WDFCHILDLIST                        list;
-    WDF_CHILD_LIST_ITERATOR             iterator;
-    WDF_CHILD_RETRIEVE_INFO             childInfo;
-    PDO_IDENTIFICATION_DESCRIPTION      description;
-    BOOLEAN                             unplugAll;
-    PVIGEM_UNPLUG_TARGET                unPlug;
-    WDFFILEOBJECT                       fileObject;
-    PFDO_FILE_DATA                      pFileData = NULL;
-    size_t                              length = 0;
-
-    PAGED_CODE();
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSENUM, "%!FUNC! Entry");
-
-    status = WdfRequestRetrieveInputBuffer(Request, sizeof(VIGEM_UNPLUG_TARGET), (PVOID)&unPlug, &length);
-
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "WdfRequestRetrieveInputBuffer failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    if ((sizeof(VIGEM_UNPLUG_TARGET) != unPlug->Size) || (length != unPlug->Size))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "sizeof(VIGEM_UNPLUG_TARGET) buffer size mismatch [%d != %d]",
-            sizeof(VIGEM_UNPLUG_TARGET), unPlug->Size);
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    *Transferred = length;
-    unplugAll = (unPlug->SerialNo == 0);
-
-    if (!IsInternal)
-    {
-        fileObject = WdfRequestGetFileObject(Request);
-        if (fileObject == NULL)
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_BUSENUM,
-                "WdfRequestGetFileObject failed to fetch WDFFILEOBJECT from request 0x%p",
-                Request);
-            return STATUS_INVALID_PARAMETER;
-        }
-
-        pFileData = FileObjectGetData(fileObject);
-        if (pFileData == NULL)
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_BUSENUM,
-                "FileObjectGetData failed to get context data for 0x%p",
-                fileObject);
-            return STATUS_INVALID_PARAMETER;
-        }
-    }
-
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_BUSENUM,
-        "Starting child list traversal");
-
-    list = WdfFdoGetDefaultChildList(Device);
-
-    WDF_CHILD_LIST_ITERATOR_INIT(&iterator, WdfRetrievePresentChildren);
-
-    WdfChildListBeginIteration(list, &iterator);
-
-    for (;;)
-    {
-        WDF_CHILD_RETRIEVE_INFO_INIT(&childInfo, &description.Header);
-        WDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER_INIT(&description.Header, sizeof(description));
-
-        status = WdfChildListRetrieveNextDevice(list, &iterator, &hChild, &childInfo);
-
-        // Error or no more children, end loop
-        if (!NT_SUCCESS(status) || status == STATUS_NO_MORE_ENTRIES)
-        {
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSENUM,
-                "WdfChildListRetrieveNextDevice returned with status %!STATUS!",
-                status);
-            break;
-        }
-
-        // If unable to retrieve device
-        if (childInfo.Status != WdfChildListRetrieveDeviceSuccess)
-        {
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSENUM,
-                "childInfo.Status = %d",
-                childInfo.Status);
-            continue;
-        }
-
-        // Child isn't the one we looked for, skip
-        if (!unplugAll && description.SerialNo != unPlug->SerialNo)
-        {
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSENUM,
-                "Seeking serial mismatch: %d != %d",
-                description.SerialNo,
-                unPlug->SerialNo);
-            continue;
-        }
-
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_BUSENUM,
-            "description.SessionId = %d, pFileData->SessionId = %d",
-            description.SessionId,
-            pFileData->SessionId);
-
-        // Only unplug owned children
-        if (IsInternal || description.SessionId == pFileData->SessionId)
-        {
-            // Unplug child
-            status = WdfChildListUpdateChildDescriptionAsMissing(list, &description.Header);
-            if (!NT_SUCCESS(status))
-            {
-                TraceEvents(TRACE_LEVEL_ERROR,
-                    TRACE_BUSENUM,
-                    "WdfChildListUpdateChildDescriptionAsMissing failed with status %!STATUS!",
-                    status);
-            }
-        }
-    }
-
-    WdfChildListEndIteration(list, &iterator);
-
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_BUSENUM,
-        "Finished child list traversal");
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSENUM, "%!FUNC! Exit with status %!STATUS!", STATUS_SUCCESS);
-
-    return STATUS_SUCCESS;
-}
-
-//
-// Sends a report update to an XUSB PDO.
-// 
-NTSTATUS Bus_XusbSubmitReport(WDFDEVICE Device, ULONG SerialNo, PXUSB_SUBMIT_REPORT Report, BOOLEAN FromInterface)
-{
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_BUSENUM, "%!FUNC! Entry");
-
-    return Bus_SubmitReport(Device, SerialNo, Report, FromInterface);
-}
-
-//
-// Queues an inverted call to receive XUSB-specific updates.
-// 
-NTSTATUS Bus_QueueNotification(WDFDEVICE Device, ULONG SerialNo, WDFREQUEST Request)
-{
-    NTSTATUS                    status = STATUS_INVALID_PARAMETER;
-    WDFDEVICE                   hChild;
-    PPDO_DEVICE_DATA            pdoData;
-    PXUSB_DEVICE_DATA           xusbData;
-    PDS4_DEVICE_DATA            ds4Data;
-
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSENUM, "%!FUNC! Entry");
-
-    hChild = Bus_GetPdo(Device, SerialNo);
-
-    // Validate child
-    if (hChild == NULL)
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "Bus_GetPdo: PDO with serial %d not found",
-            SerialNo);
-        return STATUS_NO_SUCH_DEVICE;
-    }
-
-    // Check common context
-    pdoData = PdoGetData(hChild);
-    if (pdoData == NULL)
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "PdoGetData failed");
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    // Check if caller owns this PDO
-    if (!IS_OWNER(pdoData))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "PDO & Request ownership mismatch: %d != %d",
-            pdoData->OwnerProcessId,
-            CURRENT_PROCESS_ID());
-        return STATUS_ACCESS_DENIED;
-    }
-
-    // Queue the request for later completion by the PDO and return STATUS_PENDING
-    switch (pdoData->TargetType)
-    {
-    case Xbox360Wired:
-
-        xusbData = XusbGetData(hChild);
-
-        if (xusbData == NULL)
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_BUSENUM,
-                "XusbGetData failed");
-            break;
-        }
-
-        status = WdfRequestForwardToIoQueue(Request, pdoData->PendingNotificationRequests);
-
-        break;
-    case DualShock4Wired:
-
-        ds4Data = Ds4GetData(hChild);
-
-        if (ds4Data == NULL)
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_BUSENUM,
-                "Ds4GetData failed");
-            break;
-        }
-
-        status = WdfRequestForwardToIoQueue(Request, pdoData->PendingNotificationRequests);
-
-        break;
-    default:
-        status = STATUS_NOT_SUPPORTED;
-        TraceEvents(TRACE_LEVEL_WARNING,
-            TRACE_BUSENUM,
-            "Unknown target type: %d (%!STATUS!)",
-            pdoData->TargetType,
-            status);
-        break;
-    }
-
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "WdfRequestForwardToIoQueue failed with status %!STATUS!",
-            status);
-    }
-
-    status = (NT_SUCCESS(status)) ? STATUS_PENDING : status;
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSENUM, "%!FUNC! Exit with status %!STATUS!", status);
-
-    return status;
-}
-
-//
-// Sends a report update to a DS4 PDO.
-// 
-NTSTATUS Bus_Ds4SubmitReport(WDFDEVICE Device, ULONG SerialNo, PDS4_SUBMIT_REPORT Report, BOOLEAN FromInterface)
-{
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_BUSENUM, "%!FUNC! Entry");
-
-    return Bus_SubmitReport(Device, SerialNo, Report, FromInterface);
-}
-
-NTSTATUS Bus_XgipSubmitReport(WDFDEVICE Device, ULONG SerialNo, PXGIP_SUBMIT_REPORT Report, BOOLEAN FromInterface)
-{
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_BUSENUM, "%!FUNC! Entry");
-
-    return Bus_SubmitReport(Device, SerialNo, Report, FromInterface);
-}
-
-NTSTATUS Bus_XgipSubmitInterrupt(WDFDEVICE Device, ULONG SerialNo, PXGIP_SUBMIT_INTERRUPT Report, BOOLEAN FromInterface)
-{
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_BUSENUM, "%!FUNC! Entry");
-
-    return Bus_SubmitReport(Device, SerialNo, Report, FromInterface);
-}
-
-WDFDEVICE Bus_GetPdo(IN WDFDEVICE Device, IN ULONG SerialNo)
-{
-    WDFCHILDLIST                list;
-    WDF_CHILD_RETRIEVE_INFO     info;
-
-    list = WdfFdoGetDefaultChildList(Device);
-
-    PDO_IDENTIFICATION_DESCRIPTION description;
-
-    WDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER_INIT(&description.Header, sizeof(description));
-
-    description.SerialNo = SerialNo;
-
-    WDF_CHILD_RETRIEVE_INFO_INIT(&info, &description.Header);
-
-    return WdfChildListRetrievePdo(list, &info);
-}
-
-NTSTATUS Bus_SubmitReport(WDFDEVICE Device, ULONG SerialNo, PVOID Report, BOOLEAN FromInterface)
-{
-    NTSTATUS                    status = STATUS_SUCCESS;
-    WDFDEVICE                   hChild;
-    PPDO_DEVICE_DATA            pdoData;
-    WDFREQUEST                  usbRequest;
-    PIRP                        pendingIrp;
-    BOOLEAN                     changed;
-
-
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_BUSENUM, "%!FUNC! Entry");
-
-    hChild = Bus_GetPdo(Device, SerialNo);
-
-    // Validate child
-    if (hChild == NULL)
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "Bus_GetPdo: PDO with serial %d not found",
-            SerialNo);
-        return STATUS_NO_SUCH_DEVICE;
-    }
-
-    // Check common context
-    pdoData = PdoGetData(hChild);
-    if (pdoData == NULL)
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "PdoGetData failed");
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    // Check if caller owns this PDO
-    if (!FromInterface && !IS_OWNER(pdoData))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSENUM,
-            "PDO & Request ownership mismatch: %d != %d",
-            pdoData->OwnerProcessId,
-            CURRENT_PROCESS_ID());
-        return STATUS_ACCESS_DENIED;
-    }
-
-    // Check if input is different from previous value
-    switch (pdoData->TargetType)
-    {
-    case Xbox360Wired:
-
-        changed = (RtlCompareMemory(&XusbGetData(hChild)->Packet.Report,
-            &((PXUSB_SUBMIT_REPORT)Report)->Report,
-            sizeof(XUSB_REPORT)) != sizeof(XUSB_REPORT));
-
-        break;
-    case DualShock4Wired:
-
-        changed = TRUE;
-
-        break;
-    case XboxOneWired:
-
-        // TODO: necessary?
-        changed = TRUE;
-
-        break;
-    default:
-
-        changed = FALSE;
-
-        break;
-    }
-
-    // Don't waste pending IRP if input hasn't changed
-    if (!changed)
-    {
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_BUSENUM,
-            "Input report hasn't changed since last update, aborting with %!STATUS!",
-            status);
-        return status;
-    }
-
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_BUSENUM,
-        "Received new report, processing");
-
-    // Get pending USB request
-    switch (pdoData->TargetType)
-    {
-    case Xbox360Wired:
-
-        status = WdfIoQueueRetrieveNextRequest(pdoData->PendingUsbInRequests, &usbRequest);
-
-        break;
-    case DualShock4Wired:
-
-        status = WdfIoQueueRetrieveNextRequest(pdoData->PendingUsbInRequests, &usbRequest);
-
-        break;
-    case XboxOneWired:
-
-        // Request is control data
-        if (((PXGIP_SUBMIT_INTERRUPT)Report)->Size == sizeof(XGIP_SUBMIT_INTERRUPT))
-        {
-            PXGIP_DEVICE_DATA xgip = XgipGetData(hChild);
-            PXGIP_SUBMIT_INTERRUPT interrupt = (PXGIP_SUBMIT_INTERRUPT)Report;
-            WDFMEMORY memory;
-            WDF_OBJECT_ATTRIBUTES memAttribs;
-            WDF_OBJECT_ATTRIBUTES_INIT(&memAttribs);
-
-            memAttribs.ParentObject = hChild;
-
-            // Allocate kernel memory
-            status = WdfMemoryCreate(&memAttribs, NonPagedPool, VIGEM_POOL_TAG,
-                interrupt->InterruptLength, &memory, NULL);
-            if (!NT_SUCCESS(status))
-            {
-                KdPrint((DRIVERNAME "WdfMemoryCreate failed with status 0x%X\n", status));
-                goto endSubmitReport;
-            }
-
-            // Copy interrupt buffer to memory object
-            status = WdfMemoryCopyFromBuffer(memory, 0, interrupt->Interrupt, interrupt->InterruptLength);
-            if (!NT_SUCCESS(status))
-            {
-                KdPrint((DRIVERNAME "WdfMemoryCopyFromBuffer failed with status 0x%X\n", status));
-                goto endSubmitReport;
-            }
-
-            // Add memory object to collection
-            status = WdfCollectionAdd(xgip->XboxgipSysInitCollection, memory);
-            if (!NT_SUCCESS(status))
-            {
-                KdPrint((DRIVERNAME "WdfCollectionAdd failed with status 0x%X\n", status));
-                goto endSubmitReport;
-            }
-
-            // Check if all packets have been received
-            xgip->XboxgipSysInitReady =
-                WdfCollectionGetCount(xgip->XboxgipSysInitCollection) == XGIP_SYS_INIT_PACKETS;
-
-            // If all packets are cached, start initialization timer
-            if (xgip->XboxgipSysInitReady)
-            {
-                WdfTimerStart(xgip->XboxgipSysInitTimer, XGIP_SYS_INIT_PERIOD);
-            }
-
-            goto endSubmitReport;
-        }
-
-        status = WdfIoQueueRetrieveNextRequest(XgipGetData(hChild)->PendingUsbInRequests, &usbRequest);
-
-        break;
-    default:
-
-        status = STATUS_NOT_SUPPORTED;
-
-        TraceEvents(TRACE_LEVEL_WARNING,
-            TRACE_BUSENUM,
-            "Unknown target type: %d (%!STATUS!)",
-            pdoData->TargetType,
-            status);
-
-        goto endSubmitReport;
-    }
-
-    if (status == STATUS_PENDING)
-        goto endSubmitReport;
-    else if (!NT_SUCCESS(status))
-        goto endSubmitReport;
-
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_BUSENUM,
-        "Processing pending IRP");
-
-    // Get pending IRP
-    pendingIrp = WdfRequestWdmGetIrp(usbRequest);
-
-    // Get USB request block
-    PURB urb = (PURB)URB_FROM_IRP(pendingIrp);
-
-    // Get transfer buffer
-    PUCHAR Buffer = (PUCHAR)urb->UrbBulkOrInterruptTransfer.TransferBuffer;
-
-    switch (pdoData->TargetType)
-    {
-    case Xbox360Wired:
-
-        urb->UrbBulkOrInterruptTransfer.TransferBufferLength = sizeof(XUSB_INTERRUPT_IN_PACKET);
-
-        // Copy submitted report to cache
-        RtlCopyBytes(&XusbGetData(hChild)->Packet.Report, &((PXUSB_SUBMIT_REPORT)Report)->Report, sizeof(XUSB_REPORT));
-        // Copy cached report to URB transfer buffer
-        RtlCopyBytes(Buffer, &XusbGetData(hChild)->Packet, sizeof(XUSB_INTERRUPT_IN_PACKET));
-
-        break;
-    case DualShock4Wired:
-
-        urb->UrbBulkOrInterruptTransfer.TransferBufferLength = DS4_REPORT_SIZE;
-
-        /* Copy report to cache and transfer buffer
-         * Skip first byte as it contains the never changing report id */
-        RtlCopyBytes(Ds4GetData(hChild)->Report + 1, &((PDS4_SUBMIT_REPORT)Report)->Report, sizeof(DS4_REPORT));
-
-        if (Buffer)
-            RtlCopyBytes(Buffer, Ds4GetData(hChild)->Report, DS4_REPORT_SIZE);
-
-        break;
-    case XboxOneWired:
-
-        // Request is input report
-        if (((PXGIP_SUBMIT_REPORT)Report)->Size == sizeof(XGIP_SUBMIT_REPORT))
-        {
-            urb->UrbBulkOrInterruptTransfer.TransferBufferLength = XGIP_REPORT_SIZE;
-
-            // Increase event counter on every call (can roll-over)
-            XgipGetData(hChild)->Report[2]++;
-
-            /* Copy report to cache and transfer buffer
-             * Skip first four bytes as they are not part of the report */
-            RtlCopyBytes(XgipGetData(hChild)->Report + 4, &((PXGIP_SUBMIT_REPORT)Report)->Report, sizeof(XGIP_REPORT));
-            RtlCopyBytes(Buffer, XgipGetData(hChild)->Report, XGIP_REPORT_SIZE);
-
-            break;
-        }
-
-        break;
-    default:
-        status = STATUS_INVALID_PARAMETER;
-        break;
-    }
-
-    // Complete pending request
-    WdfRequestComplete(usbRequest, status);
-
-endSubmitReport:
-
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_BUSENUM, "%!FUNC! Exit with status %!STATUS!", status);
-
-    return status;
-}
-
--- a/sys/busenum.cpp
+++ b/sys/busenum.cpp
@@ -0,0 +1,376 @@
+/*
+* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
+*
+* MIT License
+*
+* Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
+
+
+#include "busenum.h"
+#include "busenum.tmh"
+
+#include "EmulationTargetPDO.hpp"
+#include "XusbPdo.hpp"
+#include "Ds4Pdo.hpp"
+
+#ifdef ALLOC_PRAGMA
+#pragma alloc_text (PAGE, Bus_PlugInDevice)
+#pragma alloc_text (PAGE, Bus_UnPlugDevice)
+#endif
+
+using ViGEm::Bus::Core::PDO_IDENTIFICATION_DESCRIPTION;
+using ViGEm::Bus::Core::EmulationTargetPDO;
+using ViGEm::Bus::Targets::EmulationTargetXUSB;
+using ViGEm::Bus::Targets::EmulationTargetDS4;
+
+//
+// Simulates a device plug-in event.
+// 
+EXTERN_C NTSTATUS Bus_PlugInDevice(
+	_In_ WDFDEVICE Device,
+	_In_ WDFREQUEST Request,
+	_In_ BOOLEAN IsInternal,
+	_Out_ size_t* Transferred)
+{
+	PDO_IDENTIFICATION_DESCRIPTION  description;
+	NTSTATUS                        status;
+	PVIGEM_PLUGIN_TARGET            plugIn;
+	WDFFILEOBJECT                   fileObject;
+	PFDO_FILE_DATA                  pFileData;
+	size_t                          length = 0;
+
+	UNREFERENCED_PARAMETER(IsInternal);
+
+	PAGED_CODE();
+
+
+	TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSENUM, "%!FUNC! Entry");
+
+	status = WdfRequestRetrieveInputBuffer(
+		Request,
+		sizeof(VIGEM_PLUGIN_TARGET),
+		reinterpret_cast<PVOID*>(&plugIn),
+		&length
+	);
+	if (!NT_SUCCESS(status))
+	{
+		TraceEvents(TRACE_LEVEL_ERROR,
+			TRACE_BUSENUM,
+			"WdfRequestRetrieveInputBuffer failed with status %!STATUS!", status);
+		return status;
+	}
+
+	if ((sizeof(VIGEM_PLUGIN_TARGET) != plugIn->Size) || (length != plugIn->Size))
+	{
+		TraceEvents(TRACE_LEVEL_ERROR,
+			TRACE_BUSENUM,
+			"sizeof(VIGEM_PLUGIN_TARGET) buffer size mismatch [%d != %d]",
+			sizeof(VIGEM_PLUGIN_TARGET), plugIn->Size);
+		return STATUS_INVALID_PARAMETER;
+	}
+
+	if (plugIn->SerialNo == 0)
+	{
+		TraceEvents(TRACE_LEVEL_ERROR,
+			TRACE_BUSENUM,
+			"Serial no. 0 not allowed");
+		return STATUS_INVALID_PARAMETER;
+	}
+
+	*Transferred = length;
+
+	fileObject = WdfRequestGetFileObject(Request);
+	if (fileObject == NULL)
+	{
+		TraceEvents(TRACE_LEVEL_ERROR,
+			TRACE_BUSENUM,
+			"WdfRequestGetFileObject failed to fetch WDFFILEOBJECT from request 0x%p",
+			Request);
+		return STATUS_INVALID_PARAMETER;
+	}
+
+	pFileData = FileObjectGetData(fileObject);
+	if (pFileData == NULL)
+	{
+		TraceEvents(TRACE_LEVEL_ERROR,
+			TRACE_BUSENUM,
+			"FileObjectGetData failed to get context data for 0x%p",
+			fileObject);
+		return STATUS_INVALID_PARAMETER;
+	}
+
+	//
+	// Initialize the description with the information about the newly
+	// plugged in device.
+	//
+	WDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER_INIT(&description.Header, sizeof(description));
+
+	description.SerialNo = plugIn->SerialNo;
+	description.SessionId = pFileData->SessionId;
+
+	// Set default IDs if supplied values are invalid
+	if (plugIn->VendorId == 0 || plugIn->ProductId == 0)
+	{
+		switch (plugIn->TargetType)
+		{
+		case Xbox360Wired:
+
+			description.Target = new EmulationTargetXUSB(plugIn->SerialNo, pFileData->SessionId);
+
+			break;
+		case DualShock4Wired:
+
+			description.Target = new EmulationTargetDS4(plugIn->SerialNo, pFileData->SessionId);
+
+			break;
+		default:
+			return STATUS_NOT_SUPPORTED;
+		}
+	}
+	else
+	{
+		switch (plugIn->TargetType)
+		{
+		case Xbox360Wired:
+
+			description.Target = new EmulationTargetXUSB(
+				plugIn->SerialNo,
+				pFileData->SessionId,
+				plugIn->VendorId,
+				plugIn->ProductId
+			);
+
+			break;
+		case DualShock4Wired:
+
+			description.Target = new EmulationTargetDS4(
+				plugIn->SerialNo,
+				pFileData->SessionId,
+				plugIn->VendorId,
+				plugIn->ProductId
+			);
+
+			break;
+		default:
+			return STATUS_NOT_SUPPORTED;
+		}
+	}
+
+	if (!NT_SUCCESS(description.Target->PdoPrepare(Device)))
+	{
+		goto pluginEnd;
+	}
+
+	status = WdfChildListAddOrUpdateChildDescriptionAsPresent(
+		WdfFdoGetDefaultChildList(Device),
+		&description.Header,
+		NULL
+	);
+
+	if (!NT_SUCCESS(status))
+	{
+		TraceEvents(TRACE_LEVEL_ERROR,
+			TRACE_BUSENUM,
+			"WdfChildListAddOrUpdateChildDescriptionAsPresent failed with status %!STATUS!",
+			status);
+
+		goto pluginEnd;
+	}
+
+	//
+	// The requested serial number is already in use
+	// 
+	if (status == STATUS_OBJECT_NAME_EXISTS)
+	{
+		status = STATUS_INVALID_PARAMETER;
+
+		TraceEvents(TRACE_LEVEL_ERROR,
+			TRACE_BUSENUM,
+			"The described PDO already exists (%!STATUS!)",
+			status);
+
+		goto pluginEnd;
+	}
+
+	status = description.Target->EnqueuePlugin(Request);
+
+	status = NT_SUCCESS(status) ? STATUS_PENDING : status;
+
+pluginEnd:
+
+	TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSENUM, "%!FUNC! Exit with status %!STATUS!", status);
+
+	return status;
+}
+
+//
+// Simulates a device unplug event.
+// 
+EXTERN_C NTSTATUS Bus_UnPlugDevice(
+	_In_ WDFDEVICE Device,
+	_In_ WDFREQUEST Request,
+	_In_ BOOLEAN IsInternal,
+	_Out_ size_t* Transferred)
+{
+	NTSTATUS                            status;
+	WDFDEVICE                           hChild;
+	WDFCHILDLIST                        list;
+	WDF_CHILD_LIST_ITERATOR             iterator;
+	WDF_CHILD_RETRIEVE_INFO             childInfo;
+	PDO_IDENTIFICATION_DESCRIPTION      description;
+	BOOLEAN                             unplugAll;
+	PVIGEM_UNPLUG_TARGET                unPlug;
+	WDFFILEOBJECT                       fileObject;
+	PFDO_FILE_DATA                      pFileData = NULL;
+	size_t                              length = 0;
+
+	PAGED_CODE();
+
+	TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSENUM, "%!FUNC! Entry");
+
+	status = WdfRequestRetrieveInputBuffer(
+		Request,
+		sizeof(VIGEM_UNPLUG_TARGET),
+		(PVOID*)&unPlug,
+		&length
+	);
+
+	if (!NT_SUCCESS(status))
+	{
+		TraceEvents(TRACE_LEVEL_ERROR,
+			TRACE_BUSENUM,
+			"WdfRequestRetrieveInputBuffer failed with status %!STATUS!",
+			status);
+		return status;
+	}
+
+	if ((sizeof(VIGEM_UNPLUG_TARGET) != unPlug->Size) || (length != unPlug->Size))
+	{
+		TraceEvents(TRACE_LEVEL_ERROR,
+			TRACE_BUSENUM,
+			"sizeof(VIGEM_UNPLUG_TARGET) buffer size mismatch [%d != %d]",
+			sizeof(VIGEM_UNPLUG_TARGET), unPlug->Size);
+		return STATUS_INVALID_PARAMETER;
+	}
+
+	*Transferred = length;
+	unplugAll = (unPlug->SerialNo == 0);
+
+	fileObject = WdfRequestGetFileObject(Request);
+	if (fileObject == NULL)
+	{
+		TraceEvents(TRACE_LEVEL_ERROR,
+			TRACE_BUSENUM,
+			"WdfRequestGetFileObject failed to fetch WDFFILEOBJECT from request 0x%p",
+			Request);
+		return STATUS_INVALID_PARAMETER;
+	}
+
+	pFileData = FileObjectGetData(fileObject);
+	if (pFileData == NULL)
+	{
+		TraceEvents(TRACE_LEVEL_ERROR,
+			TRACE_BUSENUM,
+			"FileObjectGetData failed to get context data for 0x%p",
+			fileObject);
+		return STATUS_INVALID_PARAMETER;
+	}
+
+	TraceEvents(TRACE_LEVEL_VERBOSE,
+		TRACE_BUSENUM,
+		"Starting child list traversal");
+
+	list = WdfFdoGetDefaultChildList(Device);
+
+	WDF_CHILD_LIST_ITERATOR_INIT(&iterator, WdfRetrievePresentChildren);
+
+	WdfChildListBeginIteration(list, &iterator);
+
+	for (;;)
+	{
+		WDF_CHILD_RETRIEVE_INFO_INIT(&childInfo, &description.Header);
+		WDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER_INIT(&description.Header, sizeof(description));
+
+		status = WdfChildListRetrieveNextDevice(list, &iterator, &hChild, &childInfo);
+
+		// Error or no more children, end loop
+		if (!NT_SUCCESS(status) || status == STATUS_NO_MORE_ENTRIES)
+		{
+			TraceEvents(TRACE_LEVEL_VERBOSE,
+				TRACE_BUSENUM,
+				"WdfChildListRetrieveNextDevice returned with status %!STATUS!",
+				status);
+			break;
+		}
+
+		// If unable to retrieve device
+		if (childInfo.Status != WdfChildListRetrieveDeviceSuccess)
+		{
+			TraceEvents(TRACE_LEVEL_VERBOSE,
+				TRACE_BUSENUM,
+				"childInfo.Status = %d",
+				childInfo.Status);
+			continue;
+		}
+
+		// Child isn't the one we looked for, skip
+		if (!unplugAll && description.SerialNo != unPlug->SerialNo)
+		{
+			TraceEvents(TRACE_LEVEL_VERBOSE,
+				TRACE_BUSENUM,
+				"Seeking serial mismatch: %d != %d",
+				description.SerialNo,
+				unPlug->SerialNo);
+			continue;
+		}
+
+		TraceEvents(TRACE_LEVEL_VERBOSE,
+			TRACE_BUSENUM,
+			"description.SessionId = %d, pFileData->SessionId = %d",
+			description.SessionId,
+			pFileData->SessionId);
+
+		// Only unplug owned children
+		if (IsInternal || description.SessionId == pFileData->SessionId)
+		{
+			// Unplug child
+			status = WdfChildListUpdateChildDescriptionAsMissing(list, &description.Header);
+			if (!NT_SUCCESS(status))
+			{
+				TraceEvents(TRACE_LEVEL_ERROR,
+					TRACE_BUSENUM,
+					"WdfChildListUpdateChildDescriptionAsMissing failed with status %!STATUS!",
+					status);
+			}
+		}
+	}
+
+	WdfChildListEndIteration(list, &iterator);
+
+	TraceEvents(TRACE_LEVEL_VERBOSE,
+		TRACE_BUSENUM,
+		"Finished child list traversal");
+
+	TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSENUM, "%!FUNC! Exit with status %!STATUS!", STATUS_SUCCESS);
+
+	return STATUS_SUCCESS;
+}
--- a/sys/busenum.h
+++ b/sys/busenum.h
@@ -3,7 +3,7 @@
 *
 * MIT License
 *
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
+* Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -32,86 +32,73 @@
 #include <wdf.h>
 #define NTSTRSAFE_LIB
 #include <ntstrsafe.h>
-#include <ntintsafe.h>
 #include <initguid.h>
 #include "ViGEmBusDriver.h"
 #include <ViGEm/km/BusShared.h>
-#include "Queue.h"
-#include <usb.h>
-#include <usbbusif.h>
-#include "Context.h"
-#include "Util.h"
-#include "UsbPdo.h"
-#include "Xusb.h"
-#include "Ds4.h"
-#include "Xgip.h"
+#include "Queue.hpp"
+


 #pragma region Macros

-#define MAX_INSTANCE_ID_LEN             80
-#define HID_LANGUAGE_ID_LENGTH          0x04
-
-#define HID_REQUEST_GET_REPORT          0x01
-#define HID_REQUEST_SET_REPORT          0x09
-#define HID_REPORT_TYPE_FEATURE         0x03
-
-#define VIGEM_POOL_TAG                  0x45476956 // "EGiV"
-#define XUSB_POOL_TAG                   'BSUX'
 #define DRIVERNAME                      "ViGEm: "
-#define MAX_HARDWARE_ID_LENGTH          0xFF
-
-#define ORC_PC_FREQUENCY_DIVIDER        1000
-#define ORC_TIMER_START_DELAY           500 // ms
-#define ORC_TIMER_PERIODIC_DUE_TIME     500 // ms
-#define ORC_REQUEST_MAX_AGE             500 // ms

 #pragma endregion

-#pragma region Helpers
-
 //
-// Extracts the HID Report ID from the supplied class request.
-//
-#define HID_GET_REPORT_ID(_req_) ((_req_->Value) & 0xFF)
-
-//
-// Extracts the HID Report type from the supplied class request.
-//
-#define HID_GET_REPORT_TYPE(_req_) ((_req_->Value >> 8) & 0xFF)
-
-//
-// Some insane macro-magic =3
+// FDO (bus device) context data
 // 
-#define P99_PROTECT(...) __VA_ARGS__
-#define COPY_BYTE_ARRAY(_dst_, _bytes_)   do {BYTE b[] = _bytes_; \
-                                            RtlCopyMemory(_dst_, b, RTL_NUMBER_OF_V1(b)); } while (0)
+typedef struct _FDO_DEVICE_DATA
+{
+    //
+    // Counter of interface references
+    // 
+    LONG InterfaceReferenceCounter;

-#pragma endregion
+    //
+    // Next SessionId to assign to a file handle
+    // 
+    LONG NextSessionId;

+} FDO_DEVICE_DATA, * PFDO_DEVICE_DATA;
+
+#define FDO_FIRST_SESSION_ID 100
+
+WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(FDO_DEVICE_DATA, FdoGetData)
+
+// 
+// Context data associated with file objects created by user mode applications
+// 
+typedef struct _FDO_FILE_DATA
+{
+    //
+    // SessionId associated with file handle.  Used to map file handles to emulated gamepad devices
+    // 
+    LONG SessionId;
+
+} FDO_FILE_DATA, * PFDO_FILE_DATA;
+
+WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(FDO_FILE_DATA, FileObjectGetData)
+
+
+EXTERN_C_START

 #pragma region WDF callback prototypes

 DRIVER_INITIALIZE DriverEntry;

 EVT_WDF_DRIVER_DEVICE_ADD Bus_EvtDeviceAdd;
+
 EVT_WDF_DEVICE_FILE_CREATE Bus_DeviceFileCreate;
+
 EVT_WDF_FILE_CLOSE Bus_FileClose;

 EVT_WDF_CHILD_LIST_CREATE_DEVICE Bus_EvtDeviceListCreatePdo;

 EVT_WDF_CHILD_LIST_IDENTIFICATION_DESCRIPTION_COMPARE Bus_EvtChildListIdentificationDescriptionCompare;

-EVT_WDF_DEVICE_PREPARE_HARDWARE Pdo_EvtDevicePrepareHardware;
-
-EVT_WDF_IO_QUEUE_IO_INTERNAL_DEVICE_CONTROL Pdo_EvtIoInternalDeviceControl;
-
-EVT_WDF_TIMER Xgip_SysInitTimerFunc;
-
 EVT_WDF_OBJECT_CONTEXT_CLEANUP Bus_EvtDriverContextCleanup;

-EVT_WDF_TIMER Bus_PlugInRequestCleanUpEvtTimerFunc;
-
 #pragma endregion

 #pragma region Bus enumeration-specific functions
@@ -132,48 +119,6 @@ Bus_UnPlugDevice(
    _Out_ size_t* Transferred
 );

-NTSTATUS
-Bus_CreatePdo(
-    _In_ WDFDEVICE Device,
-    _In_ PWDFDEVICE_INIT ChildInit,
-    _In_ PPDO_IDENTIFICATION_DESCRIPTION Description
-);
-
-NTSTATUS
-Bus_QueueNotification(
-    WDFDEVICE Device,
-    ULONG SerialNo,
-    WDFREQUEST Request
-);
-
-NTSTATUS
-Bus_XgipSubmitReport(
-    WDFDEVICE Device,
-    ULONG SerialNo,
-    PXGIP_SUBMIT_REPORT Report,
-    _In_ BOOLEAN FromInterface
-);
-
-NTSTATUS
-Bus_SubmitReport(
-    WDFDEVICE Device,
-    ULONG SerialNo,
-    PVOID Report,
-    _In_ BOOLEAN FromInterface
-);
-
-WDFDEVICE 
-Bus_GetPdo(
-    IN WDFDEVICE Device, 
-    IN ULONG SerialNo);
-
-VOID
-Bus_PdoStageResult(
-    _In_ PINTERFACE InterfaceHeader,
-    _In_ VIGEM_PDO_STAGE Stage,
-    _In_ ULONG Serial,
-    _In_ NTSTATUS Status
-);
-
 #pragma endregion

+EXTERN_C_END
--- a/sys/buspdo.c
+++ b/sys/buspdo.c
@@ -1,912 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#include "busenum.h"
-#include <wdmsec.h>
-#include <usbioctl.h>
-#include "buspdo.tmh"
-
-#ifdef ALLOC_PRAGMA
-#pragma alloc_text(PAGE, Bus_CreatePdo)
-#pragma alloc_text(PAGE, Bus_EvtDeviceListCreatePdo)
-#pragma alloc_text(PAGE, Pdo_EvtDevicePrepareHardware)
-#endif
-
-NTSTATUS Bus_EvtDeviceListCreatePdo(
-    WDFCHILDLIST DeviceList,
-    PWDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER IdentificationDescription,
-    PWDFDEVICE_INIT ChildInit)
-{
-    PPDO_IDENTIFICATION_DESCRIPTION pDesc;
-
-    PAGED_CODE();
-
-    pDesc = CONTAINING_RECORD(IdentificationDescription, PDO_IDENTIFICATION_DESCRIPTION, Header);
-
-    return Bus_CreatePdo(WdfChildListGetDevice(DeviceList), ChildInit, pDesc);
-}
-
-//
-// Compares two children on the bus based on their serial numbers.
-// 
-BOOLEAN Bus_EvtChildListIdentificationDescriptionCompare(
-    WDFCHILDLIST DeviceList,
-    PWDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER FirstIdentificationDescription,
-    PWDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER SecondIdentificationDescription)
-{
-    PPDO_IDENTIFICATION_DESCRIPTION lhs, rhs;
-
-    UNREFERENCED_PARAMETER(DeviceList);
-
-    lhs = CONTAINING_RECORD(FirstIdentificationDescription,
-        PDO_IDENTIFICATION_DESCRIPTION,
-        Header);
-    rhs = CONTAINING_RECORD(SecondIdentificationDescription,
-        PDO_IDENTIFICATION_DESCRIPTION,
-        Header);
-
-    return (lhs->SerialNo == rhs->SerialNo) ? TRUE : FALSE;
-}
-
-//
-// Creates and initializes a PDO (child).
-// 
-NTSTATUS Bus_CreatePdo(
-    _In_ WDFDEVICE Device,
-    _In_ PWDFDEVICE_INIT DeviceInit,
-    _In_ PPDO_IDENTIFICATION_DESCRIPTION Description)
-{
-    NTSTATUS                        status;
-    PPDO_DEVICE_DATA                pdoData;
-    WDFDEVICE                       hChild = NULL;
-    WDF_DEVICE_PNP_CAPABILITIES     pnpCaps;
-    WDF_DEVICE_POWER_CAPABILITIES   powerCaps;
-    WDF_PNPPOWER_EVENT_CALLBACKS    pnpPowerCallbacks;
-    WDF_OBJECT_ATTRIBUTES           pdoAttributes;
-    WDF_IO_QUEUE_CONFIG             defaultPdoQueueConfig;
-    WDFQUEUE                        defaultPdoQueue;
-    UNICODE_STRING                  deviceDescription;
-    VIGEM_BUS_INTERFACE             busInterface;
-    WDF_OBJECT_ATTRIBUTES           attributes;
-    WDF_IO_QUEUE_CONFIG             usbInQueueConfig;
-    WDF_IO_QUEUE_CONFIG             notificationsQueueConfig;
-
-    DECLARE_CONST_UNICODE_STRING(deviceLocation, L"Virtual Gamepad Emulation Bus");
-    DECLARE_UNICODE_STRING_SIZE(buffer, MAX_INSTANCE_ID_LEN);
-    // reserve space for device id
-    DECLARE_UNICODE_STRING_SIZE(deviceId, MAX_INSTANCE_ID_LEN);
-
-
-    PAGED_CODE();
-
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_DRIVER, "%!FUNC! Entry");
-
-    //
-    // Get the FDO interface ASAP to report progress to bus
-    // 
-    status = WdfFdoQueryForInterface(Device,
-        &GUID_VIGEM_INTERFACE_PDO,
-        (PINTERFACE)&busInterface,
-        sizeof(VIGEM_BUS_INTERFACE),
-        VIGEM_BUS_INTERFACE_VERSION,
-        NULL);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "WdfFdoQueryForInterface failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    // set device type
-    WdfDeviceInitSetDeviceType(DeviceInit, FILE_DEVICE_BUS_EXTENDER);
-    // Bus is power policy owner
-    WdfDeviceInitSetPowerPolicyOwnership(DeviceInit, FALSE);
-
-#pragma region Enter RAW device mode
-
-    status = WdfPdoInitAssignRawDevice(DeviceInit, &GUID_DEVCLASS_VIGEM_RAWPDO);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "WdfPdoInitAssignRawDevice failed with status %!STATUS!",
-            status);
-        goto endCreatePdo;
-    }
-
-    WdfDeviceInitSetCharacteristics(DeviceInit, FILE_AUTOGENERATED_DEVICE_NAME, TRUE);
-
-    status = WdfDeviceInitAssignSDDLString(DeviceInit, &SDDL_DEVOBJ_SYS_ALL_ADM_RWX_WORLD_RWX_RES_RWX);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "WdfDeviceInitAssignSDDLString failed with status %!STATUS!",
-            status);
-        goto endCreatePdo;
-    }
-
-#pragma endregion
-
-#pragma region Prepare PDO
-
-    // set parameters matching desired target device
-    switch (Description->TargetType)
-    {
-        //
-        // A Xbox 360 device was requested
-        // 
-    case Xbox360Wired:
-
-        status = Xusb_PreparePdo(
-            DeviceInit,
-            Description->VendorId,
-            Description->ProductId,
-            &deviceId,
-            &deviceDescription);
-
-        if (!NT_SUCCESS(status))
-            goto endCreatePdo;
-
-        break;
-
-        //
-        // A Sony DualShock 4 device was requested
-        // 
-    case DualShock4Wired:
-
-        status = Ds4_PreparePdo(DeviceInit, &deviceId, &deviceDescription);
-
-        if (!NT_SUCCESS(status))
-            goto endCreatePdo;
-
-        break;
-
-        //
-        // A Xbox One device was requested
-        // 
-    case XboxOneWired:
-
-        status = Xgip_PreparePdo(DeviceInit, &deviceId, &deviceDescription);
-
-        if (!NT_SUCCESS(status))
-            goto endCreatePdo;
-
-        break;
-
-    default:
-
-        status = STATUS_INVALID_PARAMETER;
-
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "Unknown target type: %d (%!STATUS!)",
-            Description->TargetType,
-            status);
-
-        goto endCreatePdo;
-    }
-
-    // set device id
-    status = WdfPdoInitAssignDeviceID(DeviceInit, &deviceId);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "WdfPdoInitAssignDeviceID failed with status %!STATUS!",
-            status);
-        goto endCreatePdo;
-    }
-
-    // prepare instance id
-    status = RtlUnicodeStringPrintf(&buffer, L"%02d", Description->SerialNo);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "RtlUnicodeStringPrintf failed with status %!STATUS!",
-            status);
-        goto endCreatePdo;
-    }
-
-    // set instance id
-    status = WdfPdoInitAssignInstanceID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "WdfPdoInitAssignInstanceID failed with status %!STATUS!",
-            status);
-        goto endCreatePdo;
-    }
-
-    // set device description (for English operating systems)
-    status = WdfPdoInitAddDeviceText(DeviceInit, &deviceDescription, &deviceLocation, 0x409);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "WdfPdoInitAddDeviceText failed with status %!STATUS!",
-            status);
-        goto endCreatePdo;
-    }
-
-    // default locale is English
-    // TODO: add more locales
-    WdfPdoInitSetDefaultLocale(DeviceInit, 0x409);
-
-#pragma endregion
-
-#pragma region PNP/Power event callbacks
-
-    WDF_PNPPOWER_EVENT_CALLBACKS_INIT(&pnpPowerCallbacks);
-
-    pnpPowerCallbacks.EvtDevicePrepareHardware = Pdo_EvtDevicePrepareHardware;
-
-    WdfDeviceInitSetPnpPowerEventCallbacks(DeviceInit, &pnpPowerCallbacks);
-
-#pragma endregion
-
-    // NOTE: not utilized at the moment
-    WdfPdoInitAllowForwardingRequestToParent(DeviceInit);
-
-#pragma region Create PDO
-
-    // Add common device data context
-    WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&pdoAttributes, PDO_DEVICE_DATA);
-
-    status = WdfDeviceCreate(&DeviceInit, &pdoAttributes, &hChild);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "WdfDeviceCreate failed with status %!STATUS!",
-            status);
-        goto endCreatePdo;
-    }
-
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_BUSPDO,
-        "Created PDO 0x%p",
-        hChild);
-
-    switch (Description->TargetType)
-    {
-        // Add XUSB-specific device data context
-    case Xbox360Wired:
-    {
-        PXUSB_DEVICE_DATA xusbData = NULL;
-        WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&pdoAttributes, XUSB_DEVICE_DATA);
-
-        status = WdfObjectAllocateContext(hChild, &pdoAttributes, (PVOID)&xusbData);
-        if (!NT_SUCCESS(status))
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_BUSPDO,
-                "WdfObjectAllocateContext failed with status %!STATUS!",
-                status);
-            goto endCreatePdo;
-        }
-
-        break;
-    }
-    case DualShock4Wired:
-    {
-        PDS4_DEVICE_DATA ds4Data = NULL;
-        WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&pdoAttributes, DS4_DEVICE_DATA);
-
-        status = WdfObjectAllocateContext(hChild, &pdoAttributes, (PVOID)&ds4Data);
-        if (!NT_SUCCESS(status))
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_BUSPDO,
-                "WdfObjectAllocateContext failed with status %!STATUS!",
-                status);
-            goto endCreatePdo;
-        }
-
-        break;
-    }
-    case XboxOneWired:
-    {
-        PXGIP_DEVICE_DATA xgipData = NULL;
-        WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&pdoAttributes, XGIP_DEVICE_DATA);
-
-        status = WdfObjectAllocateContext(hChild, &pdoAttributes, (PVOID)&xgipData);
-        if (!NT_SUCCESS(status))
-        {
-            TraceEvents(TRACE_LEVEL_ERROR,
-                TRACE_BUSPDO,
-                "WdfObjectAllocateContext failed with status %!STATUS!",
-                status);
-            goto endCreatePdo;
-        }
-
-        break;
-    }
-    default:
-        break;
-    }
-
-#pragma endregion
-
-#pragma region Expose USB Interface
-
-    status = WdfDeviceCreateDeviceInterface(Device, (LPGUID)&GUID_DEVINTERFACE_USB_DEVICE, NULL);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "WdfDeviceCreateDeviceInterface failed with status %!STATUS!",
-            status);
-        goto endCreatePdo;
-    }
-
-#pragma endregion
-
-#pragma region Set PDO contexts
-
-    pdoData = PdoGetData(hChild);
-
-    pdoData->BusInterface = busInterface;
-
-    pdoData->SerialNo = Description->SerialNo;
-    pdoData->TargetType = Description->TargetType;
-    pdoData->OwnerProcessId = Description->OwnerProcessId;
-    pdoData->VendorId = Description->VendorId;
-    pdoData->ProductId = Description->ProductId;
-
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_BUSPDO,
-        "PDO Context properties: serial = %d, type = %d, pid = %d, vid = 0x%04X, pid = 0x%04X",
-        pdoData->SerialNo,
-        pdoData->TargetType,
-        pdoData->OwnerProcessId,
-        pdoData->VendorId,
-        pdoData->ProductId);
-
-    // Initialize additional contexts (if available)
-    switch (Description->TargetType)
-    {
-    case Xbox360Wired:
-
-        status = Xusb_AssignPdoContext(hChild);
-
-        break;
-
-    case DualShock4Wired:
-
-        status = Ds4_AssignPdoContext(hChild, Description);
-
-        break;
-
-    case XboxOneWired:
-
-        status = Xgip_AssignPdoContext(hChild);
-
-        break;
-
-    default:
-        break;
-    }
-
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "Couldn't initialize additional contexts: %!STATUS!",
-            status);
-
-        goto endCreatePdo;
-    }
-
-#pragma endregion
-
-#pragma region Create Queues & Locks
-
-    WDF_OBJECT_ATTRIBUTES_INIT(&attributes);
-    attributes.ParentObject = hChild;
-
-    // Create and assign queue for incoming interrupt transfer
-    WDF_IO_QUEUE_CONFIG_INIT(&usbInQueueConfig, WdfIoQueueDispatchManual);
-
-    status = WdfIoQueueCreate(hChild, &usbInQueueConfig, WDF_NO_OBJECT_ATTRIBUTES, &pdoData->PendingUsbInRequests);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "WdfIoQueueCreate (PendingUsbInRequests) failed with status %!STATUS!",
-            status);
-        goto endCreatePdo;
-    }
-
-    // Create and assign queue for user-land notification requests
-    WDF_IO_QUEUE_CONFIG_INIT(&notificationsQueueConfig, WdfIoQueueDispatchManual);
-
-    status = WdfIoQueueCreate(Device, &notificationsQueueConfig, WDF_NO_OBJECT_ATTRIBUTES, &pdoData->PendingNotificationRequests);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "WdfIoQueueCreate (PendingNotificationRequests) failed with status %!STATUS!",
-            status);
-        goto endCreatePdo;
-    }
-
-#pragma endregion 
-
-#pragma region Default I/O queue setup
-
-    WDF_IO_QUEUE_CONFIG_INIT_DEFAULT_QUEUE(&defaultPdoQueueConfig, WdfIoQueueDispatchParallel);
-
-    defaultPdoQueueConfig.EvtIoInternalDeviceControl = Pdo_EvtIoInternalDeviceControl;
-
-    status = WdfIoQueueCreate(hChild, &defaultPdoQueueConfig, WDF_NO_OBJECT_ATTRIBUTES, &defaultPdoQueue);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_BUSPDO,
-            "WdfIoQueueCreate (Default) failed with status %!STATUS!",
-            status);
-        goto endCreatePdo;
-    }
-
-#pragma endregion
-
-#pragma region PNP capabilities
-
-    WDF_DEVICE_PNP_CAPABILITIES_INIT(&pnpCaps);
-
-    pnpCaps.Removable = WdfTrue;
-    pnpCaps.EjectSupported = WdfTrue;
-    pnpCaps.SurpriseRemovalOK = WdfTrue;
-
-    pnpCaps.Address = Description->SerialNo;
-    pnpCaps.UINumber = Description->SerialNo;
-
-    WdfDeviceSetPnpCapabilities(hChild, &pnpCaps);
-
-#pragma endregion
-
-#pragma region Power capabilities
-
-    WDF_DEVICE_POWER_CAPABILITIES_INIT(&powerCaps);
-
-    powerCaps.DeviceD1 = WdfTrue;
-    powerCaps.WakeFromD1 = WdfTrue;
-    powerCaps.DeviceWake = PowerDeviceD1;
-
-    powerCaps.DeviceState[PowerSystemWorking] = PowerDeviceD0;
-    powerCaps.DeviceState[PowerSystemSleeping1] = PowerDeviceD1;
-    powerCaps.DeviceState[PowerSystemSleeping2] = PowerDeviceD3;
-    powerCaps.DeviceState[PowerSystemSleeping3] = PowerDeviceD3;
-    powerCaps.DeviceState[PowerSystemHibernate] = PowerDeviceD3;
-    powerCaps.DeviceState[PowerSystemShutdown] = PowerDeviceD3;
-
-    WdfDeviceSetPowerCapabilities(hChild, &powerCaps);
-
-#pragma endregion
-
-    endCreatePdo:
-                TraceEvents(TRACE_LEVEL_INFORMATION,
-                    TRACE_BUSPDO,
-                    "BUS_PDO_REPORT_STAGE_RESULT Stage: ViGEmPdoCreate  [serial: %d, status: %!STATUS!]",
-                    Description->SerialNo, status);
-
-                BUS_PDO_REPORT_STAGE_RESULT(busInterface, ViGEmPdoCreate, Description->SerialNo, status);
-
-                TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSPDO, "%!FUNC! Exit with status %!STATUS!", status);
-
-                return status;
-}
-
-//
-// PDO power-up.
-// 
-NTSTATUS Pdo_EvtDevicePrepareHardware(
-    _In_ WDFDEVICE Device,
-    _In_ WDFCMRESLIST ResourcesRaw,
-    _In_ WDFCMRESLIST ResourcesTranslated
-)
-{
-    PPDO_DEVICE_DATA    pdoData;
-    NTSTATUS            status = STATUS_UNSUCCESSFUL;
-
-    PAGED_CODE();
-
-    UNREFERENCED_PARAMETER(ResourcesRaw);
-    UNREFERENCED_PARAMETER(ResourcesTranslated);
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSENUM, "%!FUNC! Entry");
-
-    pdoData = PdoGetData(Device);
-
-    switch (pdoData->TargetType)
-    {
-        // Expose XUSB interfaces
-    case Xbox360Wired:
-
-        status = Xusb_PrepareHardware(Device);
-
-        break;
-
-    case DualShock4Wired:
-
-        status = Ds4_PrepareHardware(Device);
-
-        break;
-
-    case XboxOneWired:
-
-        status = Xgip_PrepareHardware(Device);
-
-        break;
-
-    default:
-        break;
-    }
-
-    TraceEvents(TRACE_LEVEL_INFORMATION,
-        TRACE_BUSPDO,
-        "BUS_PDO_REPORT_STAGE_RESULT Stage: ViGEmPdoCreate  [serial: %d, status: %!STATUS!]",
-        pdoData->SerialNo, status);
-
-    BUS_PDO_REPORT_STAGE_RESULT(pdoData->BusInterface, ViGEmPdoPrepareHardware, pdoData->SerialNo, status);
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_BUSPDO, "%!FUNC! Exit with status %!STATUS!", status);
-
-    return status;
-}
-
-//
-// Responds to IRP_MJ_INTERNAL_DEVICE_CONTROL requests sent to PDO.
-// 
-VOID Pdo_EvtIoInternalDeviceControl(
-    _In_ WDFQUEUE Queue,
-    _In_ WDFREQUEST Request,
-    _In_ size_t OutputBufferLength,
-    _In_ size_t InputBufferLength,
-    _In_ ULONG IoControlCode
-)
-{
-    // Regular buffers not used in USB communication
-    UNREFERENCED_PARAMETER(OutputBufferLength);
-    UNREFERENCED_PARAMETER(InputBufferLength);
-
-    NTSTATUS                status = STATUS_INVALID_PARAMETER;
-    WDFDEVICE               hDevice;
-    PIRP                    irp;
-    PURB                    urb;
-    PPDO_DEVICE_DATA        pdoData;
-    PIO_STACK_LOCATION      irpStack;
-    PXUSB_DEVICE_DATA       pXusbData;
-    PUCHAR                  blobBuffer;
-
-
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_BUSPDO, "%!FUNC! Entry");
-
-    hDevice = WdfIoQueueGetDevice(Queue);
-    pdoData = PdoGetData(hDevice);
-    // No help from the framework available from here on
-    irp = WdfRequestWdmGetIrp(Request);
-    irpStack = IoGetCurrentIrpStackLocation(irp);
-
-    switch (IoControlCode)
-    {
-    case IOCTL_INTERNAL_USB_SUBMIT_URB:
-
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_BUSPDO,
-            ">> IOCTL_INTERNAL_USB_SUBMIT_URB");
-
-        urb = (PURB)URB_FROM_IRP(irp);
-
-        switch (urb->UrbHeader.Function)
-        {
-        case URB_FUNCTION_CONTROL_TRANSFER:
-
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSPDO,
-                ">> >> URB_FUNCTION_CONTROL_TRANSFER");
-
-            switch (urb->UrbControlTransfer.SetupPacket[6])
-            {
-            case 0x04:
-                if (pdoData->TargetType == Xbox360Wired)
-                {
-                    pXusbData = XusbGetData(hDevice);
-                    blobBuffer = WdfMemoryGetBuffer(pXusbData->InterruptBlobStorage, NULL);
-                    //
-                    // Xenon magic
-                    // 
-                    RtlCopyMemory(
-                        urb->UrbControlTransfer.TransferBuffer,
-                        &blobBuffer[XUSB_BLOB_07_OFFSET],
-                        0x04
-                    );
-                    status = STATUS_SUCCESS;
-                }
-                break;
-            case 0x14:
-                //
-                // This is some weird USB 1.0 condition and _must fail_
-                // 
-                urb->UrbControlTransfer.Hdr.Status = USBD_STATUS_STALL_PID;
-                status = STATUS_UNSUCCESSFUL;
-                break;
-            case 0x08:
-                //
-                // This is some weird USB 1.0 condition and _must fail_
-                // 
-                urb->UrbControlTransfer.Hdr.Status = USBD_STATUS_STALL_PID;
-                status = STATUS_UNSUCCESSFUL;
-                break;
-            default:
-                status = STATUS_SUCCESS;
-                break;
-            }
-
-            break;
-
-        case URB_FUNCTION_CONTROL_TRANSFER_EX:
-
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSPDO,
-                ">> >> URB_FUNCTION_CONTROL_TRANSFER_EX");
-
-            status = STATUS_UNSUCCESSFUL;
-
-            break;
-
-        case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER:
-
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSPDO,
-                ">> >> URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER");
-
-            status = UsbPdo_BulkOrInterruptTransfer(urb, hDevice, Request);
-
-            break;
-
-        case URB_FUNCTION_SELECT_CONFIGURATION:
-
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSPDO,
-                ">> >> URB_FUNCTION_SELECT_CONFIGURATION");
-
-            status = UsbPdo_SelectConfiguration(urb, pdoData);
-
-            break;
-
-        case URB_FUNCTION_SELECT_INTERFACE:
-
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSPDO,
-                ">> >> URB_FUNCTION_SELECT_INTERFACE");
-
-            status = UsbPdo_SelectInterface(urb, pdoData);
-
-            break;
-
-        case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE:
-
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSPDO,
-                ">> >> URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE");
-
-            switch (urb->UrbControlDescriptorRequest.DescriptorType)
-            {
-            case USB_DEVICE_DESCRIPTOR_TYPE:
-
-                TraceEvents(TRACE_LEVEL_VERBOSE,
-                    TRACE_BUSPDO,
-                    ">> >> >> USB_DEVICE_DESCRIPTOR_TYPE");
-
-                status = UsbPdo_GetDeviceDescriptorType(urb, pdoData);
-
-                break;
-
-            case USB_CONFIGURATION_DESCRIPTOR_TYPE:
-
-                TraceEvents(TRACE_LEVEL_VERBOSE,
-                    TRACE_BUSPDO,
-                    ">> >> >> USB_CONFIGURATION_DESCRIPTOR_TYPE");
-
-                status = UsbPdo_GetConfigurationDescriptorType(urb, pdoData);
-
-                break;
-
-            case USB_STRING_DESCRIPTOR_TYPE:
-
-                TraceEvents(TRACE_LEVEL_VERBOSE,
-                    TRACE_BUSPDO,
-                    ">> >> >> USB_STRING_DESCRIPTOR_TYPE");
-
-                status = UsbPdo_GetStringDescriptorType(urb, pdoData);
-
-                break;
-            case USB_INTERFACE_DESCRIPTOR_TYPE:
-
-                TraceEvents(TRACE_LEVEL_VERBOSE,
-                    TRACE_BUSPDO,
-                    ">> >> >> USB_INTERFACE_DESCRIPTOR_TYPE");
-
-                break;
-
-            case USB_ENDPOINT_DESCRIPTOR_TYPE:
-
-                TraceEvents(TRACE_LEVEL_VERBOSE,
-                    TRACE_BUSPDO,
-                    ">> >> >> USB_ENDPOINT_DESCRIPTOR_TYPE");
-
-                break;
-
-            default:
-
-                TraceEvents(TRACE_LEVEL_VERBOSE,
-                    TRACE_BUSPDO,
-                    ">> >> >> Unknown descriptor type");
-
-                break;
-            }
-
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSPDO,
-                "<< <<");
-
-            break;
-
-        case URB_FUNCTION_GET_STATUS_FROM_DEVICE:
-
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSPDO,
-                ">> >> URB_FUNCTION_GET_STATUS_FROM_DEVICE");
-
-            // Defaults always succeed
-            status = STATUS_SUCCESS;
-
-            break;
-
-        case URB_FUNCTION_ABORT_PIPE:
-
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSPDO,
-                ">> >> URB_FUNCTION_ABORT_PIPE");
-
-            status = UsbPdo_AbortPipe(hDevice);
-
-            break;
-
-        case URB_FUNCTION_CLASS_INTERFACE:
-
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSPDO,
-                ">> >> URB_FUNCTION_CLASS_INTERFACE");
-
-            status = UsbPdo_ClassInterface(urb, hDevice, pdoData);
-
-            break;
-
-        case URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE:
-
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSPDO,
-                ">> >> URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE");
-
-            status = UsbPdo_GetDescriptorFromInterface(urb, pdoData);
-
-            //
-            // The DS4 is basically ready to operate at this stage
-            // 
-            if (pdoData->TargetType == DualShock4Wired)
-            {
-                //
-                // Report back to FDO that we are ready to operate
-                // 
-                BUS_PDO_REPORT_STAGE_RESULT(
-                    pdoData->BusInterface,
-                    ViGEmPdoInitFinished,
-                    pdoData->SerialNo,
-                    STATUS_SUCCESS
-                );
-            }
-
-            break;
-
-        default:
-
-            TraceEvents(TRACE_LEVEL_VERBOSE,
-                TRACE_BUSPDO,
-                ">> >>  Unknown function: 0x%X",
-                urb->UrbHeader.Function);
-
-            break;
-        }
-
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_BUSPDO,
-            "<<");
-
-        break;
-
-    case IOCTL_INTERNAL_USB_GET_PORT_STATUS:
-
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_BUSPDO,
-            ">> IOCTL_INTERNAL_USB_GET_PORT_STATUS");
-
-        // We report the (virtual) port as always active
-        *(unsigned long *)irpStack->Parameters.Others.Argument1 = USBD_PORT_ENABLED | USBD_PORT_CONNECTED;
-
-        status = STATUS_SUCCESS;
-
-        break;
-
-    case IOCTL_INTERNAL_USB_RESET_PORT:
-
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_BUSPDO,
-            ">> IOCTL_INTERNAL_USB_RESET_PORT");
-
-        // Sure, why not ;)
-        status = STATUS_SUCCESS;
-
-        break;
-
-    case IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION:
-
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_BUSPDO,
-            ">> IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION");
-
-        // TODO: implement
-        // This happens if the I/O latency is too high so HIDUSB aborts communication.
-        status = STATUS_SUCCESS;
-
-        break;
-
-    default:
-
-        TraceEvents(TRACE_LEVEL_VERBOSE,
-            TRACE_BUSPDO,
-            ">> Unknown I/O control code 0x%X",
-            IoControlCode);
-
-        break;
-    }
-
-    if (status != STATUS_PENDING)
-    {
-        WdfRequestComplete(Request, status);
-    }
-
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_BUSPDO, "%!FUNC! Exit with status %!STATUS!", status);
-}
-
--- a/sys/buspdo.cpp
+++ b/sys/buspdo.cpp
@@ -0,0 +1,68 @@
+/*
+* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
+*
+* MIT License
+*
+* Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
+
+#include "busenum.h"
+#include "EmulationTargetPDO.hpp"
+
+#ifdef ALLOC_PRAGMA
+#pragma alloc_text(PAGE, Bus_EvtDeviceListCreatePdo)
+#endif
+
+EXTERN_C NTSTATUS Bus_EvtDeviceListCreatePdo(
+    WDFCHILDLIST DeviceList,
+    PWDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER IdentificationDescription,
+    PWDFDEVICE_INIT ChildInit)
+{
+	ViGEm::Bus::Core::PPDO_IDENTIFICATION_DESCRIPTION pDesc;
+
+    PAGED_CODE();
+
+    pDesc = CONTAINING_RECORD(IdentificationDescription, ViGEm::Bus::Core::PDO_IDENTIFICATION_DESCRIPTION, Header);
+
+    return pDesc->Target->PdoCreateDevice(WdfChildListGetDevice(DeviceList), ChildInit);
+}
+
+//
+// Compares two children on the bus based on their serial numbers.
+// 
+EXTERN_C BOOLEAN Bus_EvtChildListIdentificationDescriptionCompare(
+    WDFCHILDLIST DeviceList,
+    PWDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER FirstIdentificationDescription,
+    PWDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER SecondIdentificationDescription)
+{
+	ViGEm::Bus::Core::PPDO_IDENTIFICATION_DESCRIPTION lhs, rhs;
+
+    UNREFERENCED_PARAMETER(DeviceList);
+
+    lhs = CONTAINING_RECORD(FirstIdentificationDescription,
+        ViGEm::Bus::Core::PDO_IDENTIFICATION_DESCRIPTION,
+        Header);
+    rhs = CONTAINING_RECORD(SecondIdentificationDescription,
+        ViGEm::Bus::Core::PDO_IDENTIFICATION_DESCRIPTION,
+        Header);
+
+    return (lhs->SerialNo == rhs->SerialNo) ? TRUE : FALSE;
+}
--- a/sys/trace.h
+++ b/sys/trace.h
@@ -3,7 +3,7 @@
 *
 * MIT License
 *
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
+* Copyright (c) 2016-2020 Nefarius Software Solutions e.U. and Contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -68,5 +68,6 @@
 // begin_wpp config
 // FUNC Trace{FLAG=MYDRIVER_ALL_INFO}(LEVEL, MSG, ...);
 // FUNC TraceEvents(LEVEL, FLAGS, MSG, ...);
+// FUNC TraceDbg{LEVEL=TRACE_LEVEL_VERBOSE}(FLAGS, MSG, ...);
 // end_wpp
 //
--- a/sys/usbpdo.c
+++ b/sys/usbpdo.c
--- a/sys/util.c
+++ b/sys/util.c
@@ -1,62 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#include <ntifs.h>
-#include "busenum.h"
-#include "util.tmh"
-
-
-VOID ReverseByteArray(PUCHAR Array, INT Length)
-{
-    PUCHAR s = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, sizeof(UCHAR) * Length, VIGEM_POOL_TAG);
-    INT c, d;
-
-    if (s == NULL)
-        return;
-
-    for (c = Length - 1, d = 0; c >= 0; c--, d++)
-        *(s + d) = *(Array + c);
-
-    for (c = 0; c < Length; c++)
-        *(Array + c) = *(s + c);
-
-    ExFreePoolWithTag(s, VIGEM_POOL_TAG);
-}
-
-VOID GenerateRandomMacAddress(PMAC_ADDRESS Address)
-{
-    // Vendor "C0:13:37"
-    Address->Vendor0 = 0xC0;
-    Address->Vendor1 = 0x13;
-    Address->Vendor2 = 0x37;
-
-    ULONG seed = KeQueryPerformanceCounter(NULL).LowPart;
-    
-    Address->Nic0 = RtlRandomEx(&seed) % 0xFF;
-    Address->Nic1 = RtlRandomEx(&seed) % 0xFF;
-    Address->Nic2 = RtlRandomEx(&seed) % 0xFF;
-}
--- a/sys/xgip.c
+++ b/sys/xgip.c
@@ -1,409 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#include "busenum.h"
-#include <wdmguid.h>
-#include "xgip.tmh"
-
-NTSTATUS Xgip_PreparePdo(PWDFDEVICE_INIT DeviceInit, PUNICODE_STRING DeviceId, PUNICODE_STRING DeviceDescription)
-{
-    NTSTATUS status;
-    UNICODE_STRING buffer;
-
-    // prepare device description
-    status = RtlUnicodeStringInit(DeviceDescription, L"Virtual Xbox One Controller");
-    if (!NT_SUCCESS(status))
-        return status;
-
-    // Set hardware IDs
-    RtlUnicodeStringInit(&buffer, L"USB\\VID_0E6F&PID_0139&REV_0650");
-
-    status = WdfPdoInitAddHardwareID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-        return status;
-
-    RtlUnicodeStringCopy(DeviceId, &buffer);
-
-    RtlUnicodeStringInit(&buffer, L"USB\\VID_0E6F&PID_0139");
-
-    status = WdfPdoInitAddHardwareID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-        return status;
-
-    // Set compatible IDs
-    RtlUnicodeStringInit(&buffer, L"USB\\MS_COMP_XGIP10");
-
-    status = WdfPdoInitAddCompatibleID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-        return status;
-
-    RtlUnicodeStringInit(&buffer, L"USB\\Class_FF&SubClass_47&Prot_D0");
-
-    status = WdfPdoInitAddCompatibleID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-        return status;
-
-    RtlUnicodeStringInit(&buffer, L"USB\\Class_FF&SubClass_47");
-
-    status = WdfPdoInitAddCompatibleID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-        return status;
-
-    RtlUnicodeStringInit(&buffer, L"USB\\Class_FF");
-
-    status = WdfPdoInitAddCompatibleID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-        return status;
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS Xgip_PrepareHardware(WDFDEVICE Device)
-{
-    NTSTATUS status;
-    WDF_QUERY_INTERFACE_CONFIG ifaceCfg;
-
-    // Expose USB_BUS_INTERFACE_USBDI_GUID
-    USB_BUS_INTERFACE_USBDI_V1 xgipInterface;
-
-    xgipInterface.Size = sizeof(USB_BUS_INTERFACE_USBDI_V1);
-    xgipInterface.Version = USB_BUSIF_USBDI_VERSION_1;
-    xgipInterface.BusContext = (PVOID)Device;
-
-    xgipInterface.InterfaceReference = WdfDeviceInterfaceReferenceNoOp;
-    xgipInterface.InterfaceDereference = WdfDeviceInterfaceDereferenceNoOp;
-
-    xgipInterface.SubmitIsoOutUrb = UsbPdo_SubmitIsoOutUrb;
-    xgipInterface.GetUSBDIVersion = UsbPdo_GetUSBDIVersion;
-    xgipInterface.QueryBusTime = UsbPdo_QueryBusTime;
-    xgipInterface.QueryBusInformation = UsbPdo_QueryBusInformation;
-    xgipInterface.IsDeviceHighSpeed = UsbPdo_IsDeviceHighSpeed;
-
-    WDF_QUERY_INTERFACE_CONFIG_INIT(&ifaceCfg, (PINTERFACE)&xgipInterface, &USB_BUS_INTERFACE_USBDI_GUID, NULL);
-
-    status = WdfDeviceAddQueryInterface(Device, &ifaceCfg);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR, TRACE_XGIP, "WdfDeviceAddQueryInterface failed with status %!STATUS!", status);
-        return status;
-    }
-
-    // Default button states
-    UCHAR DefaultReport[XGIP_REPORT_SIZE] =
-    {
-        0x20, 0x00, 0x10, 0x0e, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0xa3, 0xfd, 0xed, 0x05, 0x5b, 0x03,
-        0x6f, 0x02
-    };
-
-    RtlCopyBytes(XgipGetData(Device)->Report, DefaultReport, XGIP_REPORT_SIZE);
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS Xgip_AssignPdoContext(WDFDEVICE Device)
-{
-    NTSTATUS status;
-
-    PXGIP_DEVICE_DATA xgip = XgipGetData(Device);
-
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XGIP, "Initializing XGIP context...");
-
-    RtlZeroMemory(xgip, sizeof(XGIP_DEVICE_DATA));
-
-    // Set fixed report id
-    xgip->Report[0] = 0x20;
-    xgip->Report[3] = 0x0E;
-
-    // I/O Queue for pending IRPs
-    WDF_IO_QUEUE_CONFIG pendingUsbQueueConfig, notificationsQueueConfig;
-
-    // Create and assign queue for incoming interrupt transfer
-    WDF_IO_QUEUE_CONFIG_INIT(&pendingUsbQueueConfig, WdfIoQueueDispatchManual);
-
-    status = WdfIoQueueCreate(Device, &pendingUsbQueueConfig, WDF_NO_OBJECT_ATTRIBUTES, &xgip->PendingUsbInRequests);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR, TRACE_XGIP, "WdfIoQueueCreate failed with status %!STATUS!", status);
-        return status;
-    }
-
-    // Create and assign queue for user-land notification requests
-    WDF_IO_QUEUE_CONFIG_INIT(&notificationsQueueConfig, WdfIoQueueDispatchManual);
-
-    status = WdfIoQueueCreate(Device, &notificationsQueueConfig, WDF_NO_OBJECT_ATTRIBUTES, &xgip->PendingNotificationRequests);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR, TRACE_XGIP, "WdfIoQueueCreate failed with status %!STATUS!", status);
-        return status;
-    }
-
-    WDF_OBJECT_ATTRIBUTES collectionAttribs;
-    WDF_OBJECT_ATTRIBUTES_INIT(&collectionAttribs);
-
-    collectionAttribs.ParentObject = Device;
-
-    status = WdfCollectionCreate(&collectionAttribs, &xgip->XboxgipSysInitCollection);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR, TRACE_XGIP, "WdfCollectionCreate failed with status %!STATUS!", status);
-        return status;
-    }
-
-    // Initialize periodic timer
-    WDF_TIMER_CONFIG timerConfig;
-    WDF_TIMER_CONFIG_INIT_PERIODIC(&timerConfig, Xgip_SysInitTimerFunc, XGIP_SYS_INIT_PERIOD);
-
-    // Timer object attributes
-    WDF_OBJECT_ATTRIBUTES timerAttribs;
-    WDF_OBJECT_ATTRIBUTES_INIT(&timerAttribs);
-
-    // PDO is parent
-    timerAttribs.ParentObject = Device;
-
-    // Create timer
-    status = WdfTimerCreate(&timerConfig, &timerAttribs, &xgip->XboxgipSysInitTimer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR, TRACE_XGIP, "WdfTimerCreate failed with status %!STATUS!", status);
-        return status;
-    }
-
-    return STATUS_SUCCESS;
-}
-
-VOID Xgip_GetConfigurationDescriptorType(PUCHAR Buffer, ULONG Length)
-{
-    UCHAR XgipDescriptorData[XGIP_DESCRIPTOR_SIZE] =
-    {
-        0x09,        //   bLength
-        0x02,        //   bDescriptorType (Configuration)
-        0x40, 0x00,  //   wTotalLength 64
-        0x02,        //   bNumInterfaces 2
-        0x01,        //   bConfigurationValue
-        0x00,        //   iConfiguration (String Index)
-        0xC0,        //   bmAttributes
-        0xFA,        //   bMaxPower 500mA
-
-        0x09,        //   bLength
-        0x04,        //   bDescriptorType (Interface)
-        0x00,        //   bInterfaceNumber 0
-        0x00,        //   bAlternateSetting
-        0x02,        //   bNumEndpoints 2
-        0xFF,        //   bInterfaceClass
-        0x47,        //   bInterfaceSubClass
-        0xD0,        //   bInterfaceProtocol
-        0x00,        //   iInterface (String Index)
-
-        0x07,        //   bLength
-        0x05,        //   bDescriptorType (Endpoint)
-        0x81,        //   bEndpointAddress (IN/D2H)
-        0x03,        //   bmAttributes (Interrupt)
-        0x40, 0x00,  //   wMaxPacketSize 64
-        0x04,        //   bInterval 4 (unit depends on device speed)
-
-        0x07,        //   bLength
-        0x05,        //   bDescriptorType (Endpoint)
-        0x01,        //   bEndpointAddress (OUT/H2D)
-        0x03,        //   bmAttributes (Interrupt)
-        0x40, 0x00,  //   wMaxPacketSize 64
-        0x04,        //   bInterval 4 (unit depends on device speed)
-
-        0x09,        //   bLength
-        0x04,        //   bDescriptorType (Interface)
-        0x01,        //   bInterfaceNumber 1
-        0x00,        //   bAlternateSetting
-        0x00,        //   bNumEndpoints 0
-        0xFF,        //   bInterfaceClass
-        0x47,        //   bInterfaceSubClass
-        0xD0,        //   bInterfaceProtocol
-        0x00,        //   iInterface (String Index)
-
-        0x09,        //   bLength
-        0x04,        //   bDescriptorType (Interface)
-        0x01,        //   bInterfaceNumber 1
-        0x01,        //   bAlternateSetting
-        0x02,        //   bNumEndpoints 2
-        0xFF,        //   bInterfaceClass
-        0x47,        //   bInterfaceSubClass
-        0xD0,        //   bInterfaceProtocol
-        0x00,        //   iInterface (String Index)
-
-        0x07,        //   bLength
-        0x05,        //   bDescriptorType (Endpoint)
-        0x02,        //   bEndpointAddress (OUT/H2D)
-        0x01,        //   bmAttributes (Isochronous, No Sync, Data EP)
-        0xE0, 0x00,  //   wMaxPacketSize 224
-        0x01,        //   bInterval 1 (unit depends on device speed)
-
-        0x07,        //   bLength
-        0x05,        //   bDescriptorType (Endpoint)
-        0x83,        //   bEndpointAddress (IN/D2H)
-        0x01,        //   bmAttributes (Isochronous, No Sync, Data EP)
-        0x80, 0x00,  //   wMaxPacketSize 128
-        0x01,        //   bInterval 1 (unit depends on device speed)
-
-                     // 64 bytes
-
-                     // best guess: USB Standard Descriptor
-    };
-
-    RtlCopyBytes(Buffer, XgipDescriptorData, Length);
-}
-
-VOID Xgip_GetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor, PPDO_DEVICE_DATA pCommon)
-{
-    pDescriptor->bLength = 0x12;
-    pDescriptor->bDescriptorType = USB_DEVICE_DESCRIPTOR_TYPE;
-    pDescriptor->bcdUSB = 0x0200; // USB v2.0
-    pDescriptor->bDeviceClass = 0xFF;
-    pDescriptor->bDeviceSubClass = 0x47;
-    pDescriptor->bDeviceProtocol = 0xD0;
-    pDescriptor->bMaxPacketSize0 = 0x40;
-    pDescriptor->idVendor = pCommon->VendorId;
-    pDescriptor->idProduct = pCommon->ProductId;
-    pDescriptor->bcdDevice = 0x0650;
-    pDescriptor->iManufacturer = 0x01;
-    pDescriptor->iProduct = 0x02;
-    pDescriptor->iSerialNumber = 0x03;
-    pDescriptor->bNumConfigurations = 0x01;
-}
-
-VOID Xgip_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo)
-{
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XGIP, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d",
-        (int)pInfo->Length,
-        (int)pInfo->InterfaceNumber,
-        (int)pInfo->AlternateSetting,
-        pInfo->NumberOfPipes);
-
-    pInfo->Class = 0xFF;
-    pInfo->SubClass = 0x47;
-    pInfo->Protocol = 0xD0;
-
-    pInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)0xFFFF0000;
-
-    pInfo->Pipes[0].MaximumTransferSize = 0x00400000;
-    pInfo->Pipes[0].MaximumPacketSize = 0x40;
-    pInfo->Pipes[0].EndpointAddress = 0x81;
-    pInfo->Pipes[0].Interval = 0x04;
-    pInfo->Pipes[0].PipeType = UsbdPipeTypeInterrupt;
-    pInfo->Pipes[0].PipeHandle = (USBD_PIPE_HANDLE)0xFFFF0081;
-    pInfo->Pipes[0].PipeFlags = 0x00;
-
-    pInfo->Pipes[1].MaximumTransferSize = 0x00400000;
-    pInfo->Pipes[1].MaximumPacketSize = 0x40;
-    pInfo->Pipes[1].EndpointAddress = 0x01;
-    pInfo->Pipes[1].Interval = 0x04;
-    pInfo->Pipes[1].PipeType = UsbdPipeTypeInterrupt;
-    pInfo->Pipes[1].PipeHandle = (USBD_PIPE_HANDLE)0xFFFF0001;
-    pInfo->Pipes[1].PipeFlags = 0x00;
-
-    pInfo = (PUSBD_INTERFACE_INFORMATION)((PCHAR)pInfo + pInfo->Length);
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XGIP, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d",
-        (int)pInfo->Length,
-        (int)pInfo->InterfaceNumber,
-        (int)pInfo->AlternateSetting,
-        pInfo->NumberOfPipes);
-
-    pInfo->Class = 0xFF;
-    pInfo->SubClass = 0x47;
-    pInfo->Protocol = 0xD0;
-
-    pInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)0xFFFF0000;
-}
-
-VOID Xgip_SysInitTimerFunc(
-    _In_ WDFTIMER Timer
-)
-{
-    NTSTATUS status;
-    WDFDEVICE hChild;
-    PXGIP_DEVICE_DATA xgip;
-    WDFREQUEST usbRequest;
-    PIRP pendingIrp;
-    PIO_STACK_LOCATION irpStack;
-    WDFMEMORY mem;
-
-    hChild = WdfTimerGetParentObject(Timer);
-    xgip = XgipGetData(hChild);
-
-    if (xgip == NULL) return;
-
-    // Is TRUE when collection is filled up
-    if (xgip->XboxgipSysInitReady)
-    {
-        TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XGIP, "XBOXGIP ready, completing requests...");
-
-        // Get pending IN request
-        status = WdfIoQueueRetrieveNextRequest(xgip->PendingUsbInRequests, &usbRequest);
-
-        if (NT_SUCCESS(status))
-        {
-            TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XGIP, "Request found");
-
-            // Get top memory object
-            mem = (WDFMEMORY)WdfCollectionGetFirstItem(xgip->XboxgipSysInitCollection);
-
-            // Get pending IRP
-            pendingIrp = WdfRequestWdmGetIrp(usbRequest);
-            irpStack = IoGetCurrentIrpStackLocation(pendingIrp);
-
-            // Get USB request block
-            PURB urb = (PURB)irpStack->Parameters.Others.Argument1;
-
-            // Get buffer size and content
-            size_t size;
-            PUCHAR Buffer = WdfMemoryGetBuffer(mem, &size);
-
-            // Assign buffer size and content to URB
-            urb->UrbBulkOrInterruptTransfer.TransferBufferLength = (ULONG)size;
-            RtlCopyBytes(urb->UrbBulkOrInterruptTransfer.TransferBuffer, Buffer, size);
-
-            TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XGIP, "[%X] Buffer length: %d",
-                ((PUCHAR)urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0],
-                urb->UrbBulkOrInterruptTransfer.TransferBufferLength);
-
-            // Complete pending request
-            WdfRequestComplete(usbRequest, status);
-
-            // Free memory from collection
-            WdfCollectionRemoveItem(xgip->XboxgipSysInitCollection, 0);
-            WdfObjectDelete(mem);
-        }
-
-        // Stop timer when collection is purged
-        if (WdfCollectionGetCount(xgip->XboxgipSysInitCollection) == 0)
-        {
-            TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XGIP, "Collection finished");
-
-            WdfTimerStop(xgip->XboxgipSysInitTimer, FALSE);
-        }
-    }
-}
-
--- a/sys/xusb.c
+++ b/sys/xusb.c
@@ -1,639 +0,0 @@
-/*
-* Virtual Gamepad Emulation Framework - Windows kernel-mode bus driver
-*
-* MIT License
-*
-* Copyright (c) 2016-2019 Nefarius Software Solutions e.U. and Contributors
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all
-* copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-
-#include "busenum.h"
-#include <wdmguid.h>
-#include "xusb.tmh"
-
-NTSTATUS Xusb_PreparePdo(
-    PWDFDEVICE_INIT DeviceInit,
-    USHORT VendorId,
-    USHORT ProductId,
-    PUNICODE_STRING DeviceId,
-    PUNICODE_STRING DeviceDescription)
-{
-    NTSTATUS status;
-    DECLARE_UNICODE_STRING_SIZE(buffer, MAX_HARDWARE_ID_LENGTH);
-
-    // prepare device description
-    status = RtlUnicodeStringInit(DeviceDescription, L"Virtual Xbox 360 Controller");
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "RtlUnicodeStringInit failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    // Set hardware ID
-    RtlUnicodeStringPrintf(&buffer, L"USB\\VID_%04X&PID_%04X", VendorId, ProductId);
-
-    RtlUnicodeStringCopy(DeviceId, &buffer);
-
-    status = WdfPdoInitAddHardwareID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "WdfPdoInitAddHardwareID failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-
-    // Set compatible IDs
-    RtlUnicodeStringInit(&buffer, L"USB\\MS_COMP_XUSB10");
-
-    status = WdfPdoInitAddCompatibleID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "WdfPdoInitAddCompatibleID #1 failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    RtlUnicodeStringInit(&buffer, L"USB\\Class_FF&SubClass_5D&Prot_01");
-
-    status = WdfPdoInitAddCompatibleID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "WdfPdoInitAddCompatibleID #2 failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    RtlUnicodeStringInit(&buffer, L"USB\\Class_FF&SubClass_5D");
-
-    status = WdfPdoInitAddCompatibleID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "WdfPdoInitAddCompatibleID #3 failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    RtlUnicodeStringInit(&buffer, L"USB\\Class_FF");
-
-    status = WdfPdoInitAddCompatibleID(DeviceInit, &buffer);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "WdfPdoInitAddCompatibleID #4 failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device)
-{
-    NTSTATUS status;
-    WDF_QUERY_INTERFACE_CONFIG ifaceCfg;
-
-    INTERFACE dummyIface;
-
-    dummyIface.Size = sizeof(INTERFACE);
-    dummyIface.Version = 1;
-    dummyIface.Context = (PVOID)Device;
-
-    dummyIface.InterfaceReference = WdfDeviceInterfaceReferenceNoOp;
-    dummyIface.InterfaceDereference = WdfDeviceInterfaceDereferenceNoOp;
-
-    /* XUSB.sys will query for the following three "dummy" interfaces
-    * BUT WONT USE IT so we just expose them to satisfy initialization. (TODO: Check if still valid!)
-    */
-
-    // Dummy PNP_LOCATION
-
-    WDF_QUERY_INTERFACE_CONFIG_INIT(&ifaceCfg, (PINTERFACE)&dummyIface, &GUID_PNP_LOCATION_INTERFACE, NULL);
-
-    status = WdfDeviceAddQueryInterface(Device, &ifaceCfg);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "Couldn't register PNP_LOCATION dummy interface %!GUID! (WdfDeviceAddQueryInterface failed with status %!STATUS!)",
-            &GUID_PNP_LOCATION_INTERFACE,
-            status);
-
-        return status;
-    }
-
-    // Dummy D3COLD_SUPPORT
-
-    WDF_QUERY_INTERFACE_CONFIG_INIT(&ifaceCfg, (PINTERFACE)&dummyIface, &GUID_D3COLD_SUPPORT_INTERFACE, NULL);
-
-    status = WdfDeviceAddQueryInterface(Device, &ifaceCfg);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "Couldn't register D3COLD_SUPPORT dummy interface %!GUID! (WdfDeviceAddQueryInterface failed with status %!STATUS!)",
-            &GUID_D3COLD_SUPPORT_INTERFACE,
-            status);
-
-        return status;
-    }
-
-    // Dummy REENUMERATE_SELF_INTERFACE_STANDARD
-
-    WDF_QUERY_INTERFACE_CONFIG_INIT(&ifaceCfg, (PINTERFACE)&dummyIface, &GUID_REENUMERATE_SELF_INTERFACE_STANDARD, NULL);
-
-    status = WdfDeviceAddQueryInterface(Device, &ifaceCfg);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "Couldn't register REENUM_SELF_STD dummy interface %!GUID! (WdfDeviceAddQueryInterface failed with status %!STATUS!)",
-            &GUID_REENUMERATE_SELF_INTERFACE_STANDARD,
-            status);
-
-        return status;
-    }
-
-    // Expose USB_BUS_INTERFACE_USBDI_GUID
-
-    // This interface actually IS used
-    USB_BUS_INTERFACE_USBDI_V1 xusbInterface;
-
-    xusbInterface.Size = sizeof(USB_BUS_INTERFACE_USBDI_V1);
-    xusbInterface.Version = USB_BUSIF_USBDI_VERSION_1;
-    xusbInterface.BusContext = (PVOID)Device;
-
-    xusbInterface.InterfaceReference = WdfDeviceInterfaceReferenceNoOp;
-    xusbInterface.InterfaceDereference = WdfDeviceInterfaceDereferenceNoOp;
-
-    xusbInterface.SubmitIsoOutUrb = UsbPdo_SubmitIsoOutUrb;
-    xusbInterface.GetUSBDIVersion = UsbPdo_GetUSBDIVersion;
-    xusbInterface.QueryBusTime = UsbPdo_QueryBusTime;
-    xusbInterface.QueryBusInformation = UsbPdo_QueryBusInformation;
-    xusbInterface.IsDeviceHighSpeed = UsbPdo_IsDeviceHighSpeed;
-
-    WDF_QUERY_INTERFACE_CONFIG_INIT(&ifaceCfg, (PINTERFACE)&xusbInterface, &USB_BUS_INTERFACE_USBDI_GUID, NULL);
-
-    status = WdfDeviceAddQueryInterface(Device, &ifaceCfg);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "WdfDeviceAddQueryInterface failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device)
-{
-    NTSTATUS                status;
-    WDF_OBJECT_ATTRIBUTES   attributes;
-    PUCHAR                  blobBuffer;
-
-    WDF_OBJECT_ATTRIBUTES_INIT(&attributes);
-    attributes.ParentObject = Device;
-
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XUSB, "Initializing XUSB context...");
-
-    PXUSB_DEVICE_DATA xusb = XusbGetData(Device);
-
-    RtlZeroMemory(xusb, sizeof(XUSB_DEVICE_DATA));
-
-    // Is later overwritten by actual XInput slot
-    xusb->LedNumber = -1;
-    // Packet size (20 bytes = 0x14)
-    xusb->Packet.Size = 0x14;
-
-    // Allocate blob storage
-    status = WdfMemoryCreate(
-        &attributes,
-        NonPagedPoolNx,
-        XUSB_POOL_TAG,
-        XUSB_BLOB_STORAGE_SIZE,
-        &xusb->InterruptBlobStorage,
-        &blobBuffer
-    );
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "WdfMemoryCreate failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    // Fill blob storage
-    COPY_BYTE_ARRAY(blobBuffer, P99_PROTECT({
-        // 0
-        0x01, 0x03, 0x0E,
-        // 1
-        0x02, 0x03, 0x00,
-        // 2
-        0x03, 0x03, 0x03,
-        // 3
-        0x08, 0x03, 0x00,
-        // 4
-        0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0xe4, 0xf2,
-        0xb3, 0xf8, 0x49, 0xf3, 0xb0, 0xfc, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
-        // 5
-        0x01, 0x03, 0x03,
-        // 6
-        0x05, 0x03, 0x00,
-        // 7
-        0x31, 0x3F, 0xCF, 0xDC
-        }));
-
-    // I/O Queue for pending IRPs
-    WDF_IO_QUEUE_CONFIG holdingInQueueConfig;
-
-    // Create and assign queue for unhandled interrupt requests
-    WDF_IO_QUEUE_CONFIG_INIT(&holdingInQueueConfig, WdfIoQueueDispatchManual);
-
-    status = WdfIoQueueCreate(Device, &holdingInQueueConfig, WDF_NO_OBJECT_ATTRIBUTES, &xusb->HoldingUsbInRequests);
-    if (!NT_SUCCESS(status))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "WdfIoQueueCreate (HoldingUsbInRequests) failed with status %!STATUS!",
-            status);
-        return status;
-    }
-
-    return STATUS_SUCCESS;
-}
-
-VOID Xusb_GetConfigurationDescriptorType(PUCHAR Buffer, ULONG Length)
-{
-    UCHAR XusbDescriptorData[XUSB_DESCRIPTOR_SIZE] =
-    {
-        0x09,        //   bLength
-        0x02,        //   bDescriptorType (Configuration)
-        0x99, 0x00,  //   wTotalLength 153
-        0x04,        //   bNumInterfaces 4
-        0x01,        //   bConfigurationValue
-        0x00,        //   iConfiguration (String Index)
-        0xA0,        //   bmAttributes Remote Wakeup
-        0xFA,        //   bMaxPower 500mA
-
-        0x09,        //   bLength
-        0x04,        //   bDescriptorType (Interface)
-        0x00,        //   bInterfaceNumber 0
-        0x00,        //   bAlternateSetting
-        0x02,        //   bNumEndpoints 2
-        0xFF,        //   bInterfaceClass
-        0x5D,        //   bInterfaceSubClass
-        0x01,        //   bInterfaceProtocol
-        0x00,        //   iInterface (String Index)
-
-        0x11,        //   bLength
-        0x21,        //   bDescriptorType (HID)
-        0x00, 0x01,  //   bcdHID 1.00
-        0x01,        //   bCountryCode
-        0x25,        //   bNumDescriptors
-        0x81,        //   bDescriptorType[0] (Unknown 0x81)
-        0x14, 0x00,  //   wDescriptorLength[0] 20
-        0x00,        //   bDescriptorType[1] (Unknown 0x00)
-        0x00, 0x00,  //   wDescriptorLength[1] 0
-        0x13,        //   bDescriptorType[2] (Unknown 0x13)
-        0x01, 0x08,  //   wDescriptorLength[2] 2049
-        0x00,        //   bDescriptorType[3] (Unknown 0x00)
-        0x00,
-        0x07,        //   bLength
-        0x05,        //   bDescriptorType (Endpoint)
-        0x81,        //   bEndpointAddress (IN/D2H)
-        0x03,        //   bmAttributes (Interrupt)
-        0x20, 0x00,  //   wMaxPacketSize 32
-        0x04,        //   bInterval 4 (unit depends on device speed)
-
-        0x07,        //   bLength
-        0x05,        //   bDescriptorType (Endpoint)
-        0x01,        //   bEndpointAddress (OUT/H2D)
-        0x03,        //   bmAttributes (Interrupt)
-        0x20, 0x00,  //   wMaxPacketSize 32
-        0x08,        //   bInterval 8 (unit depends on device speed)
-
-        0x09,        //   bLength
-        0x04,        //   bDescriptorType (Interface)
-        0x01,        //   bInterfaceNumber 1
-        0x00,        //   bAlternateSetting
-        0x04,        //   bNumEndpoints 4
-        0xFF,        //   bInterfaceClass
-        0x5D,        //   bInterfaceSubClass
-        0x03,        //   bInterfaceProtocol
-        0x00,        //   iInterface (String Index)
-
-        0x1B,        //   bLength
-        0x21,        //   bDescriptorType (HID)
-        0x00, 0x01,  //   bcdHID 1.00
-        0x01,        //   bCountryCode
-        0x01,        //   bNumDescriptors
-        0x82,        //   bDescriptorType[0] (Unknown 0x82)
-        0x40, 0x01,  //   wDescriptorLength[0] 320
-        0x02, 0x20, 0x16, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x07,        //   bLength
-        0x05,        //   bDescriptorType (Endpoint)
-        0x82,        //   bEndpointAddress (IN/D2H)
-        0x03,        //   bmAttributes (Interrupt)
-        0x20, 0x00,  //   wMaxPacketSize 32
-        0x02,        //   bInterval 2 (unit depends on device speed)
-
-        0x07,        //   bLength
-        0x05,        //   bDescriptorType (Endpoint)
-        0x02,        //   bEndpointAddress (OUT/H2D)
-        0x03,        //   bmAttributes (Interrupt)
-        0x20, 0x00,  //   wMaxPacketSize 32
-        0x04,        //   bInterval 4 (unit depends on device speed)
-
-        0x07,        //   bLength
-        0x05,        //   bDescriptorType (Endpoint)
-        0x83,        //   bEndpointAddress (IN/D2H)
-        0x03,        //   bmAttributes (Interrupt)
-        0x20, 0x00,  //   wMaxPacketSize 32
-        0x40,        //   bInterval 64 (unit depends on device speed)
-
-        0x07,        //   bLength
-        0x05,        //   bDescriptorType (Endpoint)
-        0x03,        //   bEndpointAddress (OUT/H2D)
-        0x03,        //   bmAttributes (Interrupt)
-        0x20, 0x00,  //   wMaxPacketSize 32
-        0x10,        //   bInterval 16 (unit depends on device speed)
-
-        0x09,        //   bLength
-        0x04,        //   bDescriptorType (Interface)
-        0x02,        //   bInterfaceNumber 2
-        0x00,        //   bAlternateSetting
-        0x01,        //   bNumEndpoints 1
-        0xFF,        //   bInterfaceClass
-        0x5D,        //   bInterfaceSubClass
-        0x02,        //   bInterfaceProtocol
-        0x00,        //   iInterface (String Index)
-
-        0x09,        //   bLength
-        0x21,        //   bDescriptorType (HID)
-        0x00, 0x01,  //   bcdHID 1.00
-        0x01,        //   bCountryCode
-        0x22,        //   bNumDescriptors
-        0x84,        //   bDescriptorType[0] (Unknown 0x84)
-        0x07, 0x00,  //   wDescriptorLength[0] 7
-
-        0x07,        //   bLength
-        0x05,        //   bDescriptorType (Endpoint)
-        0x84,        //   bEndpointAddress (IN/D2H)
-        0x03,        //   bmAttributes (Interrupt)
-        0x20, 0x00,  //   wMaxPacketSize 32
-        0x10,        //   bInterval 16 (unit depends on device speed)
-
-        0x09,        //   bLength
-        0x04,        //   bDescriptorType (Interface)
-        0x03,        //   bInterfaceNumber 3
-        0x00,        //   bAlternateSetting
-        0x00,        //   bNumEndpoints 0
-        0xFF,        //   bInterfaceClass
-        0xFD,        //   bInterfaceSubClass
-        0x13,        //   bInterfaceProtocol
-        0x04,        //   iInterface (String Index)
-
-        0x06,        //   bLength
-        0x41,        //   bDescriptorType (Unknown)
-        0x00, 0x01, 0x01, 0x03,
-        // 153 bytes
-
-        // best guess: USB Standard Descriptor
-    };
-
-    RtlCopyBytes(Buffer, XusbDescriptorData, Length);
-}
-
-VOID Xusb_GetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor, PPDO_DEVICE_DATA pCommon)
-{
-    pDescriptor->bLength = 0x12;
-    pDescriptor->bDescriptorType = USB_DEVICE_DESCRIPTOR_TYPE;
-    pDescriptor->bcdUSB = 0x0200; // USB v2.0
-    pDescriptor->bDeviceClass = 0xFF;
-    pDescriptor->bDeviceSubClass = 0xFF;
-    pDescriptor->bDeviceProtocol = 0xFF;
-    pDescriptor->bMaxPacketSize0 = 0x08;
-    pDescriptor->idVendor = pCommon->VendorId;
-    pDescriptor->idProduct = pCommon->ProductId;
-    pDescriptor->bcdDevice = 0x0114;
-    pDescriptor->iManufacturer = 0x01;
-    pDescriptor->iProduct = 0x02;
-    pDescriptor->iSerialNumber = 0x03;
-    pDescriptor->bNumConfigurations = 0x01;
-}
-
-VOID Xusb_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo)
-{
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_XUSB,
-        ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d",
-        (int)pInfo->Length,
-        (int)pInfo->InterfaceNumber,
-        (int)pInfo->AlternateSetting,
-        pInfo->NumberOfPipes);
-
-    pInfo->Class = 0xFF;
-    pInfo->SubClass = 0x5D;
-    pInfo->Protocol = 0x01;
-
-    pInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)0xFFFF0000;
-
-    pInfo->Pipes[0].MaximumTransferSize = 0x00400000;
-    pInfo->Pipes[0].MaximumPacketSize = 0x20;
-    pInfo->Pipes[0].EndpointAddress = 0x81;
-    pInfo->Pipes[0].Interval = 0x04;
-    pInfo->Pipes[0].PipeType = 0x03;
-    pInfo->Pipes[0].PipeHandle = (USBD_PIPE_HANDLE)0xFFFF0081;
-    pInfo->Pipes[0].PipeFlags = 0x00;
-
-    pInfo->Pipes[1].MaximumTransferSize = 0x00400000;
-    pInfo->Pipes[1].MaximumPacketSize = 0x20;
-    pInfo->Pipes[1].EndpointAddress = 0x01;
-    pInfo->Pipes[1].Interval = 0x08;
-    pInfo->Pipes[1].PipeType = 0x03;
-    pInfo->Pipes[1].PipeHandle = (USBD_PIPE_HANDLE)0xFFFF0001;
-    pInfo->Pipes[1].PipeFlags = 0x00;
-
-    pInfo = (PUSBD_INTERFACE_INFORMATION)((PCHAR)pInfo + pInfo->Length);
-
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_XUSB,
-        ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d",
-        (int)pInfo->Length,
-        (int)pInfo->InterfaceNumber,
-        (int)pInfo->AlternateSetting,
-        pInfo->NumberOfPipes);
-
-    pInfo->Class = 0xFF;
-    pInfo->SubClass = 0x5D;
-    pInfo->Protocol = 0x03;
-
-    pInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)0xFFFF0000;
-
-    pInfo->Pipes[0].MaximumTransferSize = 0x00400000;
-    pInfo->Pipes[0].MaximumPacketSize = 0x20;
-    pInfo->Pipes[0].EndpointAddress = 0x82;
-    pInfo->Pipes[0].Interval = 0x04;
-    pInfo->Pipes[0].PipeType = 0x03;
-    pInfo->Pipes[0].PipeHandle = (USBD_PIPE_HANDLE)0xFFFF0082;
-    pInfo->Pipes[0].PipeFlags = 0x00;
-
-    pInfo->Pipes[1].MaximumTransferSize = 0x00400000;
-    pInfo->Pipes[1].MaximumPacketSize = 0x20;
-    pInfo->Pipes[1].EndpointAddress = 0x02;
-    pInfo->Pipes[1].Interval = 0x08;
-    pInfo->Pipes[1].PipeType = 0x03;
-    pInfo->Pipes[1].PipeHandle = (USBD_PIPE_HANDLE)0xFFFF0002;
-    pInfo->Pipes[1].PipeFlags = 0x00;
-
-    pInfo->Pipes[2].MaximumTransferSize = 0x00400000;
-    pInfo->Pipes[2].MaximumPacketSize = 0x20;
-    pInfo->Pipes[2].EndpointAddress = 0x83;
-    pInfo->Pipes[2].Interval = 0x08;
-    pInfo->Pipes[2].PipeType = 0x03;
-    pInfo->Pipes[2].PipeHandle = (USBD_PIPE_HANDLE)0xFFFF0083;
-    pInfo->Pipes[2].PipeFlags = 0x00;
-
-    pInfo->Pipes[3].MaximumTransferSize = 0x00400000;
-    pInfo->Pipes[3].MaximumPacketSize = 0x20;
-    pInfo->Pipes[3].EndpointAddress = 0x03;
-    pInfo->Pipes[3].Interval = 0x08;
-    pInfo->Pipes[3].PipeType = 0x03;
-    pInfo->Pipes[3].PipeHandle = (USBD_PIPE_HANDLE)0xFFFF0003;
-    pInfo->Pipes[3].PipeFlags = 0x00;
-
-    pInfo = (PUSBD_INTERFACE_INFORMATION)((PCHAR)pInfo + pInfo->Length);
-
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_XUSB,
-        ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d",
-        (int)pInfo->Length,
-        (int)pInfo->InterfaceNumber,
-        (int)pInfo->AlternateSetting,
-        pInfo->NumberOfPipes);
-
-    pInfo->Class = 0xFF;
-    pInfo->SubClass = 0x5D;
-    pInfo->Protocol = 0x02;
-
-    pInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)0xFFFF0000;
-
-    pInfo->Pipes[0].MaximumTransferSize = 0x00400000;
-    pInfo->Pipes[0].MaximumPacketSize = 0x20;
-    pInfo->Pipes[0].EndpointAddress = 0x84;
-    pInfo->Pipes[0].Interval = 0x04;
-    pInfo->Pipes[0].PipeType = 0x03;
-    pInfo->Pipes[0].PipeHandle = (USBD_PIPE_HANDLE)0xFFFF0084;
-    pInfo->Pipes[0].PipeFlags = 0x00;
-
-    pInfo = (PUSBD_INTERFACE_INFORMATION)((PCHAR)pInfo + pInfo->Length);
-
-    TraceEvents(TRACE_LEVEL_VERBOSE,
-        TRACE_XUSB,
-        ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d",
-        (int)pInfo->Length,
-        (int)pInfo->InterfaceNumber,
-        (int)pInfo->AlternateSetting,
-        pInfo->NumberOfPipes);
-
-    pInfo->Class = 0xFF;
-    pInfo->SubClass = 0xFD;
-    pInfo->Protocol = 0x13;
-
-    pInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)0xFFFF0000;
-}
-
-NTSTATUS Xusb_GetUserIndex(WDFDEVICE Device, PXUSB_GET_USER_INDEX Request)
-{
-    NTSTATUS                    status = STATUS_INVALID_DEVICE_REQUEST;
-    WDFDEVICE                   hChild;
-    PPDO_DEVICE_DATA            pdoData;
-    CHAR                        userIndex;
-
-
-    TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, "%!FUNC! Entry");
-
-    hChild = Bus_GetPdo(Device, Request->SerialNo);
-
-    // Validate child
-    if (hChild == NULL)
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "Bus_GetPdo for serial %d failed", Request->SerialNo);
-        return STATUS_NO_SUCH_DEVICE;
-    }
-
-    // Check common context
-    pdoData = PdoGetData(hChild);
-    if (pdoData == NULL)
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "PdoGetData failed");
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    // Check if caller owns this PDO
-    if (!IS_OWNER(pdoData))
-    {
-        TraceEvents(TRACE_LEVEL_ERROR,
-            TRACE_XUSB,
-            "PID mismatch: %d != %d",
-            pdoData->OwnerProcessId,
-            CURRENT_PROCESS_ID());
-        return STATUS_ACCESS_DENIED;
-    }
-
-    userIndex = XusbGetData(hChild)->LedNumber;
-
-    if (userIndex >= 0)
-    {
-        Request->UserIndex = (ULONG)userIndex;
-        status = STATUS_SUCCESS;
-    }
-    else
-    {
-        // If the index is negative at this stage, we've exceeded XUSER_MAX_COUNT
-        // and need to fail this request with a distinct status.
-        status = STATUS_INVALID_DEVICE_OBJECT_PARAMETER;
-    }
-
-    TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XUSB, "%!FUNC! Exit with status %!STATUS!", status);
-
-    return status;
-}
Author	SHA1	Message	Date
Benjamin Höglinger-Stelzer	af18a07443	Code clean-up	2020-05-14 16:44:37 +02:00
Benjamin Höglinger-Stelzer	250d6f7937	Removed redundant headers Removed obsolete types	2020-05-14 16:43:41 +02:00
Benjamin Höglinger-Stelzer	68ab55d56a	Removed unused code	2020-05-14 16:41:08 +02:00
Benjamin Höglinger-Stelzer	dc39ba970d	Fixed handle leak	2020-05-14 15:03:59 +02:00
Benjamin Höglinger-Stelzer	2f636a5da6	Minor clean-up	2020-05-14 14:09:46 +02:00
Benjamin Höglinger-Stelzer	15a9b2c896	Minor clean-up	2020-05-13 21:58:37 +02:00
Benjamin Höglinger-Stelzer	5d2dd2a122	Removed unused code	2020-05-13 21:46:14 +02:00
Benjamin Höglinger-Stelzer	225c536205	Removed unused code	2020-05-13 21:37:57 +02:00
Benjamin Höglinger-Stelzer	9e4b91d105	Bumped minor version from 16 to 17	2020-05-13 18:06:03 +02:00
Benjamin Höglinger-Stelzer	25d3d4ab8d	Changed info level to verbose level on debug tracing	2020-05-13 18:05:13 +02:00
Benjamin Höglinger-Stelzer	9a2f66048d	Implemented new plugin request tracking	2020-05-13 17:59:18 +02:00
Benjamin Höglinger-Stelzer	2457076e20	Implemented new plugin request tracking	2020-05-13 17:58:55 +02:00
Benjamin Höglinger-Stelzer	bc34f716e1	Tracing updates	2020-05-13 16:40:31 +02:00
Benjamin Höglinger-Stelzer	c644146dd7	Added _PendingPlugInRequests	2020-05-13 16:36:30 +02:00
Benjamin Höglinger-Stelzer	ce523c597f	Removed obsolete types	2020-05-12 17:42:08 +02:00
Benjamin Höglinger-Stelzer	fe1dcddc6a	Hardened device type checks Removed obsolete code	2020-05-12 17:37:16 +02:00
Benjamin Höglinger-Stelzer	b5ebcca496	Consolidated tracing calls	2020-05-12 17:14:00 +02:00
Benjamin Höglinger-Stelzer	359dfe52fe	Implemented IOCTL_XUSB_GET_USER_INDEX	2020-05-12 17:02:34 +02:00
Benjamin Höglinger-Stelzer	a51dc81252	Implemented process ownership check in SubmitReport	2020-05-12 16:04:33 +02:00
Jason Hart	5355deb20c	Update and/or add license as needed	2020-05-11 19:24:38 -04:00
Jason Hart	554b05b769	Third time's the charm	2020-05-11 19:16:21 -04:00
Jason Hart	9347203382	Fix error in submodule by updating submodule	2020-05-11 18:56:53 -04:00
Jason Hart	e6873170f9	Update to Branch submodule in preperation of DS4_SUBMIT work	2020-05-11 18:43:07 -04:00
Benjamin Höglinger-Stelzer	c981801a37	Implemented freeing context memory	2020-05-11 21:39:43 +02:00
Benjamin Höglinger-Stelzer	55b1ef6cfa	Fixed DS4 crash	2020-05-11 21:20:39 +02:00
Benjamin Höglinger-Stelzer	7b6776d36a	Bugfixes from porting	2020-05-11 20:57:14 +02:00
Benjamin Höglinger-Stelzer	53c1960077	Changed function	2020-05-11 17:46:57 +02:00
Benjamin Höglinger-Stelzer	c47f72f7f9	Minor clean-up	2020-05-11 17:34:28 +02:00
Benjamin Höglinger-Stelzer	226c8bb44d	Refactored names	2020-05-11 17:31:14 +02:00
Benjamin Höglinger-Stelzer	45ea4c870d	Ported everything	2020-05-11 17:27:15 +02:00
Benjamin Höglinger-Stelzer	4737829886	Removed unused code	2020-05-11 14:31:10 +02:00
Benjamin Höglinger-Stelzer	b579c4efae	Minor fix	2020-05-11 14:30:19 +02:00
Benjamin Höglinger-Stelzer	cf993010ff	Fixed PDO WDF context initialization	2020-05-11 14:25:53 +02:00
Benjamin Höglinger-Stelzer	85c75e7ad6	Implemented overriding VID & PID for DS4 target	2020-05-11 14:19:27 +02:00
Benjamin Höglinger-Stelzer	a5964c3b23	Removed unused code	2020-05-11 14:15:08 +02:00
Benjamin Höglinger-Stelzer	e0f9d1044b	Minor fix	2020-05-11 14:11:39 +02:00
Benjamin Höglinger-Stelzer	0e278ebe21	Implemented UsbControlTransfer	2020-05-11 14:09:32 +02:00
Benjamin Höglinger-Stelzer	14ee423fc1	Updated tracing	2020-05-11 14:03:02 +02:00
Benjamin Höglinger-Stelzer	48a6431f0f	Renamed functions	2020-05-11 13:54:36 +02:00
Benjamin Höglinger-Stelzer	be5a84c4f2	Implemented ViGEm::Bus::Targets::EmulationTargetDS4::UsbBulkOrInterruptTransfer	2020-05-11 13:38:47 +02:00
Benjamin Höglinger-Stelzer	4b0015f524	Implemented ViGEm::Bus::Targets::EmulationTargetXUSB::UsbBulkOrInterruptTransfer	2020-05-11 13:35:26 +02:00
Benjamin Höglinger-Stelzer	2dd54c3b2c	Added UsbBulkOrInterruptTransfer	2020-05-11 13:11:02 +02:00
Benjamin Höglinger-Stelzer	5539b5d052	Implemented UsbGetStringDescriptorType	2020-05-11 13:06:33 +02:00
Benjamin Höglinger-Stelzer	93644c0a35	Implementing I/O handler	2020-05-11 12:46:18 +02:00
Benjamin Höglinger-Stelzer	1f7bcff6dc	Ported UsbSelectInterface	2020-05-11 12:37:40 +02:00
Benjamin Höglinger-Stelzer	670e1f2183	Implemented UsbGetDescriptorFromInterface	2020-05-11 12:33:34 +02:00
Benjamin Höglinger-Stelzer	cfb324a2b9	Type reduction	2020-05-11 12:27:41 +02:00
Benjamin Höglinger-Stelzer	acd0c93d33	Ported UsbClassInterface	2020-05-11 12:24:25 +02:00
Benjamin Höglinger-Stelzer	c08ca0490f	Stuff	2020-05-11 02:09:24 +02:00
Benjamin Höglinger-Stelzer	a560564d3e	Minor clean-up	2020-05-11 00:24:57 +02:00
Benjamin Höglinger-Stelzer	09cabc6b70	Porting more stuff	2020-05-11 00:17:25 +02:00
Benjamin Höglinger-Stelzer	7c1936aff1	Porting USB functions	2020-05-11 00:06:35 +02:00
Benjamin Höglinger-Stelzer	c04f820d9f	Added equality operator	2020-05-10 23:27:03 +02:00
Benjamin Höglinger-Stelzer	e363532095	Fixed include Removed ununsed code	2020-05-10 23:04:28 +02:00
Benjamin Höglinger-Stelzer	6f228df7b2	Porting over common USB logic	2020-05-10 22:57:05 +02:00
Benjamin Höglinger-Stelzer	027ff95b78	Oops	2020-05-10 21:21:48 +02:00
Benjamin Höglinger-Stelzer	9cfe2f7cd4	Clean-up	2020-05-10 21:19:39 +02:00
Jason Hart	2d39c661f5	Remove XUSB from DS4Pdo header	2020-05-10 15:17:11 -04:00
Benjamin Höglinger-Stelzer	66c2efb611	Fixed x86 build	2020-05-10 21:01:40 +02:00
Benjamin Höglinger-Stelzer	b14a9cb59d	Fixed build settings	2020-05-10 20:56:12 +02:00
Benjamin Höglinger-Stelzer	252c2e4531	Made new and delete work	2020-05-10 20:50:16 +02:00
Benjamin Höglinger-Stelzer	636990a072	Styling fix	2020-05-10 20:00:08 +02:00
Benjamin Höglinger-Stelzer	6ebef069d5	Further porting over stuff	2020-05-10 17:03:01 +02:00
Benjamin Höglinger-Stelzer	5864b91c09	Ported over parts of DS4 code	2020-05-08 22:55:56 +02:00
Benjamin Höglinger-Stelzer	07c97094f8	Ported majority of XUSB stuff over to C++	2020-05-08 22:43:46 +02:00
Benjamin Höglinger-Stelzer	bd074d93fd	Added another INF to simplify test signing and installation for single architecture	2020-05-08 14:49:12 +02:00
Benjamin Höglinger-Stelzer	c418722e9c	Removed XGIP stuff	2020-05-08 11:46:15 +02:00
Benjamin Höglinger-Stelzer	d1375e7e5a	Updated to latest client module	2020-05-08 11:12:11 +02:00
Benjamin Höglinger	f007f8fcd0	Create FUNDING.yml	2020-04-22 12:14:55 +02:00
Benjamin Höglinger	ed4902b3a1	Update README.md Added https://github.com/microsoft/RdpGamepad to known users Removed donation badges	2020-04-22 12:14:30 +02:00
Benjamin Höglinger-Stelzer	6cb08e5e29	Updated README.md	2020-02-01 20:23:42 +01:00
Benjamin Höglinger-Stelzer	6fd522f161	Updated README.md	2020-02-01 20:09:39 +01:00
Benjamin Höglinger-Stelzer	74343533b6	Revert "Introduced variable" This reverts commit `c7a8431526`.	2020-01-30 20:52:23 +01:00
Benjamin Höglinger-Stelzer	c7a8431526	Introduced variable	2020-01-30 20:49:07 +01:00
Benjamin Höglinger-Stelzer	d472f98e91	Darn	2020-01-30 20:43:31 +01:00
Benjamin Höglinger-Stelzer	6221232616	Fixed versioning utility	2020-01-30 20:39:44 +01:00
Benjamin Höglinger-Stelzer	2e2cc7a78e	Oops	2020-01-30 20:25:50 +01:00
Benjamin Höglinger-Stelzer	05d2e8f276	Fixing build	2020-01-30 20:24:25 +01:00
Benjamin Höglinger-Stelzer	e73a217581	Added revived version stamping utility	2020-01-30 20:18:48 +01:00
Benjamin Höglinger-Stelzer	d66c093626	Merge branch 'master' into feature/core/build-scripts-update	2019-12-20 10:49:30 +01:00
Benjamin Höglinger-Stelzer	eae3ad54c7	Disabled broken binary stamping instructions	2019-12-20 10:37:59 +01:00
Benjamin Höglinger-Stelzer	951d3589bf	Updated build instructions	2019-12-20 10:35:55 +01:00
Benjamin Höglinger-Stelzer	51c56152c1	Updated RC file	2019-12-20 10:23:50 +01:00
Benjamin Höglinger-Stelzer	9e7cfbfb70	Reworked version stamping	2019-12-20 10:17:16 +01:00
Benjamin Höglinger-Stelzer	66dd0a6183	Removed nuke Reworked appveyor.yml	2019-12-20 10:13:04 +01:00