From 4b31e3d098b779a9f81e64c1abc3de4ee97b5fde Mon Sep 17 00:00:00 2001 From: Pablo Curiel Date: Tue, 20 Apr 2021 12:10:16 -0400 Subject: [PATCH] Remove unused TipcService parameter in tipcMakeRequest and tipcParseResponse. --- nx/include/switch/sf/tipc.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/nx/include/switch/sf/tipc.h b/nx/include/switch/sf/tipc.h index c84a47b5..52f74cbe 100644 --- a/nx/include/switch/sf/tipc.h +++ b/nx/include/switch/sf/tipc.h @@ -125,11 +125,9 @@ NX_CONSTEXPR void _tipcRequestProcessBuffer(HipcRequest* req, const SfBuffer* bu } 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, u32 num_handles, const Handle* handles) { - (void)s; - TipcRequestFormat fmt = {}; fmt.request_id = request_id + 16; fmt.data_size = data_size; @@ -199,11 +197,10 @@ NX_CONSTEXPR void _tipcResponseGetHandle(HipcResponse* res, SfOutHandleAttr type } 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, const SfOutHandleAttrs out_handle_attrs, Handle* out_handles ) { - (void)s; HipcResponse res = hipcParseResponse(armGetTls()); @@ -237,10 +234,7 @@ NX_INLINE Result tipcDispatchImpl( TipcDispatchParams disp ) { - // Make a copy of the service struct, so that the compiler can assume that it won't be modified by function calls. - const TipcService srv = *s; - - void* in = tipcMakeRequest(&srv, request_id, + void* in = tipcMakeRequest(request_id, in_data_size, disp.in_send_pid, disp.buffer_attrs, disp.buffers, disp.in_num_handles, disp.in_handles); @@ -251,8 +245,7 @@ NX_INLINE Result tipcDispatchImpl( Result rc = svcSendSyncRequest(s->session); if (R_SUCCEEDED(rc)) { void* out = NULL; - rc = tipcParseResponse(&srv, - out_data_size, &out, + rc = tipcParseResponse(out_data_size, &out, disp.out_num_objects, disp.out_objects, disp.out_handle_attrs, disp.out_handles);