From 1750201216cf9ea8863b1fc2dbcb86b1a172894b Mon Sep 17 00:00:00 2001 From: cathery Date: Mon, 2 Mar 2020 18:52:38 +0300 Subject: [PATCH] Rename ::handler namespace to ::controllers --- .../Sysmodule/source/controller_handler.cpp | 2 +- source/Sysmodule/source/controller_handler.h | 2 +- source/Sysmodule/source/main.cpp | 4 ++-- source/Sysmodule/source/usb_module.cpp | 20 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/source/Sysmodule/source/controller_handler.cpp b/source/Sysmodule/source/controller_handler.cpp index 2b13c13..e06a16d 100644 --- a/source/Sysmodule/source/controller_handler.cpp +++ b/source/Sysmodule/source/controller_handler.cpp @@ -7,7 +7,7 @@ #include "log.h" -namespace syscon::handler +namespace syscon::controllers { namespace { diff --git a/source/Sysmodule/source/controller_handler.h b/source/Sysmodule/source/controller_handler.h index ebd73b9..440dd99 100644 --- a/source/Sysmodule/source/controller_handler.h +++ b/source/Sysmodule/source/controller_handler.h @@ -3,7 +3,7 @@ #include "ControllerHelpers.h" #include "SwitchVirtualGamepadHandler.h" -namespace syscon::handler +namespace syscon::controllers { bool IsAtControllerLimit(); diff --git a/source/Sysmodule/source/main.cpp b/source/Sysmodule/source/main.cpp index e5c6505..2830e0d 100644 --- a/source/Sysmodule/source/main.cpp +++ b/source/Sysmodule/source/main.cpp @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) { WriteToLog("\n\nNew sysmodule session started on version " APP_VERSION); config::Initialize(); - handler::Initialize(); + controllers::Initialize(); usb::Initialize(); psc::Initialize(); @@ -90,6 +90,6 @@ int main(int argc, char *argv[]) psc::Exit(); usb::Exit(); - handler::Exit(); + controllers::Exit(); config::Exit(); } diff --git a/source/Sysmodule/source/usb_module.cpp b/source/Sysmodule/source/usb_module.cpp index 403f826..01591af 100644 --- a/source/Sysmodule/source/usb_module.cpp +++ b/source/Sysmodule/source/usb_module.cpp @@ -43,28 +43,28 @@ namespace syscon::usb if (R_SUCCEEDED(eventWait(&g_usbCatchAllEvent, U64_MAX))) { WriteToLog("Event got caught!"); - if (handler::IsAtControllerLimit()) + if (controllers::IsAtControllerLimit()) continue; WriteToLog("Querying interfaces now"); s32 total_entries; if ((total_entries = QueryInterfaces(USB_CLASS_VENDOR_SPEC, 93, 1)) != 0) - handler::Insert(std::make_unique(std::make_unique(interfaces, total_entries))); + controllers::Insert(std::make_unique(std::make_unique(interfaces, total_entries))); else if ((total_entries = QueryInterfaces(USB_CLASS_VENDOR_SPEC, 93, 129)) != 0) for (int i = 0; i != total_entries; ++i) - handler::Insert(std::make_unique(std::make_unique(interfaces + i, 1))); + controllers::Insert(std::make_unique(std::make_unique(interfaces + i, 1))); else if ((total_entries = QueryInterfaces(0x58, 0x42, 0x00)) != 0) - handler::Insert(std::make_unique(std::make_unique(interfaces, total_entries))); + controllers::Insert(std::make_unique(std::make_unique(interfaces, total_entries))); else if ((total_entries = QueryInterfaces(USB_CLASS_VENDOR_SPEC, 71, 208)) != 0) - handler::Insert(std::make_unique(std::make_unique(interfaces, total_entries))); + controllers::Insert(std::make_unique(std::make_unique(interfaces, total_entries))); else if ((total_entries = QueryVendorProduct(VENDOR_SONY, PRODUCT_DUALSHOCK3)) != 0) - handler::Insert(std::make_unique(std::make_unique(interfaces, total_entries))); + controllers::Insert(std::make_unique(std::make_unique(interfaces, total_entries))); else if ((total_entries = QueryVendorProduct(VENDOR_SONY, PRODUCT_DUALSHOCK4_2X)) != 0) - handler::Insert(std::make_unique(std::make_unique(interfaces, total_entries))); + controllers::Insert(std::make_unique(std::make_unique(interfaces, total_entries))); } } while (is_usb_event_thread_running); } @@ -80,7 +80,7 @@ namespace syscon::usb eventClear(usbHsGetInterfaceStateChangeEvent()); if (R_SUCCEEDED(usbHsQueryAcquiredInterfaces(interfaces, sizeof(interfaces), &total_entries))) { - for (auto it = handler::Get().begin(); it != handler::Get().end(); ++it) + for (auto it = controllers::Get().begin(); it != controllers::Get().end(); ++it) { bool found_flag = false; @@ -101,7 +101,7 @@ namespace syscon::usb if (!found_flag) { //WriteToLog("Erasing controller! %i", (*it)->GetController()->GetType()); - handler::Get().erase(it--); + controllers::Get().erase(it--); WriteToLog("Controller erased!"); } } @@ -201,7 +201,7 @@ namespace syscon::usb g_usb_event_thread.Join(); g_usb_interface_change_thread.Join(); - handler::Reset(); + controllers::Reset(); } Result CreateUsbEvents()