From bf89c7526e28891f917eaa918214c6c5f44e95b4 Mon Sep 17 00:00:00 2001 From: plutoo Date: Thu, 11 Jan 2018 21:56:04 +0100 Subject: [PATCH] Rename ipc functions before it's too late --- nx/include/switch/ipc.h | 16 +++---- nx/source/gfx/binder.c | 16 +++---- nx/source/services/acc.c | 4 +- nx/source/services/apm.c | 12 ++--- nx/source/services/applet.c | 56 +++++++++++----------- nx/source/services/bsd.c | 44 +++++++++--------- nx/source/services/fs.c | 92 ++++++++++++++++++------------------- nx/source/services/hid.c | 8 ++-- nx/source/services/nv.c | 24 +++++----- nx/source/services/pm.c | 20 ++++---- nx/source/services/sm.c | 16 +++---- nx/source/services/usb.c | 36 +++++++-------- nx/source/services/vi.c | 36 +++++++-------- 13 files changed, 190 insertions(+), 190 deletions(-) diff --git a/nx/include/switch/ipc.h b/nx/include/switch/ipc.h index 545970e7..6a081777 100644 --- a/nx/include/switch/ipc.h +++ b/nx/include/switch/ipc.h @@ -203,9 +203,9 @@ typedef struct { void* Raw; size_t RawSize; -} IpcCommandResponse; +} IpcParsedCommand; -static inline Result ipcParseResponse(IpcCommandResponse* r) { +static inline Result ipcParse(IpcParsedCommand* r) { u32* buf = armGetTls(); u32 ctrl0 = *buf++; u32 ctrl1 = *buf++; @@ -273,8 +273,8 @@ static inline Result ipcQueryPointerBufferSize(Handle session, size_t *size) { Result rc = ipcDispatch(session); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -306,8 +306,8 @@ static inline Result ipcConvertSessionToDomain(Handle session, u32* object_id_ou Result rc = ipcDispatch(session); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -346,8 +346,8 @@ static inline void* ipcPrepareHeaderForDomain(IpcCommand* cmd, size_t sizeof_raw return (void*)(((uintptr_t) raw) + sizeof(DomainMessageHeader)); } -static inline Result ipcParseResponseForDomain(IpcCommandResponse* r) { - Result rc = ipcParseResponse(r); +static inline Result ipcParseForDomain(IpcParsedCommand* r) { + Result rc = ipcParse(r); if (R_SUCCEEDED(rc)) { r->Raw = (void*)(((uintptr_t) r->Raw) + sizeof(DomainMessageHeader)); diff --git a/nx/source/gfx/binder.c b/nx/source/gfx/binder.c index c1203156..612aa1a4 100644 --- a/nx/source/gfx/binder.c +++ b/nx/source/gfx/binder.c @@ -114,8 +114,8 @@ static Result _binderTransactParcel( Result rc = ipcDispatch(session->sessionHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -181,8 +181,8 @@ static Result _binderTransactParcelAuto( Result rc = ipcDispatch(session->sessionHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -236,8 +236,8 @@ Result binderAdjustRefcount(Binder *session, s32 addval, s32 type) Result rc = ipcDispatch(session->sessionHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -274,8 +274,8 @@ Result binderGetNativeHandle(Binder *session, u32 inval, Handle *handle_out) Result rc = ipcDispatch(session->sessionHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; diff --git a/nx/source/services/acc.c b/nx/source/services/acc.c index ad0f33ca..c9e4f208 100644 --- a/nx/source/services/acc.c +++ b/nx/source/services/acc.c @@ -47,8 +47,8 @@ Result accountGetActiveUser(u128 *userID, bool *account_selected) { Result rc = ipcDispatch(g_accountServiceSession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; diff --git a/nx/source/services/apm.c b/nx/source/services/apm.c index 178abfcb..f8674128 100644 --- a/nx/source/services/apm.c +++ b/nx/source/services/apm.c @@ -53,8 +53,8 @@ static Result _apmGetSession(Handle sessionhandle, Handle* handle_out, u64 cmd_i Result rc = ipcDispatch(sessionhandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -92,8 +92,8 @@ Result apmSetPerformanceConfiguration(u32 PerformanceMode, u32 PerformanceConfig Result rc = ipcDispatch(g_apmISession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -125,8 +125,8 @@ Result apmGetPerformanceConfiguration(u32 PerformanceMode, u32 *PerformanceConfi Result rc = ipcDispatch(g_apmISession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; diff --git a/nx/source/services/applet.c b/nx/source/services/applet.c index e78afc98..6b0d35a0 100644 --- a/nx/source/services/applet.c +++ b/nx/source/services/applet.c @@ -367,8 +367,8 @@ static Result _appletGetSession(Handle sessionhandle, Handle* handle_out, u64 cm Result rc = ipcDispatch(sessionhandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -408,8 +408,8 @@ static Result _appletGetSessionProxy(Handle sessionhandle, Handle* handle_out, u Result rc = ipcDispatch(sessionhandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -443,8 +443,8 @@ static Result _appletGetAppletResourceUserId(u64 *out) { Result rc = ipcDispatch(g_appletIWindowController); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -479,8 +479,8 @@ static Result _appletAcquireForegroundRights(void) { Result rc = ipcDispatch(g_appletIWindowController); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -520,8 +520,8 @@ void appletNotifyRunning(u8 *out) { Result rc = ipcDispatch(g_appletIFunctions); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -556,8 +556,8 @@ static Result _appletReceiveMessage(u32 *out) { Result rc = ipcDispatch(g_appletICommonStateGetter); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -592,8 +592,8 @@ static Result _appletGetOperationMode(u8 *out) { Result rc = ipcDispatch(g_appletICommonStateGetter); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -627,8 +627,8 @@ static Result _appletGetPerformanceMode(u32 *out) { Result rc = ipcDispatch(g_appletICommonStateGetter); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -663,8 +663,8 @@ static Result _appletGetCurrentFocusState(u8 *out) { Result rc = ipcDispatch(g_appletICommonStateGetter); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -701,8 +701,8 @@ static Result _appletSetOperationModeChangedNotification(u8 flag) { Result rc = ipcDispatch(g_appletISelfController); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -734,8 +734,8 @@ static Result _appletSetPerformanceModeChangedNotification(u8 flag) { Result rc = ipcDispatch(g_appletISelfController); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -771,8 +771,8 @@ static Result _appletSetFocusHandlingMode(u8 inval0, u8 inval1, u8 inval2) { Result rc = ipcDispatch(g_appletISelfController); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -804,8 +804,8 @@ static Result _appletSetOutOfFocusSuspendingEnabled(u8 inval) { Result rc = ipcDispatch(g_appletISelfController); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -835,8 +835,8 @@ Result appletCreateManagedDisplayLayer(u64 *out) { Result rc = ipcDispatch(g_appletISelfController); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; diff --git a/nx/source/services/bsd.c b/nx/source/services/bsd.c index 28a9966a..eaa0ced8 100644 --- a/nx/source/services/bsd.c +++ b/nx/source/services/bsd.c @@ -36,8 +36,8 @@ static Result _bsdRegisterClient(Handle h, TransferMemory* tmem, u64* pid_out) { Result rc = ipcDispatch(h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -72,8 +72,8 @@ static Result _bsdStartMonitor(Handle h, u64 pid) { Result rc = ipcDispatch(h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -139,8 +139,8 @@ int bsdSocket(int domain, int type, int protocol) { int fd = -1; if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -187,8 +187,8 @@ int bsdRecv(int sockfd, void* buffer, size_t length, int flags) { int ret = -1; if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -236,8 +236,8 @@ int bsdSend(int sockfd, void* buffer, size_t length, int flags) { int ret = -1; if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -288,8 +288,8 @@ int bsdSendTo(int sockfd, void* buffer, size_t length, int flags, const struct b int ret = -1; if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -336,8 +336,8 @@ int bsdConnect(int sockfd, void* addr, u32 addrlen) { int fd = -1; if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -382,8 +382,8 @@ int bsdBind(int sockfd, void* addr, u32 addrlen) { int ret = -1; if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -430,8 +430,8 @@ int bsdListen(int sockfd, int backlog) { int ret = -1; if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -482,8 +482,8 @@ int bsdSetSockOpt(int sockfd, int level, int option_name, const void *option_val int ret = -1; if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -529,8 +529,8 @@ int bsdWrite(int sockfd, void* buffer, size_t length) { int ret = -1; if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; diff --git a/nx/source/services/fs.c b/nx/source/services/fs.c index c8a9f6e6..6b0a8db9 100644 --- a/nx/source/services/fs.c +++ b/nx/source/services/fs.c @@ -29,8 +29,8 @@ Result fsInitialize(void) { rc = ipcDispatch(g_fsHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -71,8 +71,8 @@ Result fsMountSdcard(FsFileSystem* out) { Result rc = ipcDispatch(g_fsHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -110,8 +110,8 @@ Result fsMountSaveData(FsFileSystem* out, u8 inval, FsSave *save) { Result rc = ipcDispatch(g_fsHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -165,8 +165,8 @@ Result fsFsCreateFile(FsFileSystem* fs, const char* path, size_t size, int flags Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -197,8 +197,8 @@ Result fsFsDeleteFile(FsFileSystem* fs, const char* path) { Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -229,8 +229,8 @@ Result fsFsCreateDirectory(FsFileSystem* fs, const char* path) { Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -261,8 +261,8 @@ Result fsFsDeleteDirectory(FsFileSystem* fs, const char* path) { Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -293,8 +293,8 @@ Result fsFsDeleteDirectoryRecursively(FsFileSystem* fs, const char* path) { Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -326,8 +326,8 @@ Result fsFsRenameFile(FsFileSystem* fs, const char* path0, const char* path1) { Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -359,8 +359,8 @@ Result fsFsRenameDirectory(FsFileSystem* fs, const char* path0, const char* path Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -391,8 +391,8 @@ Result fsFsGetEntryType(FsFileSystem* fs, const char* path, FsEntryType* out) { Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -430,8 +430,8 @@ Result fsFsOpenFile(FsFileSystem* fs, const char* path, int flags, FsFile* out) Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -468,8 +468,8 @@ Result fsFsOpenDirectory(FsFileSystem* fs, const char* path, int flags, FsDir* o Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -503,8 +503,8 @@ Result fsFsCommit(FsFileSystem* fs) { Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -535,8 +535,8 @@ Result fsFsGetFreeSpace(FsFileSystem* fs, const char* path, u64* out) { Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -572,8 +572,8 @@ Result fsFsGetTotalSpace(FsFileSystem* fs, const char* path, u64* out) { Result rc = ipcDispatch(fs->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -620,8 +620,8 @@ Result fsFileRead(FsFile* f, u64 off, void* buf, size_t len, size_t* out) { Result rc = ipcDispatch(f->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -663,8 +663,8 @@ Result fsFileWrite(FsFile* f, u64 off, const void* buf, size_t len) { Result rc = ipcDispatch(f->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -694,8 +694,8 @@ Result fsFileFlush(FsFile* f) { Result rc = ipcDispatch(f->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -727,8 +727,8 @@ Result fsFileSetSize(FsFile* f, u64 sz) { Result rc = ipcDispatch(f->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -758,8 +758,8 @@ Result fsFileGetSize(FsFile* f, u64* out) { Result rc = ipcDispatch(f->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -803,8 +803,8 @@ Result fsDirRead(FsDir* d, u64 inval, size_t* total_entries, size_t max_entries, Result rc = ipcDispatch(d->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -839,8 +839,8 @@ Result fsDirGetEntryCount(FsDir* d, u64* count) { Result rc = ipcDispatch(d->h); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; diff --git a/nx/source/services/hid.c b/nx/source/services/hid.c index 2455bd62..94bc1d9e 100644 --- a/nx/source/services/hid.c +++ b/nx/source/services/hid.c @@ -281,8 +281,8 @@ static Result _hidCreateAppletResource(Handle sessionhandle, Handle* handle_out, Result rc = ipcDispatch(sessionhandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -316,8 +316,8 @@ static Result _hidGetSharedMemoryHandle(Handle sessionhandle, Handle* handle_out Result rc = ipcDispatch(sessionhandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; diff --git a/nx/source/services/nv.c b/nx/source/services/nv.c index 6f1e7e60..3675cb07 100644 --- a/nx/source/services/nv.c +++ b/nx/source/services/nv.c @@ -103,8 +103,8 @@ static Result _nvInitialize(Handle proc, Handle sharedmem, u32 transfermem_size) Result rc = ipcDispatch(g_nvServiceSession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -137,8 +137,8 @@ static Result _nvSetClientPID(u64 AppletResourceUserId) { Result rc = ipcDispatch(g_nvServiceSession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -169,8 +169,8 @@ Result nvOpen(u32 *fd, const char *devicepath) { Result rc = ipcDispatch(g_nvServiceSession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -247,8 +247,8 @@ Result nvIoctl(u32 fd, u32 request, void* argp) { Result rc = ipcDispatch(g_nvServiceSession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -281,8 +281,8 @@ Result nvClose(u32 fd) { Result rc = ipcDispatch(g_nvServiceSession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -317,8 +317,8 @@ Result nvQueryEvent(u32 fd, u32 event_id, Handle *handle_out) { Result rc = ipcDispatch(g_nvServiceSession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; diff --git a/nx/source/services/pm.c b/nx/source/services/pm.c index bd27afce..d0e1c018 100644 --- a/nx/source/services/pm.c +++ b/nx/source/services/pm.c @@ -32,8 +32,8 @@ Result pmdmntStartProcess(u64 pid) { Result rc = ipcDispatch(g_pmdmntHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -65,8 +65,8 @@ Result pmdmntGetTitlePid(u64* pid_out, u64 title_id) { Result rc = ipcDispatch(g_pmdmntHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -103,8 +103,8 @@ Result pmdmntEnableDebugForTitleId(Handle* handle_out, u64 title_id) { Result rc = ipcDispatch(g_pmdmntHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -138,8 +138,8 @@ Result pmdmntGetApplicationPid(u64* pid_out) { Result rc = ipcDispatch(g_pmdmntHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -174,8 +174,8 @@ Result pmdmntEnableDebugForApplication(Handle* handle_out) { Result rc = ipcDispatch(g_pmdmntHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; diff --git a/nx/source/services/sm.c b/nx/source/services/sm.c index 5d99d49a..9c7d0e16 100644 --- a/nx/source/services/sm.c +++ b/nx/source/services/sm.c @@ -35,8 +35,8 @@ Result smInitialize(void) { rc = ipcDispatch(g_smHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -91,8 +91,8 @@ Result smGetService(Handle* handle_out, const char* name) { Result rc = ipcDispatch(g_smHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -132,8 +132,8 @@ Result smRegisterService(Handle* handle_out, const char* name, bool is_light, in Result rc = ipcDispatch(g_smHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -170,8 +170,8 @@ Result smUnregisterService(const char* name) { Result rc = ipcDispatch(g_smHandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; diff --git a/nx/source/services/usb.c b/nx/source/services/usb.c index be4c4a8d..232e71b4 100644 --- a/nx/source/services/usb.c +++ b/nx/source/services/usb.c @@ -188,8 +188,8 @@ static Result _usbDsBindDevice(usbComplexId complexId) { Result rc = ipcDispatch(g_usbDsServiceSession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -223,8 +223,8 @@ static Result _usbDsBindClientProcess(Handle prochandle) { Result rc = ipcDispatch(g_usbDsServiceSession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -256,8 +256,8 @@ static Result _usbDsGetEvent(Handle sessionhandle, Handle* handle_out, u64 cmd_i Result rc = ipcDispatch(sessionhandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -293,8 +293,8 @@ Result usbDsGetState(u32 *out) { Result rc = ipcDispatch(g_usbDsServiceSession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -388,8 +388,8 @@ static Result _usbDsSetVidPidBcd(const usbDsDeviceInfo* deviceinfo) { Result rc = ipcDispatch(g_usbDsServiceSession); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -424,8 +424,8 @@ static Result _usbDsGetSession(Handle sessionhandle, Handle* handle_out, u64 cmd Result rc = ipcDispatch(sessionhandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -461,8 +461,8 @@ static Result _usbDsCmdNoParams(Handle sessionhandle, u64 cmd_id) { Result rc = ipcDispatch(sessionhandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -502,8 +502,8 @@ static Result _usbDsPostBuffer(Handle sessionhandle, u64 cmd_id, void* buffer, s Result rc = ipcDispatch(sessionhandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -537,8 +537,8 @@ static Result _usbDsGetReport(Handle sessionhandle, u64 cmd_id, usbDsReportData Result rc = ipcDispatch(sessionhandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; diff --git a/nx/source/services/vi.c b/nx/source/services/vi.c index 0ea20dff..64d953cc 100644 --- a/nx/source/services/vi.c +++ b/nx/source/services/vi.c @@ -141,8 +141,8 @@ static Result _viGetSession(Handle sessionhandle, Handle* handle_out, void* inra Result rc = ipcDispatch(sessionhandle); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -193,8 +193,8 @@ Result viOpenDisplay(const char *display_name, ViDisplay *display) { Result rc = ipcDispatch(g_viIApplicationDisplayService); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -233,8 +233,8 @@ Result viCloseDisplay(ViDisplay *display) { Result rc = ipcDispatch(g_viIApplicationDisplayService); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -276,8 +276,8 @@ static Result _viOpenLayer(u8 NativeWindow[0x100], u64 *NativeWindow_Size, const Result rc = ipcDispatch(g_viIApplicationDisplayService); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -319,8 +319,8 @@ static Result _viCreatestray_layer(u8 NativeWindow[0x100], u64 *NativeWindow_Siz Result rc = ipcDispatch(g_viIApplicationDisplayService); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -387,8 +387,8 @@ Result viCloseLayer(ViLayer *layer) { Result rc = ipcDispatch(g_viIApplicationDisplayService); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -427,8 +427,8 @@ Result viSetLayerScalingMode(ViLayer *layer, u32 ScalingMode) { Result rc = ipcDispatch(g_viIApplicationDisplayService); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -460,8 +460,8 @@ Result viGetDisplayResolution(ViDisplay *display, u64 *width, u64 *height) { Result rc = ipcDispatch(g_viIApplicationDisplayService); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic; @@ -500,8 +500,8 @@ Result viGetDisplayVsyncEvent(ViDisplay *display, Handle *handle_out) { Result rc = ipcDispatch(g_viIApplicationDisplayService); if (R_SUCCEEDED(rc)) { - IpcCommandResponse r; - ipcParseResponse(&r); + IpcParsedCommand r; + ipcParse(&r); struct { u64 magic;