The-Homebrew-Cloud/AutobootModule
2
0
Fork 0
mirror of https://github.com/wiiu-env/AutobootModule.git synced 2024-11-22 02:49:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Limit number of VPADRead attempt to 100 to avoid softlocks even if they should be impossible

Browse Source
This commit is contained in:
Maschell 2024-07-04 17:31:34 +02:00
parent ad745814be
commit 023414fdda
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/InputUtils.cpp
View File

@ -95,9 +95,10 @@ uint32_t remapClassicButtons(uint32_t buttons) {
} }
InputUtils::InputData InputUtils::getControllerInput() { InputUtils::InputData InputUtils::getControllerInput() {
InputData inputData{}; InputData inputData = {};
VPADStatus vpadStatus{}; VPADStatus vpadStatus = {};
VPADReadError vpadError = VPAD_READ_UNINITIALIZED; VPADReadError vpadError = VPAD_READ_UNINITIALIZED;
int maxAttempts = 100;
do { do {
if (VPADRead(VPAD_CHAN_0, &vpadStatus, 1, &vpadError) > 0 && vpadError == VPAD_READ_SUCCESS) { if (VPADRead(VPAD_CHAN_0, &vpadStatus, 1, &vpadError) > 0 && vpadError == VPAD_READ_SUCCESS) {
inputData.trigger = vpadStatus.trigger; inputData.trigger = vpadStatus.trigger;
@ -106,10 +107,10 @@ InputUtils::InputData InputUtils::getControllerInput() {
} else { } else {
OSSleepTicks(OSMillisecondsToTicks(1)); OSSleepTicks(OSMillisecondsToTicks(1));
} }
} while (vpadError == VPAD_READ_NO_SAMPLES); } while (--maxAttempts > 0 && vpadError == VPAD_READ_NO_SAMPLES);
KPADStatus kpadStatus{}; KPADStatus kpadStatus = {};
KPADError kpadError = KPAD_ERROR_UNINITIALIZED; KPADError kpadError = KPAD_ERROR_UNINITIALIZED;
for (int32_t i = 0; i < 4; i++) { for (int32_t i = 0; i < 4; i++) {
if (KPADReadEx((KPADChan) i, &kpadStatus, 1, &kpadError) > 0) { if (KPADReadEx((KPADChan) i, &kpadStatus, 1, &kpadError) > 0) {
if (kpadError == KPAD_ERROR_OK && kpadStatus.extensionType != 0xFF) { if (kpadError == KPAD_ERROR_OK && kpadStatus.extensionType != 0xFF) {