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

Use the proper IPC buffer type for _usbHsEpGetXferReport with [3.0.0+].

Browse Source
This commit is contained in:
yellows8 2019-05-16 18:47:38 -04:00
parent 5452a4bd5f
commit f6f6adf1cb
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nx/include/switch/services/usbhs.h
View File

@ -96,6 +96,7 @@ typedef struct {
typedef struct { typedef struct {
Service s; Service s;
Event eventXfer; ///< [2.0.0+] Signaled when PostBufferAsync finishes. Event eventXfer; ///< [2.0.0+] Signaled when PostBufferAsync finishes.
size_t ptrbufsize; ///< [3.0.0+] IPC pointer buffer size.
struct usb_endpoint_descriptor desc; struct usb_endpoint_descriptor desc;
} UsbHsClientEpSession; } UsbHsClientEpSession;

9
nx/source/services/usbhs.c
View File

@ -721,6 +721,8 @@ Result usbHsIfOpenUsbEp(UsbHsClientIfSession* s, UsbHsClientEpSession* ep, u16 m
if (R_SUCCEEDED(rc)) rc = _usbHsGetEvent(&ep->s, &ep->eventXfer, 2); if (R_SUCCEEDED(rc)) rc = _usbHsGetEvent(&ep->s, &ep->eventXfer, 2);
} }
if (hosversionAtLeast(3,0,0) && R_SUCCEEDED(rc)) rc = ipcQueryPointerBufferSize(ep->s.handle, &ep->ptrbufsize);
if (R_FAILED(rc)) { if (R_FAILED(rc)) {
serviceClose(&ep->s); serviceClose(&ep->s);
eventClose(&ep->eventXfer); eventClose(&ep->eventXfer);
@ -844,7 +846,12 @@ static Result _usbHsEpGetXferReport(UsbHsClientEpSession* s, UsbHsXferReport* re
u32 max_reports; u32 max_reports;
} *raw; } *raw;
ipcAddRecvBuffer(&c, reports, sizeof(UsbHsXferReport) * max_reports, BufferType_Normal); if (hosversionBefore(3,0,0)) {
ipcAddRecvBuffer(&c, reports, sizeof(UsbHsXferReport) * max_reports, BufferType_Normal);
}
else {
ipcAddRecvSmart(&c, s->ptrbufsize, reports, sizeof(UsbHsXferReport) * max_reports, 0);
}
raw = serviceIpcPrepareHeader(&s->s, &c, sizeof(*raw)); raw = serviceIpcPrepareHeader(&s->s, &c, sizeof(*raw));