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

Merge https://github.com/AuroraWright/Luma3DS/pull/793 , clarify the exception dumps' paths

Browse Source
This commit is contained in:
Aurora Wright 2017-08-16 16:55:07 +02:00
parent 0790a3ceb3
commit a3cb6a622d
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/exceptions.c
View File

@ -32,6 +32,7 @@
#include "draw.h" #include "draw.h"
#include "utils.h" #include "utils.h"
#include "fmt.h" #include "fmt.h"
#include "buttons.h"
#include "../build/bundled.h" #include "../build/bundled.h"
void installArm9Handlers(void) void installArm9Handlers(void)
@ -160,6 +161,16 @@ void detectAndProcessExceptionDumps(void)
drawFormattedString(false, 10 + 10 * SPACING_X + 3 * i * SPACING_X, posYBottom, COLOR_WHITE, "%02X", *stackDump); drawFormattedString(false, 10 + 10 * SPACING_X + 3 * i * SPACING_X, posYBottom, COLOR_WHITE, "%02X", *stackDump);
} }
static const char *choiceMessage[] = {"Press A to save the crash dump", "Press any other button to shutdown"};
drawString(true, 10, posY + SPACING_Y, COLOR_WHITE, choiceMessage[0]);
drawString(true, 10, posY + SPACING_Y + SPACING_Y , COLOR_WHITE, choiceMessage[1]);
if(waitInput(false) != BUTTON_A) goto exit;
drawString(true, 10, posY + SPACING_Y, COLOR_BLACK, choiceMessage[0]);
drawString(true, 10, posY + SPACING_Y + SPACING_Y , COLOR_BLACK, choiceMessage[1]);
char folderPath[12], char folderPath[12],
path[36], path[36],
fileName[24]; fileName[24];
@ -170,8 +181,8 @@ void detectAndProcessExceptionDumps(void)
if(fileWrite((void *)dumpHeader, path, dumpHeader->totalSize)) if(fileWrite((void *)dumpHeader, path, dumpHeader->totalSize))
{ {
posY = drawString(true, 10, posY + SPACING_Y, COLOR_WHITE, "You can find a dump in the following file:"); posY = drawString(true, 10, posY + SPACING_Y, COLOR_WHITE, "You can find the dump in the following file:");
posY = drawString(true, 10, posY + SPACING_Y, COLOR_WHITE, path) + SPACING_Y; posY = drawFormattedString(true, 10, posY + SPACING_Y, COLOR_WHITE, "%s:/luma/%s", isSdMode ? "SD" : "CTRNAND", path) + SPACING_Y;
} }
else posY = drawString(true, 10, posY + SPACING_Y, COLOR_RED, "Error writing the dump file"); else posY = drawString(true, 10, posY + SPACING_Y, COLOR_RED, "Error writing the dump file");
@ -179,6 +190,7 @@ void detectAndProcessExceptionDumps(void)
memset32((void *)dumpHeader, 0, dumpHeader->totalSize); memset32((void *)dumpHeader, 0, dumpHeader->totalSize);
exit:
waitInput(false); waitInput(false);
mcuPowerOff(); mcuPowerOff();
} }