From 957cbbed6b39a8e8aba3dde6578784acdbbe0776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= <nefarius@dhmx.at>
Date: Sat, 29 Aug 2020 17:32:41 +0200
Subject: [PATCH] De-duplicated code

---
 sys/Driver.cpp |  2 +-
 sys/Driver.h   |  2 --
 sys/buspdo.cpp | 22 ----------------------
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/sys/Driver.cpp b/sys/Driver.cpp
index 92ee3f7..8039eb0 100644
--- a/sys/Driver.cpp
+++ b/sys/Driver.cpp
@@ -172,7 +172,7 @@ NTSTATUS Bus_EvtDeviceAdd(IN WDFDRIVER Driver, IN PWDFDEVICE_INIT DeviceInit)
 
     WDF_CHILD_LIST_CONFIG_INIT(&config, sizeof(PDO_IDENTIFICATION_DESCRIPTION), Bus_EvtDeviceListCreatePdo);
 
-    config.EvtChildListIdentificationDescriptionCompare = Bus_EvtChildListIdentificationDescriptionCompare;
+    config.EvtChildListIdentificationDescriptionCompare = EmulationTargetPDO::EvtChildListIdentificationDescriptionCompare;
 
     WdfFdoInitSetDefaultChildListConfig(DeviceInit, &config, WDF_NO_OBJECT_ATTRIBUTES);
 
diff --git a/sys/Driver.h b/sys/Driver.h
index 67a2f84..76f99d9 100644
--- a/sys/Driver.h
+++ b/sys/Driver.h
@@ -102,8 +102,6 @@ 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_OBJECT_CONTEXT_CLEANUP Bus_EvtDriverContextCleanup;
 
 #pragma endregion
diff --git a/sys/buspdo.cpp b/sys/buspdo.cpp
index 43aa667..6140b98 100644
--- a/sys/buspdo.cpp
+++ b/sys/buspdo.cpp
@@ -53,25 +53,3 @@ EXTERN_C NTSTATUS Bus_EvtDeviceListCreatePdo(
 
     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;
-}