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

binder: Update for new-ipc

Browse Source
This commit is contained in:
fincs 2019-10-22 16:11:10 +02:00
parent 145ad1ba87
commit e9e392bbe2
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 37 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nx/include/switch/display/binder.h
View File

@ -1,14 +1,13 @@
#pragma once #pragma once
#include "../types.h" #include "../types.h"
#include "../kernel/event.h" #include "../kernel/event.h"
#include "../services/sm.h" #include "../sf/service.h"
#define BINDER_FIRST_CALL_TRANSACTION 0x1 #define BINDER_FIRST_CALL_TRANSACTION 0x1
typedef struct { typedef struct {
bool created : 1; bool created;
bool initialized : 1; bool initialized;
bool has_transact_auto : 1;
s32 id; s32 id;
size_t dummy; size_t dummy;
Service* relay; Service* relay;

217
nx/source/display/binder.c
View File

@ -1,25 +1,10 @@
#include <string.h> #include <string.h>
#include "types.h" #include "types.h"
#include "result.h" #include "result.h"
#include "kernel/ipc.h" #include "sf/service.h"
#include "runtime/hosversion.h" #include "runtime/hosversion.h"
#include "display/binder.h" #include "display/binder.h"
static void* _binderIpcPrepareHeader(Binder* b, IpcCommand* cmd, size_t sizeof_raw)
{
return serviceIpcPrepareHeader(b->relay, cmd, sizeof_raw);
}
static Result _binderIpcDispatch(Binder* b)
{
return serviceIpcDispatch(b->relay);
}
static Result _binderIpcParse(Binder* b, IpcParsedCommand* r, size_t sizeof_raw)
{
return serviceIpcParse(b->relay, r, sizeof_raw);
}
void binderCreate(Binder* b, s32 id) void binderCreate(Binder* b, s32 id)
{ {
memset(b, 0, sizeof(Binder)); memset(b, 0, sizeof(Binder));
@ -51,10 +36,6 @@ Result binderInitSession(Binder* b, Service* relay)
b->initialized = true; b->initialized = true;
// Use TransactParcelAuto when available.
if (hosversionAtLeast(3,0,0))
b->has_transact_auto = true;
return rc; return rc;
} }
@ -74,116 +55,35 @@ void binderClose(Binder* b)
b->initialized = false; b->initialized = false;
} }
static Result _binderTransactParcel(
Binder* b, u32 code,
void* parcel_data, size_t parcel_data_size,
void* parcel_reply, size_t parcel_reply_size,
u32 flags)
{
if (!b->created || !b->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;
ipcAddSendBuffer(&c, parcel_data, parcel_data_size, 0);
ipcAddRecvBuffer(&c, parcel_reply, parcel_reply_size, 0);
raw = _binderIpcPrepareHeader(b, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 0;
raw->session_id = b->id;
raw->code = code;
raw->flags = flags;
Result rc = _binderIpcDispatch(b);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
_binderIpcParse(b, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
}
static Result _binderTransactParcelAuto(
Binder* b, u32 code,
void* parcel_data, size_t parcel_data_size,
void* parcel_reply, size_t parcel_reply_size,
u32 flags)
{
if (!b->created || !b->initialized)
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
s32 session_id;
u32 code;
u32 flags;
} PACKED *raw;
ipcAddSendSmart(&c, b->relay->pointer_buffer_size, parcel_data, parcel_data_size, 0);
ipcAddRecvSmart(&c, b->relay->pointer_buffer_size, parcel_reply, parcel_reply_size, 0);
raw = _binderIpcPrepareHeader(b, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 3;
raw->session_id = b->id;
raw->code = code;
raw->flags = flags;
Result rc = _binderIpcDispatch(b);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
_binderIpcParse(b, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
}
Result binderTransactParcel( Result binderTransactParcel(
Binder* b, u32 code, Binder* b, u32 code,
void* parcel_data, size_t parcel_data_size, void* parcel_data, size_t parcel_data_size,
void* parcel_reply, size_t parcel_reply_size, void* parcel_reply, size_t parcel_reply_size,
u32 flags) u32 flags)
{ {
Result rc = 0; if (!b->created || !b->initialized)
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
if (b->has_transact_auto) const bool use_auto = hosversionAtLeast(3,0,0);
rc = _binderTransactParcelAuto(b, code, parcel_data, parcel_data_size, parcel_reply, parcel_reply_size, flags); const u32 cmd_id = use_auto ? 3 : 0;
else const u32 buf_mode = use_auto ? SfBufferAttr_HipcAutoSelect : SfBufferAttr_HipcMapAlias;
rc = _binderTransactParcel(b, code, parcel_data, parcel_data_size, parcel_reply, parcel_reply_size, flags);
return rc; const struct {
s32 session_id;
u32 code;
u32 flags;
} in = { b->id, code, flags };
return serviceDispatchIn(b->relay, cmd_id, in,
.buffer_attrs = {
buf_mode | SfBufferAttr_In,
buf_mode | SfBufferAttr_Out,
},
.buffers = {
{ parcel_data, parcel_data_size },
{ parcel_reply, parcel_reply_size },
},
);
} }
Result binderConvertErrorCode(s32 code) Result binderConvertErrorCode(s32 code)
@ -217,40 +117,13 @@ Result binderAdjustRefcount(Binder* b, s32 addval, s32 type)
if (!b->created) if (!b->created)
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
IpcCommand c; const struct {
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
s32 session_id; s32 session_id;
s32 addval; s32 addval;
s32 type; s32 type;
} *raw; } in = { b->id, addval, type };
raw = _binderIpcPrepareHeader(b, &c, sizeof(*raw)); return serviceDispatchIn(b->relay, 1, in);
raw->magic = SFCI_MAGIC;
raw->cmd_id = 1;
raw->session_id = b->id;
raw->addval = addval;
raw->type = type;
Result rc = _binderIpcDispatch(b);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
_binderIpcParse(b, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
} }
Result binderGetNativeHandle(Binder* b, u32 inval, Event *event_out) Result binderGetNativeHandle(Binder* b, u32 inval, Event *event_out)
@ -258,41 +131,19 @@ Result binderGetNativeHandle(Binder* b, u32 inval, Event *event_out)
if (!b->created) if (!b->created)
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
IpcCommand c; const struct {
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
s32 session_id; s32 session_id;
u32 inval; u32 inval;
} *raw; } in = { b->id, inval };
raw = _binderIpcPrepareHeader(b, &c, sizeof(*raw)); Handle h = INVALID_HANDLE;
Result rc = serviceDispatchIn(b->relay, 2, in,
.out_handle_attrs = { SfOutHandleAttr_HipcCopy },
.out_handles = &h,
);
raw->magic = SFCI_MAGIC; if (R_SUCCEEDED(rc) && event_out)
raw->cmd_id = 2; eventLoadRemote(event_out, h, false);
raw->session_id = b->id;
raw->inval = inval;
Result rc = _binderIpcDispatch(b);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp = r.Raw;
_binderIpcParse(b, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc)) {
eventLoadRemote(event_out, r.Handles[0], false);
}
}
return rc; return rc;
} }