From 71c3604f0842c5b9d2bdf7b57c1738edea596f8b Mon Sep 17 00:00:00 2001
From: averne <averne381@gmail.com>
Date: Sun, 18 Apr 2021 17:17:08 +0200
Subject: [PATCH] Fix mm:u on 1.0.0

---
 nx/include/switch/services/mm.h |  1 +
 nx/source/services/mm.c         | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/nx/include/switch/services/mm.h b/nx/include/switch/services/mm.h
index c0e3296d..aa8eea83 100644
--- a/nx/include/switch/services/mm.h
+++ b/nx/include/switch/services/mm.h
@@ -23,6 +23,7 @@ typedef struct {
 
 Result mmuInitialize(void);
 void mmuExit(void);
+Service* mmuGetServiceSession(void);
 
 Result mmuRequestInitialize(MmuRequest *request, MmuModuleId module, u32 unk, bool autoclear); ///< unk is ignored by official software
 Result mmuRequestFinalize(const MmuRequest *request);
diff --git a/nx/source/services/mm.c b/nx/source/services/mm.c
index 286c6204..ecb171d9 100644
--- a/nx/source/services/mm.c
+++ b/nx/source/services/mm.c
@@ -1,6 +1,7 @@
 #define NX_SERVICE_ASSUME_NON_DOMAIN
 #include "service_guard.h"
 #include "services/mm.h"
+#include "runtime/hosversion.h"
 
 static Service g_mmuSrv;
 
@@ -14,6 +15,10 @@ void _mmuCleanup(void) {
     serviceClose(&g_mmuSrv);
 }
 
+Service* mmuGetServiceSession(void) {
+    return &g_mmuSrv;
+}
+
 Result mmuRequestInitialize(MmuRequest *request, MmuModuleId module, u32 unk, bool autoclear) {
     struct {
         u32 module_id;
@@ -22,7 +27,7 @@ Result mmuRequestInitialize(MmuRequest *request, MmuModuleId module, u32 unk, bo
     } data = { module, unk, autoclear };
     u32 out = -1;
 
-    Result rc = serviceDispatchInOut(&g_mmuSrv, 4, data, out);
+    Result rc = serviceDispatchInOut(&g_mmuSrv, hosversionBefore(2,0,0) ? 0 : 4, data, out);
 
     if (R_SUCCEEDED(rc)) {
         request->module = module;
@@ -33,21 +38,26 @@ Result mmuRequestInitialize(MmuRequest *request, MmuModuleId module, u32 unk, bo
 }
 
 Result mmuRequestFinalize(const MmuRequest *request) {
-    return serviceDispatchIn(&g_mmuSrv, 5, request->id);
+    bool need_old = hosversionBefore(2,0,0);
+    return serviceDispatchIn(&g_mmuSrv, need_old ? 1 : 5, *(need_old ? &request->module : &request->id));
 }
 
 Result mmuRequestSetAndWait(const MmuRequest *request, u32 freq_hz, s32 timeout) {
+    bool need_old = hosversionBefore(2,0,0);
+
     struct {
         u32 id;
         u32 freq;
         s32 timeout;
-    } data = { request->id, freq_hz, timeout };
-    return serviceDispatchIn(&g_mmuSrv, 6, data);
+    } data = { need_old ? request->module : request->id, freq_hz, timeout };
+    return serviceDispatchIn(&g_mmuSrv, need_old ? 2 : 6, data);
 }
 
 Result mmuRequestGet(const MmuRequest *request, u32 *out_freq_hz) {
+    bool need_old = hosversionBefore(2,0,0);
+
     u32 freq = 0;
-    Result rc = serviceDispatchInOut(&g_mmuSrv, 7, request->id, freq);
+    Result rc = serviceDispatchInOut(&g_mmuSrv, need_old ? 3 : 7, *(need_old ? &request->module : &request->id), freq);
 
     if (R_SUCCEEDED(rc) && out_freq_hz)
         *out_freq_hz = freq;