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

better var names and add hidGetControllerCount()

Browse Source
This commit is contained in:
Gabriel 2019-12-11 19:33:08 -08:00
parent cfc1eb87f3
commit 573442bbeb
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nx/include/switch/services/hid.h
View File

@ -740,6 +740,8 @@ u64 hidKeysAllHeld();
u64 hidKeysAllDown(); u64 hidKeysAllDown();
u64 hidKeysAllUp(); u64 hidKeysAllUp();
u32 hidGetControllerCount();
u64 hidMouseButtonsHeld(void); u64 hidMouseButtonsHeld(void);
u64 hidMouseButtonsDown(void); u64 hidMouseButtonsDown(void);
u64 hidMouseButtonsUp(void); u64 hidMouseButtonsUp(void);

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

@ -431,7 +431,7 @@ u64 hidKeysAllDown() {
u64 kDown = 0; u64 kDown = 0;
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
for (u8 controller=0; controller<10; controller++) { for (u8 controller=0; controller<hidGetControllerCount()+1; controller++) {
kDown |= g_controllerDown[controller]; kDown |= g_controllerDown[controller];
} }
rwlockReadUnlock(&g_hidLock); rwlockReadUnlock(&g_hidLock);
@ -440,27 +440,36 @@ u64 hidKeysAllDown() {
} }
u64 hidKeysAllUp() { u64 hidKeysAllUp() {
u64 kDown = 0; u64 kUp = 0;
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
for (u8 controller=0; controller<10; controller++) { for (u8 controller=0; controller<hidGetControllerCount()+1; controller++) {
kDown |= g_controllerUp[controller]; kUp |= g_controllerUp[controller];
} }
rwlockReadUnlock(&g_hidLock); rwlockReadUnlock(&g_hidLock);
return kDown; return kUp;
} }
u64 hidKeysAllHeld() { u64 hidKeysAllHeld() {
u64 kDown = 0; u64 kHeld = 0;
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
for (u8 controller=0; controller<10; controller++) { for (u8 controller=0; controller<hidGetControllerCount()+1; controller++) {
kDown |= g_controllerHeld[controller]; kHeld |= g_controllerHeld[controller];
} }
rwlockReadUnlock(&g_hidLock); rwlockReadUnlock(&g_hidLock);
return kDown; return kHeld;
}
u32 hidGetControllerCount() {
u32 count = 0;
for (u32 controller=0; controller<10; controller++) {
if (hidIsControllerConnected(controller)) count++;
}
return count;
} }
u64 hidMouseButtonsHeld(void) { u64 hidMouseButtonsHeld(void) {