mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

usbDsWaitReady: use deadline timeout

Browse Source
This commit is contained in:
Michael Theall 2020-12-04 19:40:38 -06:00 committed by fincs
parent f82d97f88a
commit 1e9fe9b199
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nx/source/services/usbds.c
View File

@ -4,6 +4,7 @@
#include "services/usbds.h" #include "services/usbds.h"
#include "runtime/hosversion.h" #include "runtime/hosversion.h"
#include "runtime/util/utf.h" #include "runtime/util/utf.h"
#include "switch/arm/counter.h"
#define TOTAL_INTERFACES 4 #define TOTAL_INTERFACES 4
#define TOTAL_ENDPOINTS_IN 16 #define TOTAL_ENDPOINTS_IN 16
@ -234,12 +235,27 @@ Result usbDsWaitReady(u64 timeout) {
rc = usbDsGetState(&state); rc = usbDsGetState(&state);
if (R_FAILED(rc)) return rc; if (R_FAILED(rc)) return rc;
if (state == UsbState_Configured) return 0;
bool has_timeout = timeout != UINT64_MAX;
u64 deadline = 0;
if (has_timeout)
deadline = armGetSystemTick() + armNsToTicks(timeout);
do {
if (has_timeout) {
s64 remaining = deadline - armGetSystemTick();
timeout = remaining > 0 ? armTicksToNs(remaining) : 0;
}
while (R_SUCCEEDED(rc) && state != UsbState_Configured) {
eventWait(&g_usbDsStateChangeEvent, timeout); eventWait(&g_usbDsStateChangeEvent, timeout);
eventClear(&g_usbDsStateChangeEvent); eventClear(&g_usbDsStateChangeEvent);
rc = usbDsGetState(&state); rc = usbDsGetState(&state);
} } while (R_SUCCEEDED(rc) && state != UsbState_Configured && timeout > 0);
if (R_SUCCEEDED(rc) && state != UsbState_Configured && timeout == 0)
return KERNELRESULT(TimedOut);
return rc; return rc;
} }
@ -259,7 +275,7 @@ Result usbDsParseReportData(UsbDsReportData *reportdata, u32 urbId, u32 *request
if (pos == count) return MAKERESULT(Module_Libnx, LibnxError_NotFound); if (pos == count) return MAKERESULT(Module_Libnx, LibnxError_NotFound);
switch(entry->urb_status) { switch(entry->urb_status) {
case 0x3: case 0x3:
rc = 0; rc = 0;
break; break;