LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Fix chainloading bugs/refactoring

Browse Source
This commit is contained in:
Aurora Wright 2017-05-20 00:45:05 +02:00
parent 252d32aafe
commit 64ebec3ea4
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/fs.c
View File

@ -186,12 +186,11 @@ void loadPayload(u32 pressed, const char *payloadPath)
u32 payloadSize = 0, u32 payloadSize = 0,
maxPayloadSize = (u32)((u8 *)loaderAddress - (u8 *)firm); maxPayloadSize = (u32)((u8 *)loaderAddress - (u8 *)firm);
char path[62] = {0}, char absPath[24 + _MAX_LFN] = {0};
absPath[92] = {0}; char path[10 + _MAX_LFN] = {0};
u16 mountPoint[5] = {0}; u16 mountPoint[5] = {0};
for(u32 i = 0; i < 4 && launchedPath[i] != u':'; i++) for(u32 i = 0; i < 4 && launchedPath[i] != u':'; i++)
mountPoint[i] = launchedPath[i];
if(payloadPath == NULL) if(payloadPath == NULL)
{ {
@ -213,6 +212,7 @@ void loadPayload(u32 pressed, const char *payloadPath)
FILINFO info; FILINFO info;
FRESULT result; FRESULT result;
result = f_findfirst(&dir, &info, "payloads", pattern); result = f_findfirst(&dir, &info, "payloads", pattern);
if(result != FR_OK) return; if(result != FR_OK) return;
@ -221,28 +221,22 @@ void loadPayload(u32 pressed, const char *payloadPath)
if(!info.fname[0]) return; if(!info.fname[0]) return;
sprintf(path, "payloads/%s", info.altname); sprintf(path, "payloads/%s", info.fname);
if(memcmp(mountPoint, u"nand", 8))
sprintf(absPath, "nand:/rw/luma/payloads/%s", info.altname); }
else else sprintf(path, "%s", payloadPath);
sprintf(absPath, "%s:/luma/payloads/%s", mountPoint, info.altname);
payloadSize = fileRead(firm, path, maxPayloadSize); payloadSize = fileRead(firm, path, maxPayloadSize);
}
else
{
if(memcmp(mountPoint, u"nand", 8))
sprintf(absPath, "nand:/rw/luma/payloads/%s", payloadPath);
else
sprintf(absPath, "%s:/luma/payloads/%s", mountPoint, payloadPath);
payloadSize = fileRead(firm, payloadPath, maxPayloadSize);
}
if(!payloadSize || !checkFirmPayload()) return; if(!payloadSize || !checkFirmPayload()) return;
writeConfig(true); writeConfig(true);
if(memcmp(mountPoint, u"nand", 8))
sprintf(absPath, "nand:/rw/luma/%s", path);
else
sprintf(absPath, "sdmc:/luma/%s", path);
char *argv[1] = {absPath}; char *argv[1] = {absPath};
memcpy(loaderAddress, loader_bin, loader_bin_size); memcpy(loaderAddress, loader_bin, loader_bin_size);

2
source/fs.h
View File

@ -24,7 +24,7 @@
#include "types.h" #include "types.h"
#define PATTERN(a) a "_*.bin" #define PATTERN(a) a "_*.firm"
bool mountFs(bool isSd, bool switchToCtrNand); bool mountFs(bool isSd, bool switchToCtrNand);
u32 fileRead(void *dest, const char *path, u32 maxSize); u32 fileRead(void *dest, const char *path, u32 maxSize);