avoid possible case where controller count did not match with index

This commit is contained in:
Gabriel 2019-12-11 19:41:33 -08:00
parent 573442bbeb
commit 58baf11daa

View File

@ -431,8 +431,8 @@ u64 hidKeysAllDown() {
u64 kDown = 0; u64 kDown = 0;
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
for (u8 controller=0; controller<hidGetControllerCount()+1; controller++) { for (u8 controller=0; controller<10; controller++) {
kDown |= g_controllerDown[controller]; if (hidIsControllerConnected(controller)) kDown |= g_controllerDown[controller];
} }
rwlockReadUnlock(&g_hidLock); rwlockReadUnlock(&g_hidLock);
@ -443,8 +443,8 @@ u64 hidKeysAllUp() {
u64 kUp = 0; u64 kUp = 0;
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
for (u8 controller=0; controller<hidGetControllerCount()+1; controller++) { for (u8 controller=0; controller<10; controller++) {
kUp |= g_controllerUp[controller]; if (hidIsControllerConnected(controller)) kUp |= g_controllerUp[controller];
} }
rwlockReadUnlock(&g_hidLock); rwlockReadUnlock(&g_hidLock);
@ -455,8 +455,8 @@ u64 hidKeysAllHeld() {
u64 kHeld = 0; u64 kHeld = 0;
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
for (u8 controller=0; controller<hidGetControllerCount()+1; controller++) { for (u8 controller=0; controller<10; controller++) {
kHeld |= g_controllerHeld[controller]; if (hidIsControllerConnected(controller)) kHeld |= g_controllerHeld[controller];
} }
rwlockReadUnlock(&g_hidLock); rwlockReadUnlock(&g_hidLock);