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

Revert "We don't understand Auto -- disable for now"

Browse Source 
This reverts commit 20c4bfd54a.
This commit is contained in:
plutoo 2018-02-01 00:26:39 +01:00
parent 20c4bfd54a
commit 89021287f8
2 changed files with 77 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nx/include/switch/gfx/binder.h
View File

@ -10,6 +10,7 @@ typedef struct {
s32 id; s32 id;
Handle nativeHandle; Handle nativeHandle;
size_t ipcBufferSize; size_t ipcBufferSize;
bool hasTransactAuto;
} Binder; } Binder;
// binderExitSession will not close the sessionHandle since it's user-specified via binderCreateSession and may be used elsewhere. // binderExitSession will not close the sessionHandle since it's user-specified via binderCreateSession and may be used elsewhere.

75
nx/source/gfx/binder.c
View File

@ -12,6 +12,7 @@ void binderCreateSession(Binder *session, Handle sessionHandle, s32 id)
session->sessionHandle = sessionHandle; session->sessionHandle = sessionHandle;
session->id = id; session->id = id;
session->nativeHandle = INVALID_HANDLE; session->nativeHandle = INVALID_HANDLE;
session->hasTransactAuto = 0;
} }
Result binderInitSession(Binder *session, u32 unk0) Result binderInitSession(Binder *session, u32 unk0)
@ -57,6 +58,10 @@ Result binderInitSession(Binder *session, u32 unk0)
return rc; return rc;
} }
// Use TransactParcelAuto when available.
if (kernelAbove300())
session->hasTransactAuto = 1;
return rc; return rc;
} }
@ -127,6 +132,73 @@ static Result _binderTransactParcel(
return rc; return rc;
} }
static Result _binderTransactParcelAuto(
Binder *session, u32 code,
void* parcel_data, size_t parcel_data_size,
void* parcel_reply, size_t parcel_reply_size,
u32 flags)
{
if (!session->created || !session->initialized) return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
s32 session_id;
u32 code;
u32 flags;
} *raw;
void* buf_static[2] = {parcel_data, parcel_reply};
void* buf_transfer[2] = {parcel_data, parcel_reply};
size_t buf_static_size[2] = {parcel_data_size, parcel_reply_size};
size_t buf_transfer_size[2] = {parcel_data_size, parcel_reply_size};
if(session->ipcBufferSize!=0 && buf_static_size[0] <= session->ipcBufferSize) {
buf_transfer[0] = NULL;
buf_transfer[1] = NULL;
buf_transfer_size[0] = 0;
buf_transfer_size[1] = 0;
}
else {
buf_static[0] = NULL;
buf_static[1] = NULL;
buf_static_size[0] = 0;
buf_static_size[1] = 0;
}
ipcAddSendBuffer(&c, buf_transfer[0], buf_transfer_size[0], 0);
ipcAddRecvBuffer(&c, buf_transfer[1], buf_transfer_size[1], 0);
ipcAddSendStatic(&c, buf_static[0], buf_static_size[0], 0);
ipcAddRecvStatic(&c, buf_static[1], buf_static_size[1], 0);
raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 3;
raw->session_id = session->id;
raw->code = code;
raw->flags = flags;
Result rc = ipcDispatch(session->sessionHandle);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
ipcParse(&r);
struct {
u64 magic;
u64 result;
} *resp = r.Raw;
rc = resp->result;
}
return rc;
}
Result binderTransactParcel( Result binderTransactParcel(
Binder *session, u32 code, Binder *session, u32 code,
void* parcel_data, size_t parcel_data_size, void* parcel_data, size_t parcel_data_size,
@ -135,6 +207,9 @@ Result binderTransactParcel(
{ {
Result rc = 0; Result rc = 0;
if (session->hasTransactAuto)
rc = _binderTransactParcelAuto(session, code, parcel_data, parcel_data_size, parcel_reply, parcel_reply_size, flags);
else
rc = _binderTransactParcel(session, code, parcel_data, parcel_data_size, parcel_reply, parcel_reply_size, flags); rc = _binderTransactParcel(session, code, parcel_data, parcel_data_size, parcel_reply, parcel_reply_size, flags);
return rc; return rc;