From 517f064028664958277e1581fb0500fca26c5793 Mon Sep 17 00:00:00 2001
From: Adubbz <Adubbz@users.noreply.github.com>
Date: Mon, 4 Jun 2018 12:05:03 +1000
Subject: [PATCH] Misc fixes

---
 nx/include/switch/services/ns.h  | 2 +-
 nx/include/switch/services/pm.h  | 2 +-
 nx/include/switch/services/set.h | 2 +-
 nx/source/services/ns.c          | 4 ++--
 nx/source/services/pm.c          | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nx/include/switch/services/ns.h b/nx/include/switch/services/ns.h
index da326488..ea040a7f 100644
--- a/nx/include/switch/services/ns.h
+++ b/nx/include/switch/services/ns.h
@@ -21,5 +21,5 @@ Result nsGetApplicationControlData(u8 flag, u64 titleID, NsApplicationControlDat
 Result nsvmInitialize(void);
 void nsvmExit(void);
 
-Result nsvmNeedsUpdateVulnerability(u8 *out);
+Result nsvmNeedsUpdateVulnerability(bool *out);
 Result nsvmGetSafeSystemVersion(u16 *out);
diff --git a/nx/include/switch/services/pm.h b/nx/include/switch/services/pm.h
index 6365b9d1..a55c7e73 100644
--- a/nx/include/switch/services/pm.h
+++ b/nx/include/switch/services/pm.h
@@ -27,4 +27,4 @@ Result pmdmntEnableDebugForApplication(Handle* handle_out);
 Result pminfoGetTitleId(u64* title_id_out, u64 pid);
 
 Result pmshellLaunchProcess(u32 launch_flags, u64 titleID, u64 storageID, u64 *pid);
-Result pmshellTerminateProcessByTitleId(u64 title_id);
\ No newline at end of file
+Result pmshellTerminateProcessByTitleId(u64 titleID);
\ No newline at end of file
diff --git a/nx/include/switch/services/set.h b/nx/include/switch/services/set.h
index b552af7f..20e87909 100644
--- a/nx/include/switch/services/set.h
+++ b/nx/include/switch/services/set.h
@@ -121,4 +121,4 @@ Result setsysGetWirelessLanEnableFlag(bool *out);
  * @brief Gets the bluetooth status.
  * @param out Pointer to output the status to. 
  */
-Result setsysGetBluetoothEnableFlag(bool *out);
\ No newline at end of file
+Result setsysGetBluetoothEnableFlag(bool *out);
diff --git a/nx/source/services/ns.c b/nx/source/services/ns.c
index 9fade9fb..1c64f6e6 100644
--- a/nx/source/services/ns.c
+++ b/nx/source/services/ns.c
@@ -125,7 +125,7 @@ Result nsvmInitialize(void)
     atomicIncrement64(&g_nsvmRefCnt);
 
     if (serviceIsActive(&g_nsvmSrv))
-        return MAKERESULT(Module_Libnx, LibnxError_AlreadyInitialized);
+        return 0;
 
     return smGetService(&g_nsvmSrv, "ns:vm");
 }
@@ -140,7 +140,7 @@ void nsvmExit(void)
     }
 }
 
-Result nsvmNeedsUpdateVulnerability(u8 *out) {
+Result nsvmNeedsUpdateVulnerability(bool *out) {
     IpcCommand c;
     ipcInitialize(&c);
 
diff --git a/nx/source/services/pm.c b/nx/source/services/pm.c
index 99e10090..d75d8c6e 100644
--- a/nx/source/services/pm.c
+++ b/nx/source/services/pm.c
@@ -315,21 +315,21 @@ Result pmshellLaunchProcess(u32 launch_flags, u64 titleID, u64 storageID, u64 *p
     return rc;
 }
 
-Result pmshellTerminateProcessByTitleId(u64 title_id) {
+Result pmshellTerminateProcessByTitleId(u64 titleID) {
     IpcCommand c;
     ipcInitialize(&c);
 
     struct {
         u64 magic;
         u64 cmd_id;
-        u64 title_id;
+        u64 titleID;
     } *raw;
 
     raw = ipcPrepareHeader(&c, sizeof(*raw));
 
     raw->magic = SFCI_MAGIC;
     raw->cmd_id = 2;
-    raw->title_id = title_id;
+    raw->titleID = titleID;
 
     Result rc = serviceIpcDispatch(&g_pmshellSrv);