From 8dd6dc9a29b876c0e8039941120914d3cde8207f Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 21 Jan 2022 16:31:57 -0500
Subject: service/usb: Update function tables

---
 src/core/hle/service/usb/usb.cpp | 42 ++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/core/hle/service/usb/usb.cpp b/src/core/hle/service/usb/usb.cpp
index 502dfbb4a..0747c33cd 100644
--- a/src/core/hle/service/usb/usb.cpp
+++ b/src/core/hle/service/usb/usb.cpp
@@ -15,36 +15,11 @@ namespace Service::USB {
 class IDsInterface final : public ServiceFramework<IDsInterface> {
 public:
     explicit IDsInterface(Core::System& system_) : ServiceFramework{system_, "IDsInterface"} {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, nullptr, "GetDsEndpoint"},
-            {1, nullptr, "GetSetupEvent"},
-            {2, nullptr, "Unknown2"},
-            {3, nullptr, "EnableInterface"},
-            {4, nullptr, "DisableInterface"},
-            {5, nullptr, "CtrlInPostBufferAsync"},
-            {6, nullptr, "CtrlOutPostBufferAsync"},
-            {7, nullptr, "GetCtrlInCompletionEvent"},
-            {8, nullptr, "GetCtrlInReportData"},
-            {9, nullptr, "GetCtrlOutCompletionEvent"},
-            {10, nullptr, "GetCtrlOutReportData"},
-            {11, nullptr, "StallCtrl"},
-            {12, nullptr, "AppendConfigurationData"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-};
-
-class USB_DS final : public ServiceFramework<USB_DS> {
-public:
-    explicit USB_DS(Core::System& system_) : ServiceFramework{system_, "usb:ds"} {
         // clang-format off
         static const FunctionInfo functions[] = {
             {0, nullptr, "BindDevice"},
             {1, nullptr, "BindClientProcess"},
-            {2, nullptr, "GetDsInterface"},
+            {2, nullptr, "AddInterface"},
             {3, nullptr, "GetStateChangeEvent"},
             {4, nullptr, "GetState"},
             {5, nullptr, "ClearDeviceData"},
@@ -62,6 +37,19 @@ public:
     }
 };
 
+class USB_DS final : public ServiceFramework<USB_DS> {
+public:
+    explicit USB_DS(Core::System& system_) : ServiceFramework{system_, "usb:ds"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "OpenDsService"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+};
+
 class IClientEpSession final : public ServiceFramework<IClientEpSession> {
 public:
     explicit IClientEpSession(Core::System& system_)
@@ -120,7 +108,7 @@ public:
             {5, nullptr, "DestroyInterfaceAvailableEvent"},
             {6, nullptr, "GetInterfaceStateChangeEvent"},
             {7, nullptr, "AcquireUsbIf"},
-            {8, nullptr, "Unknown8"},
+            {8, nullptr, "ResetDevice"},
         };
         // clang-format on
 
-- 
cgit v1.2.3