mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 13:02:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

sm/smm: Add GetServiceSession

Browse Source
This commit is contained in:
Michael Scire 2019-06-24 11:53:35 -07:00 committed by fincs
parent e1a6a463c2
commit 6978003c42
4 changed files with 67 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nx/include/switch/services/sm.h
View File

@ -280,6 +280,12 @@ Result smUnregisterService(const char* name);
*/ */
bool smHasInitialized(void); bool smHasInitialized(void);
/**
* @brief Gets the Service session used to communicate with SM.
* @return Pointer to service session used to communicate with SM.
*/
Service *smGetServiceSession(void);
/** /**
* @brief Encodes a service name as a 64-bit integer. * @brief Encodes a service name as a 64-bit integer.
* @param[in] name Name of the service. * @param[in] name Name of the service.

2
nx/include/switch/services/smm.h
View File

@ -12,5 +12,7 @@
Result smManagerInitialize(void); Result smManagerInitialize(void);
void smManagerExit(void); void smManagerExit(void);
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);
Result smManagerUnregisterProcess(u64 pid); Result smManagerUnregisterProcess(u64 pid);

58
nx/source/services/sm.c
View File

@ -6,7 +6,7 @@
#include "services/fatal.h" #include "services/fatal.h"
#include "services/sm.h" #include "services/sm.h"
static Handle g_smHandle = INVALID_HANDLE; static Service g_smSrv;
static u64 g_refCnt; static u64 g_refCnt;
#define MAX_OVERRIDES 32 #define MAX_OVERRIDES 32
@ -45,7 +45,7 @@ Handle smGetServiceOverride(u64 name)
} }
bool smHasInitialized(void) { bool smHasInitialized(void) {
return g_smHandle != INVALID_HANDLE; return serviceIsActive(&g_smSrv);
} }
Result smInitialize(void) Result smInitialize(void)
@ -55,10 +55,15 @@ Result smInitialize(void)
if (smHasInitialized()) if (smHasInitialized())
return 0; return 0;
Result rc = svcConnectToNamedPort(&g_smHandle, "sm:"); Handle sm_handle;
Result rc = svcConnectToNamedPort(&sm_handle, "sm:");
while (R_VALUE(rc) == KERNELRESULT(NotFound)) { while (R_VALUE(rc) == KERNELRESULT(NotFound)) {
svcSleepThread(50000000ul); svcSleepThread(50000000ul);
rc = svcConnectToNamedPort(&g_smHandle, "sm:"); rc = svcConnectToNamedPort(&sm_handle, "sm:");
}
if (R_SUCCEEDED(rc)) {
serviceCreate(&g_smSrv, sm_handle);
} }
Handle tmp; Handle tmp;
@ -74,23 +79,24 @@ Result smInitialize(void)
u64 reserved[2]; u64 reserved[2];
} *raw; } *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = serviceIpcPrepareHeader(&g_smSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 0; raw->cmd_id = 0;
raw->zero = 0; raw->zero = 0;
rc = ipcDispatch(g_smHandle); rc = serviceIpcDispatch(&g_smSrv);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
ipcParse(&r);
struct { struct {
u64 magic; u64 magic;
u64 result; u64 result;
} *resp = r.Raw; } *resp;
serviceIpcParse(&g_smSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result; rc = resp->result;
} }
} }
@ -105,12 +111,15 @@ void smExit(void)
{ {
if (atomicDecrement64(&g_refCnt) == 0) if (atomicDecrement64(&g_refCnt) == 0)
{ {
ipcCloseSession(g_smHandle); serviceClose(&g_smSrv);
svcCloseHandle(g_smHandle);
g_smHandle = INVALID_HANDLE;
} }
} }
Service *smGetServiceSession(void)
{
return &g_smSrv;
}
u64 smEncodeName(const char* name) u64 smEncodeName(const char* name)
{ {
u64 name_encoded = 0; u64 name_encoded = 0;
@ -165,23 +174,24 @@ Result smGetServiceOriginal(Handle* handle_out, u64 name)
u64 reserved[2]; u64 reserved[2];
} *raw; } *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = serviceIpcPrepareHeader(&g_smSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 1; raw->cmd_id = 1;
raw->service_name = name; raw->service_name = name;
Result rc = ipcDispatch(g_smHandle); Result rc = serviceIpcDispatch(&g_smSrv);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
ipcParse(&r);
struct { struct {
u64 magic; u64 magic;
u64 result; u64 result;
} *resp = r.Raw; } *resp;
serviceIpcParse(&g_smSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
@ -204,7 +214,7 @@ Result smRegisterService(Handle* handle_out, const char* name, bool is_light, in
u32 max_sessions; u32 max_sessions;
} *raw; } *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = serviceIpcPrepareHeader(&g_smSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 2; raw->cmd_id = 2;
@ -212,17 +222,18 @@ Result smRegisterService(Handle* handle_out, const char* name, bool is_light, in
raw->is_light = !!is_light; raw->is_light = !!is_light;
raw->max_sessions = max_sessions; raw->max_sessions = max_sessions;
Result rc = ipcDispatch(g_smHandle); Result rc = serviceIpcDispatch(&g_smSrv);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
ipcParse(&r);
struct { struct {
u64 magic; u64 magic;
u64 result; u64 result;
} *resp = r.Raw; } *resp;
serviceIpcParse(&g_smSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
@ -244,23 +255,24 @@ Result smUnregisterService(const char* name) {
u64 reserved; u64 reserved;
} *raw; } *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = serviceIpcPrepareHeader(&g_smSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 3; raw->cmd_id = 3;
raw->service_name = smEncodeName(name); raw->service_name = smEncodeName(name);
Result rc = ipcDispatch(g_smHandle); Result rc = serviceIpcDispatch(&g_smSrv);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
ipcParse(&r);
struct { struct {
u64 magic; u64 magic;
u64 result; u64 result;
} *resp = r.Raw; } *resp;
serviceIpcParse(&g_smSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result; rc = resp->result;
} }

18
nx/source/services/smm.c
View File

@ -25,6 +25,10 @@ void smManagerExit(void) {
serviceClose(&g_smManagerSrv); serviceClose(&g_smManagerSrv);
} }
Service* smManagerGetServiceSession(void) {
return &g_smManagerSrv;
}
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; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -37,7 +41,7 @@ Result smManagerRegisterProcess(u64 pid, const void *acid_sac, size_t acid_sac_s
u64 pid; u64 pid;
} *raw; } *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = serviceIpcPrepareHeader(&g_smManagerSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 0; raw->cmd_id = 0;
raw->pid = pid; raw->pid = pid;
@ -46,13 +50,14 @@ Result smManagerRegisterProcess(u64 pid, const void *acid_sac, size_t acid_sac_s
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
ipcParse(&r);
struct { struct {
u64 magic; u64 magic;
u64 result; u64 result;
} *resp = r.Raw; } *resp;
serviceIpcParse(&g_smManagerSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result; rc = resp->result;
} }
@ -69,7 +74,7 @@ Result smManagerUnregisterProcess(u64 pid) {
u64 pid; u64 pid;
} *raw; } *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = serviceIpcPrepareHeader(&g_smManagerSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 1; raw->cmd_id = 1;
raw->pid = pid; raw->pid = pid;
@ -78,13 +83,14 @@ Result smManagerUnregisterProcess(u64 pid) {
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
ipcParse(&r);
struct { struct {
u64 magic; u64 magic;
u64 result; u64 result;
} *resp = r.Raw; } *resp;
serviceIpcParse(&g_smManagerSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result; rc = resp->result;
} }