From e212c27789e8bb259e7a3492d014098a63c0ca45 Mon Sep 17 00:00:00 2001
From: cathery <dumdumcathery@gmail.com>
Date: Tue, 5 Nov 2019 14:16:58 +0300
Subject: [PATCH] Comment out unused code for now

---
 .../source/SwitchAbstractedPadHandler.cpp     | 29 ++++---------------
 SwitchUSB/source/SwitchHDLHandler.cpp         | 27 +++--------------
 source/main.cpp                               |  5 ----
 source/mainLoop.cpp                           |  2 ++
 4 files changed, 11 insertions(+), 52 deletions(-)

diff --git a/SwitchUSB/source/SwitchAbstractedPadHandler.cpp b/SwitchUSB/source/SwitchAbstractedPadHandler.cpp
index e31e997..2d26d0d 100644
--- a/SwitchUSB/source/SwitchAbstractedPadHandler.cpp
+++ b/SwitchUSB/source/SwitchAbstractedPadHandler.cpp
@@ -19,6 +19,8 @@ Result SwitchAbstractedPadHandler::Initialize()
     if (R_FAILED(rc))
         return rc;
 
+    /*
+
     hidScanInput();
     HidControllerID lastOfflineID = CONTROLLER_PLAYER_1;
     for (int i = 0; i != 8; ++i)
@@ -30,11 +32,13 @@ Result SwitchAbstractedPadHandler::Initialize()
         }
     }
     //WriteToLog("Found last offline ID: ", lastOfflineID);
+    */
 
     rc = InitAbstractedPadState();
     if (R_FAILED(rc))
         return rc;
 
+    /*
     svcSleepThread(1e+7L);
     hidScanInput();
 
@@ -43,33 +47,10 @@ Result SwitchAbstractedPadHandler::Initialize()
 
     Result rc2 = hidInitializeVibrationDevices(&m_vibrationDeviceHandle, 1, lastOfflineID, hidGetControllerType(lastOfflineID));
     if (R_SUCCEEDED(rc2))
-    {
-        /*
-        u32 tmp_type = 0x20;
-        m_vibrationDeviceHandle = tmp_type | (lastOfflineID & 0xff) << 8;
-
-        WriteToLog("Initializing vibration device with handle ", m_vibrationDeviceHandle);
-        Service IActiveVibrationDeviceList;
-
-        if (R_SUCCEEDED(serviceDispatch(hidGetServiceSession(), 203, .out_num_objects = 1, .out_objects = &IActiveVibrationDeviceList)))
-        {
-            WriteToLog("Got vibration device list object_id ", IActiveVibrationDeviceList.object_id);
-
-            Result rc69 = serviceDispatchIn(&IActiveVibrationDeviceList, 0, m_vibrationDeviceHandle);
-            serviceClose(&IActiveVibrationDeviceList);
-            if (R_SUCCEEDED(rc69))
-            {
-                WriteToLog("Activated vibration handle");
-                InitOutputThread();
-            }
-            else
-                WriteToLog("Failed to activate handle, result: ", rc69);
-        }
-        */
         InitOutputThread();
-    }
     else
         WriteToLog("Failed to iniitalize vibration device with error ", rc2);
+    */
 
     InitInputThread();
     return rc;
diff --git a/SwitchUSB/source/SwitchHDLHandler.cpp b/SwitchUSB/source/SwitchHDLHandler.cpp
index a79c059..dbc29dc 100644
--- a/SwitchUSB/source/SwitchHDLHandler.cpp
+++ b/SwitchUSB/source/SwitchHDLHandler.cpp
@@ -18,6 +18,7 @@ Result SwitchHDLHandler::Initialize()
     if (R_FAILED(rc))
         return rc;
 
+    /*
     hidScanInput();
     HidControllerID lastOfflineID = CONTROLLER_PLAYER_1;
     for (int i = 0; i != 8; ++i)
@@ -29,11 +30,13 @@ Result SwitchHDLHandler::Initialize()
         }
     }
     //WriteToLog("Found last offline ID: ", lastOfflineID);
+    */
 
     rc = InitHdlState();
     if (R_FAILED(rc))
         return rc;
 
+    /*
     svcSleepThread(1e+7L);
     hidScanInput();
 
@@ -42,32 +45,10 @@ Result SwitchHDLHandler::Initialize()
 
     Result rc2 = hidInitializeVibrationDevices(&m_vibrationDeviceHandle, 1, lastOfflineID, hidGetControllerType(lastOfflineID));
     if (R_SUCCEEDED(rc2))
-    {
-        /*
-        m_vibrationDeviceHandle = 3 | (lastOfflineID & 0xff) << 8;
-
-        WriteToLog("Initializing vibration device with handle ", m_vibrationDeviceHandle);
-        Service IActiveVibrationDeviceList;
-        WriteToLog("Got vibration device list object_id ", IActiveVibrationDeviceList.object_id);
-        if (R_SUCCEEDED(serviceDispatch(hidGetServiceSession(), 203, .out_num_objects = 1, .out_objects = &IActiveVibrationDeviceList)))
-        {
-            WriteToLog("Got vibration device list object_id ", IActiveVibrationDeviceList.object_id);
-
-            Result rc69 = serviceDispatchIn(&IActiveVibrationDeviceList, 0, m_vibrationDeviceHandle);
-            serviceClose(&IActiveVibrationDeviceList);
-            if (R_SUCCEEDED(rc69))
-            {
-                WriteToLog("Activated vibration handle");
-                InitOutputThread();
-            }
-            else
-                WriteToLog("Failed to activate handle, result: ", rc69);
-        }
-        */
         InitOutputThread();
-    }
     else
         WriteToLog("Failed to iniitalize vibration with error ", rc2);
+    */
 
     InitInputThread();
 
diff --git a/source/main.cpp b/source/main.cpp
index 1856a6d..be67cc0 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -58,10 +58,6 @@ extern "C"
         if (R_FAILED(rc))
             fatalThrow(rc);
 
-        rc = usbCommsInitialize();
-        if (R_FAILED(rc))
-            fatalThrow(rc);
-
 #ifndef __APPLET__
         rc = hidInitialize();
         if (R_FAILED(rc))
@@ -74,7 +70,6 @@ extern "C"
 #ifndef __APPLET__
         hidExit();
 #endif
-        usbCommsExit();
         usbHsExit();
         hiddbgReleaseHdlsWorkBuffer();
         hiddbgExit();
diff --git a/source/mainLoop.cpp b/source/mainLoop.cpp
index c1e60aa..808f145 100644
--- a/source/mainLoop.cpp
+++ b/source/mainLoop.cpp
@@ -72,6 +72,7 @@ Result mainLoop()
                 }
             }
         }
+        /*
 
         if (kDown & KEY_X)
         {
@@ -102,6 +103,7 @@ Result mainLoop()
                     WriteToLog("failed to check for vibration device");
             }
         }
+        */
 
         if (kDown & KEY_B)
             break;