From dc7171d04289683945d7f1c81feceb604ed8c581 Mon Sep 17 00:00:00 2001
From: Joel16 <sauskethunderkid@gmail.com>
Date: Tue, 5 Jun 2018 15:19:46 -0500
Subject: [PATCH] Use FsStorageId as an input

---
 nx/include/switch/services/ns.h | 10 ++++++----
 nx/source/services/ns.c         |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/nx/include/switch/services/ns.h b/nx/include/switch/services/ns.h
index 981ae9a8..803b9fe9 100644
--- a/nx/include/switch/services/ns.h
+++ b/nx/include/switch/services/ns.h
@@ -19,16 +19,18 @@ void nsExit(void);
 Result nsGetApplicationControlData(u8 flag, u64 titleID, NsApplicationControlData* buffer, size_t size, size_t* actual_size);
 
 /**
- * @brief Returns the total storage from content manager services.
+ * @brief Returns the total storage size from content manager services.
+ * @param media_id Specified FsStorageId. (Must be FsStorageId_SdCard or 5)
  * @param size Pointer to output the total storage size to.
  */
-Result nsGetTotalSpaceSize(u64 *size);
+Result nsGetTotalSpaceSize(FsStorageId media_id, u64 *size);
 
 /**
- * @brief Returns the available storage from content manager services.
+ * @brief Returns the available storage size from content manager services.
+ * @param media_id Specified FsStorageId. (Must be FsStorageId_SdCard or 5)
  * @param size Pointer to output the free storage size to.
  */
-Result nsGetFreeSpaceSize(u64 *size);
+Result nsGetFreeSpaceSize(FsStorageId media_id, u64 *size);
 
 Result nsvmInitialize(void);
 void nsvmExit(void);
diff --git a/nx/source/services/ns.c b/nx/source/services/ns.c
index 15864d36..bce070c9 100644
--- a/nx/source/services/ns.c
+++ b/nx/source/services/ns.c
@@ -3,6 +3,7 @@
 #include "arm/atomics.h"
 #include "kernel/ipc.h"
 #include "kernel/detect.h"
+#include "services/fs.h"
 #include "services/sm.h"
 #include "services/ns.h"
 
@@ -117,7 +118,7 @@ Result nsGetApplicationControlData(u8 flag, u64 titleID, NsApplicationControlDat
     return rc;
 }
 
-Result nsGetTotalSpaceSize(u64 *size)
+Result nsGetTotalSpaceSize(FsStorageId media_id, u64 *size)
 {
     IpcCommand c;
     ipcInitialize(&c);
@@ -132,7 +133,7 @@ Result nsGetTotalSpaceSize(u64 *size)
 
     raw->magic = SFCI_MAGIC;
     raw->cmd_id = 47;
-    raw->media_id = 5;
+    raw->media_id = media_id;
 
     Result rc = serviceIpcDispatch(&g_nsAppManSrv);
 
@@ -154,7 +155,7 @@ Result nsGetTotalSpaceSize(u64 *size)
     return rc;
 }
 
-Result nsGetFreeSpaceSize(u64 *size)
+Result nsGetFreeSpaceSize(FsStorageId media_id, u64 *size)
 {
     IpcCommand c;
     ipcInitialize(&c);
@@ -169,7 +170,7 @@ Result nsGetFreeSpaceSize(u64 *size)
 
     raw->magic = SFCI_MAGIC;
     raw->cmd_id = 48;
-    raw->media_id = 5;
+    raw->media_id = media_id;
 
     Result rc = serviceIpcDispatch(&g_nsAppManSrv);