From 74128a1e8e2250fcd5f85aec7fb3297e7fed46f0 Mon Sep 17 00:00:00 2001 From: Joel16 Date: Sun, 7 Jan 2018 00:06:52 -0600 Subject: [PATCH] Consistency --- libctru/include/3ds/services/ndm.h | 4 ++-- libctru/source/services/ndm.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libctru/include/3ds/services/ndm.h b/libctru/include/3ds/services/ndm.h index 5490659..731ffd4 100644 --- a/libctru/include/3ds/services/ndm.h +++ b/libctru/include/3ds/services/ndm.h @@ -18,7 +18,7 @@ Result ndmuInit(void); /// Exits ndmu. void ndmuExit(void); -Result ndmuEnterExclusiveState(NDM_ExclusiveState state); +Result NDMU_EnterExclusiveState(NDM_ExclusiveState state); -Result ndmuLeaveExclusiveState(void); +Result NDMU_LeaveExclusiveState(void); diff --git a/libctru/source/services/ndm.c b/libctru/source/services/ndm.c index dcc84b5..a8b8ef1 100644 --- a/libctru/source/services/ndm.c +++ b/libctru/source/services/ndm.c @@ -10,30 +10,30 @@ #include <3ds/services/ndm.h> #include <3ds/ipc.h> -Handle __ndmu_servhandle; -static int __ndmu_refcount; +Handle ndmuHandle; +static int ndmuRefCount; Result ndmuInit(void) { Result ret=0; - if (AtomicPostIncrement(&__ndmu_refcount)) return 0; + if (AtomicPostIncrement(&ndmuRefCount)) return 0; - ret = srvGetServiceHandle(&__ndmu_servhandle, "ndm:u"); - if (R_FAILED(ret)) AtomicDecrement(&__ndmu_refcount); + ret = srvGetServiceHandle(&ndmuHandle, "ndm:u"); + if (R_FAILED(ret)) AtomicDecrement(&ndmuRefCount); return ret; } void ndmuExit(void) { - if (AtomicDecrement(&__ndmu_refcount)) return; + if (AtomicDecrement(&ndmuRefCount)) return; - svcCloseHandle(__ndmu_servhandle); - __ndmu_servhandle = 0; + svcCloseHandle(ndmuHandle); + ndmuHandle = 0; } -Result ndmuEnterExclusiveState(NDM_ExclusiveState state) +Result NDMU_EnterExclusiveState(NDM_ExclusiveState state) { u32* cmdbuf=getThreadCommandBuffer(); @@ -42,12 +42,12 @@ Result ndmuEnterExclusiveState(NDM_ExclusiveState state) cmdbuf[2]=IPC_Desc_CurProcessHandle(); Result ret=0; - if(R_FAILED(ret=svcSendSyncRequest(__ndmu_servhandle)))return ret; + if(R_FAILED(ret=svcSendSyncRequest(ndmuHandle)))return ret; return cmdbuf[1]; } -Result ndmuLeaveExclusiveState(void) +Result NDMU_LeaveExclusiveState(void) { u32* cmdbuf=getThreadCommandBuffer(); @@ -55,7 +55,7 @@ Result ndmuLeaveExclusiveState(void) cmdbuf[1]=IPC_Desc_CurProcessHandle(); Result ret=0; - if(R_FAILED(ret=svcSendSyncRequest(__ndmu_servhandle)))return ret; + if(R_FAILED(ret=svcSendSyncRequest(ndmuHandle)))return ret; return cmdbuf[1]; }