Minor stuff

This commit is contained in:
Aurora 2016-11-26 14:07:48 +01:00
parent c5d75d2de9
commit e177f9e0fe
2 changed files with 9 additions and 10 deletions

View File

@ -127,7 +127,7 @@ void detectAndProcessExceptionDumps(void)
if(instr == 0xE12FFF7E) drawString(specialExceptions[0], true, 10 + 32 * SPACING_X, posY, COLOR_WHITE);
else if(instr == 0xEF00003C) drawString(specialExceptions[1], true, 10 + 32 * SPACING_X, posY, COLOR_WHITE);
}
else if((regs[16] & 0x20) == 1 && dumpHeader->codeDumpSize >= 2)
else if((regs[16] & 0x20) != 0 && dumpHeader->codeDumpSize >= 2)
{
u16 instr = *(vu16 *)(stackDump - 2);
if(instr == 0xDF3C) drawString(specialExceptions[1], true, 10 + 32 * SPACING_X, posY, COLOR_WHITE);
@ -201,4 +201,4 @@ void detectAndProcessExceptionDumps(void)
waitInput(false);
mcuPowerOff();
}
}

View File

@ -60,10 +60,9 @@ bool mountFs(bool isSd, bool switchToCtrNand)
u32 fileRead(void *dest, const char *path, u32 maxSize)
{
FIL file;
u32 ret = 0;
if(f_open(&file, path, FA_READ) != FR_OK) return 0;
u32 ret;
if(f_open(&file, path, FA_READ) != FR_OK) return ret;
u32 size = f_size(&file);
if(dest == NULL) ret = size;
@ -262,11 +261,11 @@ void payloadMenu(void)
u32 firmRead(void *dest, u32 firmType)
{
const char *firmFolders[][2] = {{ "00000002", "20000002" },
{ "00000102", "20000102" },
{ "00000202", "20000202" },
{ "00000003", "20000003" },
{ "00000001", "20000001" }};
const char *firmFolders[][2] = {{"00000002", "20000002"},
{"00000102", "20000102"},
{"00000202", "20000202"},
{"00000003", "20000003"},
{"00000001", "20000001"}};
char path[48] = "1:/title/00040138/";
concatenateStrings(path, firmFolders[firmType][ISN3DS ? 1 : 0]);