Mirror/Luma3DS
1
0
Fork 0
mirror of https://github.com/LumaTeam/Luma3DS.git synced 2026-02-22 01:44:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

plugin loader: add persistent plugin user load parameters (#2027)

Browse Source
This commit is contained in:
PabloMK7 2024-05-09 21:52:49 +02:00 committed by GitHub
parent 175e184089
commit 2df3c389c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysmodules/rosalina/include/plugin/plgldr.h
View File

@ -11,6 +11,7 @@ typedef struct
{ {
bool noFlash; bool noFlash;
u8 pluginMemoryStrategy; u8 pluginMemoryStrategy;
u8 persistent;
u32 lowTitleId; u32 lowTitleId;
char path[256]; char path[256];
u32 config[32]; u32 config[32];

2
sysmodules/rosalina/source/plugin/file_loader.c
View File

@ -170,7 +170,7 @@ bool TryToLoadPlugin(Handle process)
// Try to open plugin file // Try to open plugin file
if (ctx->useUserLoadParameters && (ctx->userLoadParameters.lowTitleId == 0 || (u32)tid == ctx->userLoadParameters.lowTitleId)) if (ctx->useUserLoadParameters && (ctx->userLoadParameters.lowTitleId == 0 || (u32)tid == ctx->userLoadParameters.lowTitleId))
{ {
ctx->useUserLoadParameters = false; if (!ctx->userLoadParameters.persistent) ctx->useUserLoadParameters = false;
ctx->pluginMemoryStrategy = ctx->userLoadParameters.pluginMemoryStrategy; ctx->pluginMemoryStrategy = ctx->userLoadParameters.pluginMemoryStrategy;
if (OpenFile(&plugin, ctx->userLoadParameters.path)) if (OpenFile(&plugin, ctx->userLoadParameters.path))
return false; return false;

56
sysmodules/rosalina/source/plugin/plgloader.c
View File

@ -14,6 +14,8 @@
#define THREADVARS_MAGIC 0x21545624 // !TV$ #define THREADVARS_MAGIC 0x21545624 // !TV$
#define PERS_USER_FILE_MAGIC 0x53524550 // PERS
static const char *g_title = "Plugin loader"; static const char *g_title = "Plugin loader";
PluginLoaderContext PluginLoaderCtx; PluginLoaderContext PluginLoaderCtx;
extern u32 g_blockMenuOpen; extern u32 g_blockMenuOpen;
@ -43,6 +45,24 @@ void PluginLoader__Init(void)
assertSuccess(svcCreateEvent(&ctx->kernelEvent, RESET_ONESHOT)); assertSuccess(svcCreateEvent(&ctx->kernelEvent, RESET_ONESHOT));
svcKernelSetState(0x10007, ctx->kernelEvent, 0, 0); svcKernelSetState(0x10007, ctx->kernelEvent, 0, 0);
IFile file;
if (R_SUCCEEDED(IFile_Open(&file, ARCHIVE_SDMC, fsMakePath(PATH_EMPTY, ""), fsMakePath(PATH_ASCII, "/luma/plugins/user_param.bin"), FS_OPEN_READ)))
{
PluginLoadParameters *params = &ctx->userLoadParameters;
u64 temp_read;
u32 magic = 0;
if (R_SUCCEEDED(IFile_Read(&file, &temp_read, &magic, sizeof(magic))) && temp_read == sizeof(magic) && magic == PERS_USER_FILE_MAGIC
&& R_SUCCEEDED(IFile_Read(&file, &temp_read, params, sizeof(PluginLoadParameters))) && temp_read == sizeof(PluginLoadParameters))
{
ctx->useUserLoadParameters = true;
}
else
{
memset(params, 0, sizeof(PluginLoadParameters));
}
IFile_Close(&file);
}
} }
void PluginLoader__Error(const char *message, Result res) void PluginLoader__Error(const char *message, Result res)
@ -218,11 +238,25 @@ void PluginLoader__HandleCommands(void *_ctx)
ctx->useUserLoadParameters = true; ctx->useUserLoadParameters = true;
params->noFlash = cmdbuf[1] & 0xFF; params->noFlash = cmdbuf[1] & 0xFF;
params->pluginMemoryStrategy = (cmdbuf[1] >> 8) & 0xFF; params->pluginMemoryStrategy = (cmdbuf[1] >> 8) & 0xFF;
params->persistent = (cmdbuf[1] >> 16) & 0x1;
params->lowTitleId = cmdbuf[2]; params->lowTitleId = cmdbuf[2];
strncpy(params->path, (const char *)cmdbuf[4], 255); strncpy(params->path, (const char *)cmdbuf[4], 255);
memcpy(params->config, (void *)cmdbuf[6], 32 * sizeof(u32)); memcpy(params->config, (void *)cmdbuf[6], 32 * sizeof(u32));
if (params->persistent)
{
IFile file;
if (R_SUCCEEDED(IFile_Open(&file, ARCHIVE_SDMC, fsMakePath(PATH_EMPTY, ""), fsMakePath(PATH_ASCII, "/luma/plugins/user_param.bin"),
FS_OPEN_CREATE | FS_OPEN_READ | FS_OPEN_WRITE))) {
u64 tempWritten;
u32 magic = PERS_USER_FILE_MAGIC;
IFile_Write(&file, &tempWritten, &magic, sizeof(magic), 0);
IFile_Write(&file, &tempWritten, params, sizeof(PluginLoadParameters), 0);
IFile_Close(&file);
}
}
if (params->pluginMemoryStrategy == PLG_STRATEGY_MODE3) if (params->pluginMemoryStrategy == PLG_STRATEGY_MODE3)
cmdbuf[1] = PluginLoader__SetMode3AppMode(true); cmdbuf[1] = PluginLoader__SetMode3AppMode(true);
else else
@ -417,6 +451,28 @@ void PluginLoader__HandleCommands(void *_ctx)
break; break;
} }
case 14: // Clear user load parameters
{
if (cmdbuf[0] != IPC_MakeHeader(14, 0, 0))
{
error(cmdbuf, 0xD9001830);
break;
}
ctx->useUserLoadParameters = false;
memset(&ctx->userLoadParameters, 0, sizeof(PluginLoadParameters));
FS_Archive sd;
if(R_SUCCEEDED(FSUSER_OpenArchive(&sd, ARCHIVE_SDMC, fsMakePath(PATH_EMPTY, ""))))
{
FSUSER_DeleteFile(sd, fsMakePath(PATH_ASCII, "/luma/plugins/user_param.bin"));
FSUSER_CloseArchive(sd);
}
cmdbuf[1] = 0;
break;
}
default: // Unknown command default: // Unknown command
{ {
error(cmdbuf, 0xD900182F); error(cmdbuf, 0xD900182F);