mirror/sys-con
1
0
Fork 0
mirror of https://github.com/cathery/sys-con.git synced 2025-03-29 22:20:09 +00:00
Code Issues Projects Releases Wiki Activity

Add mutex locks to usb queries

Browse Source
This commit is contained in:
cathery 2020-03-11 01:16:41 +03:00
parent ffcdee112c
commit 999b5d181f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/Sysmodule/source/usb_module.cpp
View File

@ -20,6 +20,8 @@ namespace syscon::usb
constexpr size_t MaxUsbHsInterfacesSize = 16; constexpr size_t MaxUsbHsInterfacesSize = 16;
ams::os::Mutex usbMutex;
void UsbEventThreadFunc(void *arg); void UsbEventThreadFunc(void *arg);
void UsbDs3EventThreadFunc(void *arg); void UsbDs3EventThreadFunc(void *arg);
void UsbDs4EventThreadFunc(void *arg); void UsbDs4EventThreadFunc(void *arg);
@ -47,6 +49,8 @@ namespace syscon::usb
if (R_SUCCEEDED(eventWait(&g_usbCatchAllEvent, U64_MAX))) if (R_SUCCEEDED(eventWait(&g_usbCatchAllEvent, U64_MAX)))
{ {
WriteToLog("Catch-all event went off"); WriteToLog("Catch-all event went off");
std::scoped_lock usbLock(usbMutex);
if (!controllers::IsAtControllerLimit()) if (!controllers::IsAtControllerLimit())
{ {
s32 total_entries; s32 total_entries;
@ -74,6 +78,8 @@ namespace syscon::usb
if (R_SUCCEEDED(eventWait(&g_usbDualshock3Event, U64_MAX))) if (R_SUCCEEDED(eventWait(&g_usbDualshock3Event, U64_MAX)))
{ {
WriteToLog("Dualshock 3 event went off"); WriteToLog("Dualshock 3 event went off");
std::scoped_lock usbLock(usbMutex);
if (!controllers::IsAtControllerLimit()) if (!controllers::IsAtControllerLimit())
{ {
s32 total_entries; s32 total_entries;
@ -91,6 +97,8 @@ namespace syscon::usb
if (R_SUCCEEDED(eventWait(&g_usbDualshock4Event, U64_MAX))) if (R_SUCCEEDED(eventWait(&g_usbDualshock4Event, U64_MAX)))
{ {
WriteToLog("Dualshock 4 event went off"); WriteToLog("Dualshock 4 event went off");
std::scoped_lock usbLock(usbMutex);
if (!controllers::IsAtControllerLimit()) if (!controllers::IsAtControllerLimit())
{ {
s32 total_entries; s32 total_entries;
@ -109,6 +117,8 @@ namespace syscon::usb
{ {
s32 total_entries; s32 total_entries;
WriteToLog("Interface state was changed"); WriteToLog("Interface state was changed");
std::scoped_lock usbLock(usbMutex);
eventClear(usbHsGetInterfaceStateChangeEvent()); eventClear(usbHsGetInterfaceStateChangeEvent());
if (R_SUCCEEDED(usbHsQueryAcquiredInterfaces(interfaces, sizeof(interfaces), &total_entries))) if (R_SUCCEEDED(usbHsQueryAcquiredInterfaces(interfaces, sizeof(interfaces), &total_entries)))
{ {