smm: update for new-ipc

This commit is contained in:
Michael Scire 2019-10-18 23:57:06 -07:00 committed by fincs
parent 71b44cfb02
commit a3e7b1affb
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 19 additions and 80 deletions

View File

@ -6,7 +6,7 @@
*/ */
#pragma once #pragma once
#include "../types.h" #include "../types.h"
#include "../services/sm.h" #include "../sf/service.h"
#include "../services/fs.h" #include "../services/fs.h"
Result smManagerInitialize(void); Result smManagerInitialize(void);

View File

@ -1,28 +1,18 @@
// Copyright 2018 SciresM #define NX_SERVICE_ASSUME_NON_DOMAIN
#include <string.h> #include "service_guard.h"
#include "types.h"
#include "result.h"
#include "arm/atomics.h"
#include "kernel/ipc.h"
#include "services/fs.h"
#include "services/sm.h"
#include "services/smm.h" #include "services/smm.h"
#include "runtime/hosversion.h"
static Service g_smManagerSrv; static Service g_smManagerSrv;
static u64 g_smManagerRefcnt;
Result smManagerInitialize(void) { NX_GENERATE_SERVICE_GUARD(smManager);
atomicIncrement64(&g_smManagerRefcnt);
if (serviceIsActive(&g_smManagerSrv))
return 0;
Result _smManagerInitialize(void) {
return smGetService(&g_smManagerSrv, "sm:m"); return smGetService(&g_smManagerSrv, "sm:m");
} }
void smManagerExit(void) { void _smManagerCleanup(void) {
if (atomicDecrement64(&g_smManagerRefcnt) == 0) serviceClose(&g_smManagerSrv);
serviceClose(&g_smManagerSrv);
} }
Service* smManagerGetServiceSession(void) { Service* smManagerGetServiceSession(void) {
@ -30,69 +20,18 @@ Service* smManagerGetServiceSession(void) {
} }
Result smManagerRegisterProcess(u64 pid, const void *acid_sac, size_t acid_sac_size, const void *aci0_sac, size_t aci0_sac_size) { Result smManagerRegisterProcess(u64 pid, const void *acid_sac, size_t acid_sac_size, const void *aci0_sac, size_t aci0_sac_size) {
IpcCommand c; return serviceDispatchIn(&g_smManagerSrv, 0, pid,
ipcInitialize(&c); .buffer_attrs = {
ipcAddSendBuffer(&c, acid_sac, acid_sac_size, BufferType_Normal); SfBufferAttr_In | SfBufferAttr_HipcMapAlias,
ipcAddSendBuffer(&c, aci0_sac, aci0_sac_size, BufferType_Normal); SfBufferAttr_In | SfBufferAttr_HipcMapAlias,
},
struct { .buffers = {
u64 magic; { acid_sac, acid_sac_size },
u64 cmd_id; { aci0_sac, aci0_sac_size },
u64 pid; },
} *raw; );
raw = serviceIpcPrepareHeader(&g_smManagerSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 0;
raw->pid = pid;
Result rc = serviceIpcDispatch(&g_smManagerSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(&g_smManagerSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
} }
Result smManagerUnregisterProcess(u64 pid) { Result smManagerUnregisterProcess(u64 pid) {
IpcCommand c; return serviceDispatchIn(&g_smManagerSrv, 1, pid);
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
u64 pid;
} *raw;
raw = serviceIpcPrepareHeader(&g_smManagerSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 1;
raw->pid = pid;
Result rc = serviceIpcDispatch(&g_smManagerSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(&g_smManagerSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
} }