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

Minor stuff

Browse Source
This commit is contained in:
Aurora 2016-10-13 18:45:38 +02:00
parent 121792bebe
commit d613cb057e
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/main.c
View File

@ -59,7 +59,7 @@ void main(void)
//Determine if this is a firmlaunch boot //Determine if this is a firmlaunch boot
if(ISFIRMLAUNCH) if(ISFIRMLAUNCH)
{ {
if(needConfig == CREATE_CONFIGURATION) mcuReboot(); if(needConfig == CREATE_CONFIGURATION) mcuPowerOff();
//'0' = NATIVE_FIRM, '1' = TWL_FIRM, '2' = AGB_FIRM //'0' = NATIVE_FIRM, '1' = TWL_FIRM, '2' = AGB_FIRM
firmType = launchedFirmTidLow[7] == u'3' ? SAFE_FIRM : (FirmwareType)(launchedFirmTidLow[5] - u'0'); firmType = launchedFirmTidLow[7] == u'3' ? SAFE_FIRM : (FirmwareType)(launchedFirmTidLow[5] - u'0');
@ -86,7 +86,7 @@ void main(void)
configTemp = (configData.config & 0xFFFFFE00) | ((u32)ISA9LH << 6); configTemp = (configData.config & 0xFFFFFE00) | ((u32)ISA9LH << 6);
//If it's a MCU reboot, try to force boot options //If it's a MCU reboot, try to force boot options
if(ISA9LH && CFG_BOOTENV) if(ISA9LH && CFG_BOOTENV && needConfig != CREATE_CONFIGURATION)
{ {
//Always force a SysNAND boot when quitting AGB_FIRM //Always force a SysNAND boot when quitting AGB_FIRM
if(CFG_BOOTENV == 7) if(CFG_BOOTENV == 7)
@ -101,7 +101,7 @@ void main(void)
/* Else, force the last used boot options unless a button is pressed /* Else, force the last used boot options unless a button is pressed
or the no-forcing flag is set */ or the no-forcing flag is set */
else if(needConfig != CREATE_CONFIGURATION && !pressed && !BOOTCFG_NOFORCEFLAG) else if(!pressed && !BOOTCFG_NOFORCEFLAG)
{ {
nandType = (FirmwareSource)BOOTCFG_NAND; nandType = (FirmwareSource)BOOTCFG_NAND;
firmSource = (FirmwareSource)BOOTCFG_FIRM; firmSource = (FirmwareSource)BOOTCFG_FIRM;

14
source/utils.c
View File

@ -112,14 +112,16 @@ void chrono(u32 seconds)
void error(const char *message) void error(const char *message)
{ {
if(ISFIRMLAUNCH) mcuReboot(); if(!ISFIRMLAUNCH)
{
initScreens();
initScreens(); drawString("An error has occurred:", true, 10, 10, COLOR_RED);
u32 posY = drawString(message, true, 10, 30, COLOR_WHITE);
drawString("Press any button to shutdown", true, 10, posY + 2 * SPACING_Y, COLOR_WHITE);
drawString("An error has occurred:", true, 10, 10, COLOR_RED); waitInput();
u32 posY = drawString(message, true, 10, 30, COLOR_WHITE); }
drawString("Press any button to shutdown", true, 10, posY + 2 * SPACING_Y, COLOR_WHITE);
waitInput();
mcuPowerOff(); mcuPowerOff();
} }