From d5edac6c1b271420323f7644e20eb4d76ef2e1c3 Mon Sep 17 00:00:00 2001
From: cathery <dumdumcathery@gmail.com>
Date: Tue, 10 Mar 2020 12:46:53 +0300
Subject: [PATCH] More usb event error checking

---
 source/Sysmodule/source/psc_module.cpp |  5 ++---
 source/Sysmodule/source/usb_module.cpp | 15 +++++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/source/Sysmodule/source/psc_module.cpp b/source/Sysmodule/source/psc_module.cpp
index 0bda58a..2191b4a 100644
--- a/source/Sysmodule/source/psc_module.cpp
+++ b/source/Sysmodule/source/psc_module.cpp
@@ -32,12 +32,11 @@ namespace syscon::psc
                         switch (pscState)
                         {
                             case PscPmState_ReadyAwaken:
-                                WriteToLog("Switch is awake! Enabling usb events...");
-                                usb::CreateUsbEvents();
+                                WriteToLog("Enable usb events: 0x%x", usb::CreateUsbEvents());
                                 break;
                             case PscPmState_ReadySleep:
                             case PscPmState_ReadyShutdown:
-                                WriteToLog("Ready to sleep! Disabling usb events...");
+                                WriteToLog("Destroy usb events");
                                 usb::DestroyUsbEvents();
                                 break;
                             default:
diff --git a/source/Sysmodule/source/usb_module.cpp b/source/Sysmodule/source/usb_module.cpp
index 98c0cbb..34d98d3 100644
--- a/source/Sysmodule/source/usb_module.cpp
+++ b/source/Sysmodule/source/usb_module.cpp
@@ -168,7 +168,7 @@ namespace syscon::usb
             return out_entries;
         }
 
-        Result CreateCatchAllAvailableEvent()
+        inline Result CreateCatchAllAvailableEvent()
         {
             constexpr UsbHsInterfaceFilter filter {
                 .Flags = UsbHsInterfaceFilterFlags_bcdDevice_Min,
@@ -177,7 +177,7 @@ namespace syscon::usb
             return usbHsCreateInterfaceAvailableEvent(&g_usbCatchAllEvent, true, CatchAllEventIndex, &filter);
         }
 
-        Result CreateDualshock3AvailableEvent()
+        inline Result CreateDualshock3AvailableEvent()
         {
             constexpr UsbHsInterfaceFilter filter {
                 .Flags = UsbHsInterfaceFilterFlags_idVendor | UsbHsInterfaceFilterFlags_idProduct,
@@ -187,7 +187,7 @@ namespace syscon::usb
             return usbHsCreateInterfaceAvailableEvent(&g_usbDualshock3Event, true, Dualshock3EventIndex, &filter);
         }
 
-        Result CreateDualshock4AvailableEvent()
+        inline Result CreateDualshock4AvailableEvent()
         {
             const UsbHsInterfaceFilter filter{
                 .Flags = UsbHsInterfaceFilterFlags_idVendor | UsbHsInterfaceFilterFlags_idProduct,
@@ -211,7 +211,7 @@ namespace syscon::usb
 
     Result Enable()
     {
-        CreateUsbEvents();
+        R_TRY(CreateUsbEvents());
 
         is_usb_event_thread_running = true;
         R_TRY(g_usb_event_thread.Start().GetValue());
@@ -245,9 +245,16 @@ namespace syscon::usb
 
     Result CreateUsbEvents()
     {
+        if (g_usbCatchAllEvent.revent != INVALID_HANDLE)
+            return 0x99;
         R_TRY(CreateCatchAllAvailableEvent());
         R_TRY(CreateDualshock3AvailableEvent());
         R_TRY(CreateDualshock4AvailableEvent());
+        /*
+        R_TRY(g_usb_event_thread.CancelSynchronization().GetValue());
+        R_TRY(g_ds3_event_thread.CancelSynchronization().GetValue());
+        R_TRY(g_ds4_event_thread.CancelSynchronization().GetValue());
+        */
         return 0;
     }