mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-03 10:02:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused TipcService parameter in tipcMakeRequest and tipcParseResponse.

Browse Source
This commit is contained in:
Pablo Curiel 2021-04-20 12:10:16 -04:00
parent 4d6f56047b
commit 4b31e3d098
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nx/include/switch/sf/tipc.h
View File

@ -125,11 +125,9 @@ NX_CONSTEXPR void _tipcRequestProcessBuffer(HipcRequest* req, const SfBuffer* bu
} }
NX_INLINE void* tipcMakeRequest( NX_INLINE void* tipcMakeRequest(
const TipcService *s, u32 request_id, u32 data_size, bool send_pid, u32 request_id, u32 data_size, bool send_pid,
const SfBufferAttrs buffer_attrs, const SfBuffer* buffers, const SfBufferAttrs buffer_attrs, const SfBuffer* buffers,
u32 num_handles, const Handle* handles) { u32 num_handles, const Handle* handles) {
(void)s;
TipcRequestFormat fmt = {}; TipcRequestFormat fmt = {};
fmt.request_id = request_id + 16; fmt.request_id = request_id + 16;
fmt.data_size = data_size; fmt.data_size = data_size;
@ -199,11 +197,10 @@ NX_CONSTEXPR void _tipcResponseGetHandle(HipcResponse* res, SfOutHandleAttr type
} }
NX_INLINE Result tipcParseResponse( NX_INLINE Result tipcParseResponse(
const TipcService* s, u32 out_size, void** out_data, u32 out_size, void** out_data,
u32 num_out_objects, TipcService* out_objects, u32 num_out_objects, TipcService* out_objects,
const SfOutHandleAttrs out_handle_attrs, Handle* out_handles const SfOutHandleAttrs out_handle_attrs, Handle* out_handles
) { ) {
(void)s;
HipcResponse res = hipcParseResponse(armGetTls()); HipcResponse res = hipcParseResponse(armGetTls());
@ -237,10 +234,7 @@ NX_INLINE Result tipcDispatchImpl(
TipcDispatchParams disp TipcDispatchParams disp
) )
{ {
// Make a copy of the service struct, so that the compiler can assume that it won't be modified by function calls. void* in = tipcMakeRequest(request_id,
const TipcService srv = *s;
void* in = tipcMakeRequest(&srv, request_id,
in_data_size, disp.in_send_pid, in_data_size, disp.in_send_pid,
disp.buffer_attrs, disp.buffers, disp.buffer_attrs, disp.buffers,
disp.in_num_handles, disp.in_handles); disp.in_num_handles, disp.in_handles);
@ -251,8 +245,7 @@ NX_INLINE Result tipcDispatchImpl(
Result rc = svcSendSyncRequest(s->session); Result rc = svcSendSyncRequest(s->session);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
void* out = NULL; void* out = NULL;
rc = tipcParseResponse(&srv, rc = tipcParseResponse(out_data_size, &out,
out_data_size, &out,
disp.out_num_objects, disp.out_objects, disp.out_num_objects, disp.out_objects,
disp.out_handle_attrs, disp.out_handles); disp.out_handle_attrs, disp.out_handles);