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

usbhs: Expose the id param, and update a struct.

Browse Source
This commit is contained in:
yellows8 2023-02-01 13:16:32 -05:00
parent e768ac74f9
commit 7549d3b124
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ typedef struct {
Result res;
u32 requestedSize;
u32 transferredSize;
u64 unk_x10;
u64 id; ///< id from \ref usbHsEpPostBufferAsync.
} UsbHsXferReport;
typedef struct {
@ -247,9 +247,10 @@ static inline Event* usbHsEpGetXferEvent(UsbHsClientEpSession* s) {
* @param[in] s The endpoint object.
* @param buffer Data buffer. The buffer address and size should be aligned to 0x1000-bytes.
* @param[in] size The actual data size.
* @param[in] id This is an arbitrary value which will be later returned in \ref UsbHsXferReport. For example a value starting at 0 can be used, then if sending multiple requests at once this value can be incremented each time (with 0 for the first request in this set of requests).
* @param[out] xferId Output xferId.
*/
Result usbHsEpPostBufferAsync(UsbHsClientEpSession* s, void* buffer, u32 size, u32* xferId);
Result usbHsEpPostBufferAsync(UsbHsClientEpSession* s, void* buffer, u32 size, u64 id, u32* xferId);
/**
* @brief Gets an array of \ref UsbHsXferReport for the specified endpoint. This should be used after waiting on the Event from \ref usbHsEpGetXferEvent.
@ -277,11 +278,12 @@ Result usbHsEpPostBuffer(UsbHsClientEpSession* s, void* buffer, u32 size, u32* t
* @param buffer Data buffer. The buffer address and size should be aligned to 0x1000-bytes.
* @param[in] urbs Input array of u32s for the size of each urb.
* @param[in] urbCount Total entries in the urbs array.
* @param[in] id Same as \ref usbHsEpPostBufferAsync.
* @param[in] unk1 \ref usbHsEpPostBufferAsync would internally pass value 0 here.
* @param[in] unk2 \ref usbHsEpPostBufferAsync would internally pass value 0 here.
* @param[out] xferId Output xferId.
*/
Result usbHsEpBatchBufferAsync(UsbHsClientEpSession* s, void* buffer, u32* urbs, u32 urbCount, u32 unk1, u32 unk2, u32* xferId);
Result usbHsEpBatchBufferAsync(UsbHsClientEpSession* s, void* buffer, u32* urbs, u32 urbCount, u64 id, u32 unk1, u32 unk2, u32* xferId);
/**
* @brief This can be used to map the specified buffer as devicemem, which can then be used with \ref usbHsEpPostBufferAsync / \ref usbHsEpPostBuffer / \ref usbHsEpBatchBufferAsync. If the buffer address passed to those funcs is within this SmmuSpace, the specified buffer must be within the bounds of the SmmuSpace buffer.

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

@ -401,7 +401,7 @@ static Result _usbHsEpSubmitRequest(UsbHsClientEpSession* s, void* buffer, u32 s
return rc;
}
Result usbHsEpPostBufferAsync(UsbHsClientEpSession* s, void* buffer, u32 size, u32* xferId) {
Result usbHsEpPostBufferAsync(UsbHsClientEpSession* s, void* buffer, u32 size, u64 id, u32* xferId) {
if (hosversionBefore(2,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
@ -409,8 +409,8 @@ Result usbHsEpPostBufferAsync(UsbHsClientEpSession* s, void* buffer, u32 size, u
u32 size;
u32 pad;
u64 buffer;
u64 unk;
} in = { size, 0, (u64)buffer, 0 };
u64 id;
} in = { size, 0, (u64)buffer, id };
serviceAssumeDomain(&s->s);
return serviceDispatchInOut(&s->s, 4, in, *xferId);
@ -462,7 +462,7 @@ Result usbHsEpPostBuffer(UsbHsClientEpSession* s, void* buffer, u32 size, u32* t
if (hosversionBefore(2,0,0)) return _usbHsEpSubmitRequest(s, buffer, size, 0, transferredSize);
rc = usbHsEpPostBufferAsync(s, buffer, size, &xferId);
rc = usbHsEpPostBufferAsync(s, buffer, size, 0, &xferId);
if (R_FAILED(rc)) return rc;
rc = eventWait(&s->eventXfer, UINT64_MAX);
@ -481,7 +481,7 @@ Result usbHsEpPostBuffer(UsbHsClientEpSession* s, void* buffer, u32 size, u32* t
return rc;
}
Result usbHsEpBatchBufferAsync(UsbHsClientEpSession* s, void* buffer, u32* urbs, u32 urbCount, u32 unk1, u32 unk2, u32* xferId) {
Result usbHsEpBatchBufferAsync(UsbHsClientEpSession* s, void* buffer, u32* urbs, u32 urbCount, u64 id, u32 unk1, u32 unk2, u32* xferId) {
if (hosversionBefore(2,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
@ -491,8 +491,8 @@ Result usbHsEpBatchBufferAsync(UsbHsClientEpSession* s, void* buffer, u32* urbs,
u32 unk2;
u32 pad;
u64 buffer;
u64 unk;
} in = { urbCount, unk1, unk2, 0, (u64)buffer, 0 };
u64 id;
} in = { urbCount, unk1, unk2, 0, (u64)buffer, id };
serviceAssumeDomain(&s->s);
return serviceDispatchInOut(&s->s, 6, in, *xferId,