mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 04:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

hid: Read SystemExt/System first in hidScanInput for compatibility with old homebrew

Browse Source
This commit is contained in:
fincs 2020-12-01 21:07:03 +01:00
parent 676f254be1
commit ab71d6033a
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,7 +206,23 @@ void hidScanInput(void) {
u32 style_set = hidGetNpadStyleSet(id); u32 style_set = hidGetNpadStyleSet(id);
size_t total_out=0; size_t total_out=0;
if (style_set & HidNpadStyleTag_NpadFullKey) { if (style_set & HidNpadStyleTag_NpadSystemExt) {
HidNpadSystemExtState state={0};
total_out = hidGetNpadStatesSystemExt(id, &state, 1);
if (total_out) {
g_controllerHeld[i] |= state.buttons;
memcpy(&g_controllerEntries[i], &state, sizeof(state));
}
}
else if (style_set & HidNpadStyleTag_NpadSystem) {
HidNpadSystemState state={0};
total_out = hidGetNpadStatesSystem(id, &state, 1);
if (total_out) {
g_controllerHeld[i] |= state.buttons;
memcpy(&g_controllerEntries[i], &state, sizeof(state));
}
}
else if (style_set & HidNpadStyleTag_NpadFullKey) {
HidNpadFullKeyState state={0}; HidNpadFullKeyState state={0};
total_out = hidGetNpadStatesFullKey(id, &state, 1); total_out = hidGetNpadStatesFullKey(id, &state, 1);
if (total_out) { if (total_out) {
@ -246,22 +262,6 @@ void hidScanInput(void) {
memcpy(&g_controllerEntries[i], &state, sizeof(state)); memcpy(&g_controllerEntries[i], &state, sizeof(state));
} }
} }
else if (style_set & HidNpadStyleTag_NpadSystemExt) {
HidNpadSystemExtState state={0};
total_out = hidGetNpadStatesSystemExt(id, &state, 1);
if (total_out) {
g_controllerHeld[i] |= state.buttons;
memcpy(&g_controllerEntries[i], &state, sizeof(state));
}
}
else if (style_set & HidNpadStyleTag_NpadSystem) {
HidNpadSystemState state={0};
total_out = hidGetNpadStatesSystem(id, &state, 1);
if (total_out) {
g_controllerHeld[i] |= state.buttons;
memcpy(&g_controllerEntries[i], &state, sizeof(state));
}
}
g_controllerDown[i] = (~g_controllerOld[i]) & g_controllerHeld[i]; g_controllerDown[i] = (~g_controllerOld[i]) & g_controllerHeld[i];
g_controllerUp[i] = g_controllerOld[i] & (~g_controllerHeld[i]); g_controllerUp[i] = g_controllerOld[i] & (~g_controllerHeld[i]);