Fix mm:u on 1.0.0

This commit is contained in:
averne 2021-04-18 17:17:08 +02:00
parent 2e2cf43cf5
commit 71c3604f08
2 changed files with 16 additions and 5 deletions

View File

@ -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);

View File

@ -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;