From fa0234efffbd82e5d78b947986f3f7dc1e1b6345 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Tue, 14 Apr 2020 02:07:59 -0700
Subject: [PATCH] fsldr: update for 10.0.0

---
 nx/include/switch/services/fsldr.h | 10 ++++++-
 nx/source/services/fsldr.c         | 43 +++++++++++++++++++++---------
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/nx/include/switch/services/fsldr.h b/nx/include/switch/services/fsldr.h
index c022a093..e7f761df 100644
--- a/nx/include/switch/services/fsldr.h
+++ b/nx/include/switch/services/fsldr.h
@@ -8,6 +8,14 @@
 #include "../types.h"
 #include "../sf/service.h"
 #include "../services/fs.h"
+#include "../crypto/sha256.h"
+
+typedef struct {
+    u8 signature[0x100];
+    u8 hash[SHA256_HASH_SIZE];
+    bool is_signed;
+    u8 reserved[3];
+} FsCodeInfo;
 
 /// Initialize fsp-ldr.
 Result fsldrInitialize(void);
@@ -18,5 +26,5 @@ void fsldrExit(void);
 /// Gets the Service object for the actual fsp-ldr service session.
 Service* fsldrGetServiceSession(void);
 
-Result fsldrOpenCodeFileSystem(u64 tid, const char *path, FsFileSystem* out);
+Result fsldrOpenCodeFileSystem(FsCodeInfo* out_code_info, u64 tid, const char *path, FsFileSystem* out);
 Result fsldrIsArchivedProgram(u64 pid, bool *out);
diff --git a/nx/source/services/fsldr.c b/nx/source/services/fsldr.c
index 08adedb5..03f43edb 100644
--- a/nx/source/services/fsldr.c
+++ b/nx/source/services/fsldr.c
@@ -32,21 +32,40 @@ Service* fsldrGetServiceSession(void) {
     return &g_fsldrSrv;
 }
 
-Result fsldrOpenCodeFileSystem(u64 tid, const char *path, FsFileSystem* out) {
+Result fsldrOpenCodeFileSystem(FsCodeInfo* out_code_info, u64 tid, const char *path, FsFileSystem* out) {
+    memset(out_code_info, 0, sizeof(*out_code_info));
+
     char send_path[FS_MAX_PATH]={0};
     strncpy(send_path, path, FS_MAX_PATH-1);
 
-    serviceAssumeDomain(&g_fsldrSrv);
-    return serviceDispatchIn(&g_fsldrSrv, 0, tid,
-        .buffer_attrs = {
-            SfBufferAttr_HipcPointer | SfBufferAttr_In,
-        },
-        .buffers = {
-            { send_path,  FS_MAX_PATH },
-        },
-        .out_num_objects = 1,
-        .out_objects = &out->s,
-    );
+    if (hosversionAtLeast(10,0,0)) {
+        serviceAssumeDomain(&g_fsldrSrv);
+        return serviceDispatchIn(&g_fsldrSrv, 0, tid,
+            .buffer_attrs = {
+                SfBufferAttr_FixedSize | SfBufferAttr_HipcPointer | SfBufferAttr_Out,
+                SfBufferAttr_FixedSize | SfBufferAttr_HipcPointer | SfBufferAttr_In,
+            },
+            .buffers = {
+                { out_code_info,  sizeof(*out_code_info) },
+                { send_path,  FS_MAX_PATH },
+            },
+            .out_num_objects = 1,
+            .out_objects = &out->s,
+        );
+    } else {
+        serviceAssumeDomain(&g_fsldrSrv);
+        return serviceDispatchIn(&g_fsldrSrv, 0, tid,
+            .buffer_attrs = {
+                SfBufferAttr_FixedSize | SfBufferAttr_HipcPointer | SfBufferAttr_In,
+            },
+            .buffers = {
+                { send_path,  FS_MAX_PATH },
+            },
+            .out_num_objects = 1,
+            .out_objects = &out->s,
+        );
+    }
+
 }
 
 Result fsldrIsArchivedProgram(u64 pid, bool *out) {