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

fspr: update for new-ipc

Browse Source
This commit is contained in:
Michael Scire 2019-10-18 22:59:47 -07:00 committed by fincs
parent 77563f027a
commit 7292ddfcd8
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 35 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nx/include/switch/services/fspr.h
View File

@ -6,14 +6,14 @@
*/ */
#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 fsprInitialize(void); Result fsprInitialize(void);
void fsprExit(void); void fsprExit(void);
Service* fsprGetServiceSession(void); Service* fsprGetServiceSession(void);
Result fsprRegisterProgram(u64 pid, u64 titleID, FsStorageId storageID, const void *fs_access_header, size_t fah_size, const void *fs_access_control, size_t fac_size); Result fsprRegisterProgram(u64 pid, u64 tid, FsStorageId sid, const void *fs_access_header, size_t fah_size, const void *fs_access_control, size_t fac_size);
Result fsprUnregisterProgram(u64 pid); Result fsprUnregisterProgram(u64 pid);
Result fsprSetCurrentProcess(void); Result fsprSetCurrentProcess(void);
Result fsprSetEnabledProgramVerification(bool enabled); Result fsprSetEnabledProgramVerification(bool enabled);

185
nx/source/services/fspr.c
View File

@ -1,52 +1,35 @@
// 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 "runtime/hosversion.h"
#include "services/fs.h"
#include "services/sm.h"
#include "services/fspr.h" #include "services/fspr.h"
#include "runtime/hosversion.h"
static Service g_fsprSrv; static Service g_fsprSrv;
static u64 g_fsprRefCnt;
/* Default access controls -- these will give full filesystem permissions to the requester. */ NX_GENERATE_SERVICE_GUARD(fspr);
static const uint32_t g_fspr_default_fah[] = {0x1, 0xFFFFFFFF, 0xFFFFFFFF, 0x1C, 0, 0x1C, 0};
static const uint32_t g_fspr_default_fac[] = {0x1, 0xFFFFFFFF, 0xFFFFFFFF, 0, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0, 0, 0xFFFFFFFF, 0xFFFFFFFF};
Result fsprInitialize(void) {
atomicIncrement64(&g_fsprRefCnt);
if (serviceIsActive(&g_fsprSrv))
return 0;
Result _fsprInitialize(void) {
Result rc = smGetService(&g_fsprSrv, "fsp-pr"); Result rc = smGetService(&g_fsprSrv, "fsp-pr");
if (R_SUCCEEDED(rc) && hosversionAtLeast(4,0,0)) { if (R_SUCCEEDED(rc) && hosversionAtLeast(4,0,0)) {
rc = fsprSetCurrentProcess(); rc = fsprSetCurrentProcess();
if (R_FAILED(rc)) {
fsprExit();
}
} }
return rc; return rc;
} }
void fsprExit(void) { void _fsprCleanup(void) {
if (atomicDecrement64(&g_fsprRefCnt) == 0) serviceClose(&g_fsprSrv);
serviceClose(&g_fsprSrv);
} }
Service* fsprGetServiceSession(void) { Service* fsprGetServiceSession(void) {
return &g_fsprSrv; return &g_fsprSrv;
} }
Result fsprRegisterProgram(u64 pid, u64 titleID, FsStorageId storageID, const void *fs_access_header, size_t fah_size, const void *fs_access_control, size_t fac_size) { /* Default access controls -- these will give full filesystem permissions to the requester. */
IpcCommand c; static const uint32_t g_fspr_default_fah[] = {0x1, 0xFFFFFFFF, 0xFFFFFFFF, 0x1C, 0, 0x1C, 0};
ipcInitialize(&c); static const uint32_t g_fspr_default_fac[] = {0x1, 0xFFFFFFFF, 0xFFFFFFFF, 0, 0, 0xFFFFFFFF, 0xFFFFFFFF, 0, 0, 0xFFFFFFFF, 0xFFFFFFFF};
Result fsprRegisterProgram(u64 pid, u64 tid, FsStorageId sid, const void *fs_access_header, size_t fah_size, const void *fs_access_control, size_t fac_size) {
if (fs_access_header == NULL) { if (fs_access_header == NULL) {
fs_access_header = g_fspr_default_fah; fs_access_header = g_fspr_default_fah;
fah_size = sizeof(g_fspr_default_fah); fah_size = sizeof(g_fspr_default_fah);
@ -55,141 +38,39 @@ Result fsprRegisterProgram(u64 pid, u64 titleID, FsStorageId storageID, const vo
fs_access_control = g_fspr_default_fac; fs_access_control = g_fspr_default_fac;
fac_size = sizeof(g_fspr_default_fac); fac_size = sizeof(g_fspr_default_fac);
} }
ipcAddSendBuffer(&c, fs_access_header, fah_size, BufferType_Normal); const struct {
ipcAddSendBuffer(&c, fs_access_control, fac_size, BufferType_Normal); u8 sid;
struct {
u64 magic;
u64 cmd_id;
u64 sid;
u64 pid; u64 pid;
u64 tid; u64 tid;
u64 fah_size; u64 fah_size;
u64 fac_size; u64 fac_size;
} *raw; } in = { sid, pid, tid, fah_size, fac_size };
return serviceDispatchIn(&g_fsprSrv, 0, in,
raw = ipcPrepareHeader(&c, sizeof(*raw)); .buffer_attrs = {
raw->magic = SFCI_MAGIC; SfBufferAttr_In | SfBufferAttr_HipcMapAlias,
raw->cmd_id = 0; SfBufferAttr_In | SfBufferAttr_HipcMapAlias,
raw->sid = storageID; },
raw->pid = pid; .buffers = {
raw->tid = titleID; { fs_access_header, fah_size },
raw->fah_size = fah_size; { fs_access_control, fac_size },
raw->fac_size = fac_size; },
);
Result rc = serviceIpcDispatch(&g_fsprSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
ipcParse(&r);
struct {
u64 magic;
u64 result;
} *resp = r.Raw;
rc = resp->result;
}
return rc;
} }
Result fsprUnregisterProgram(u64 pid) { Result fsprUnregisterProgram(u64 pid) {
IpcCommand c; return serviceDispatchIn(&g_fsprSrv, 1, pid);
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
u64 pid;
} *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 1;
raw->pid = pid;
Result rc = serviceIpcDispatch(&g_fsprSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
ipcParse(&r);
struct {
u64 magic;
u64 result;
} *resp = r.Raw;
rc = resp->result;
}
return rc;
} }
Result fsprSetCurrentProcess(void) { Result fsprSetCurrentProcess(void) {
IpcCommand c; if(hosversionBefore(4,0,0))
ipcInitialize(&c); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
ipcSendPid(&c);
struct { u64 pid_placeholder = 0;
u64 magic; return serviceDispatchIn(&g_fsprSrv, 2, pid_placeholder, .in_send_pid = true);
u64 cmd_id;
u64 unk;
} *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 2;
raw->unk = 0;
Result rc = serviceIpcDispatch(&g_fsprSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
ipcParse(&r);
struct {
u64 magic;
u64 result;
} *resp = r.Raw;
rc = resp->result;
}
return rc;
} }
Result fsprSetEnabledProgramVerification(bool enabled) { Result fsprSetEnabledProgramVerification(bool enabled) {
IpcCommand c; const u8 in = enabled != 0;
ipcInitialize(&c); return serviceDispatchIn(&g_fsprSrv, 256, in);
struct {
u64 magic;
u64 cmd_id;
u8 enabled;
} *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 256;
raw->enabled = enabled ? 1 : 0;
Result rc = serviceIpcDispatch(&g_fsprSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
ipcParse(&r);
struct {
u64 magic;
u64 result;
} *resp = r.Raw;
rc = resp->result;
}
return rc;
} }