mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-04 10:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

avoid double rwlock

Browse Source
This commit is contained in:
Gabriel 2019-12-11 19:52:18 -08:00
parent 58baf11daa
commit 20f86fafa4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nx/source/services/hid.c
View File

@ -432,7 +432,7 @@ u64 hidKeysAllDown() {
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
for (u8 controller=0; controller<10; controller++) { for (u8 controller=0; controller<10; controller++) {
if (hidIsControllerConnected(controller)) kDown |= g_controllerDown[controller]; if ((g_controllerEntries[controller].connectionState & CONTROLLER_STATE_CONNECTED) != 0) kDown |= g_controllerDown[controller];
} }
rwlockReadUnlock(&g_hidLock); rwlockReadUnlock(&g_hidLock);
@ -444,7 +444,7 @@ u64 hidKeysAllUp() {
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
for (u8 controller=0; controller<10; controller++) { for (u8 controller=0; controller<10; controller++) {
if (hidIsControllerConnected(controller)) kUp |= g_controllerUp[controller]; if ((g_controllerEntries[controller].connectionState & CONTROLLER_STATE_CONNECTED) != 0) kUp |= g_controllerUp[controller];
} }
rwlockReadUnlock(&g_hidLock); rwlockReadUnlock(&g_hidLock);
@ -456,7 +456,7 @@ u64 hidKeysAllHeld() {
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
for (u8 controller=0; controller<10; controller++) { for (u8 controller=0; controller<10; controller++) {
if (hidIsControllerConnected(controller)) kHeld |= g_controllerHeld[controller]; if ((g_controllerEntries[controller].connectionState & CONTROLLER_STATE_CONNECTED) != 0) kHeld |= g_controllerHeld[controller];
} }
rwlockReadUnlock(&g_hidLock); rwlockReadUnlock(&g_hidLock);
@ -465,10 +465,13 @@ u64 hidKeysAllHeld() {
u32 hidGetControllerCount() { u32 hidGetControllerCount() {
u32 count = 0; u32 count = 0;
rwlockReadlock(&g_hidLock);
for (u32 controller=0; controller<10; controller++) { for (u32 controller=0; controller<10; controller++) {
if (hidIsControllerConnected(controller)) count++; if ((g_controllerEntries[controller].connectionState & CONTROLLER_STATE_CONNECTED) != 0) count++;
} }
rwlockReadUnlock(&g_hidLock);
return count; return count;
} }