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

Move stuff from firm.c

Browse Source
This commit is contained in:
Aurora 2016-08-15 13:11:27 +02:00
parent aa7c2c0009
commit c9c373f607
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/config.c
View File

@ -201,4 +201,6 @@ void configureCFW(const char *configPath)
//Wait for the pressed buttons to change //Wait for the pressed buttons to change
while(HID_PAD == BUTTON_START); while(HID_PAD == BUTTON_START);
chrono(2);
} }

2
source/draw.c
View File

@ -51,6 +51,8 @@ bool loadSplash(void)
fileRead(fb->top_left, "/luma/splash.bin"); fileRead(fb->top_left, "/luma/splash.bin");
fileRead(fb->bottom, "/luma/splashbottom.bin"); fileRead(fb->bottom, "/luma/splashbottom.bin");
chrono(3);
return true; return true;
} }

18
source/firm.c
View File

@ -150,11 +150,6 @@ void main(void)
if(!pinExists && CONFIG(7)) pin = newPin(); if(!pinExists && CONFIG(7)) pin = newPin();
//Zero the last booted FIRM flag
CFG_BOOTENV = 0;
chrono(2);
//Update pressed buttons //Update pressed buttons
pressed = HID_PAD; pressed = HID_PAD;
} }
@ -169,23 +164,14 @@ void main(void)
{ {
/* If L and R/A/Select or one of the single payload buttons are pressed, /* If L and R/A/Select or one of the single payload buttons are pressed,
chainload an external payload (the PIN, if any, has been verified)*/ chainload an external payload (the PIN, if any, has been verified)*/
if(CONFIG(6) && loadSplash())
{
chrono(3);
//Update pressed buttons if(CONFIG(6) && loadSplash()) pressed = HID_PAD;
pressed = HID_PAD;
}
bool shouldLoadPayload = (pressed & SINGLE_PAYLOAD_BUTTONS) || ((pressed & BUTTON_L1) && (pressed & L_PAYLOAD_BUTTONS)); bool shouldLoadPayload = (pressed & SINGLE_PAYLOAD_BUTTONS) || ((pressed & BUTTON_L1) && (pressed & L_PAYLOAD_BUTTONS));
if(shouldLoadPayload) loadPayload(pressed); if(shouldLoadPayload) loadPayload(pressed);
if(!CONFIG(6) && loadSplash()) if(!CONFIG(6)) loadSplash();
{
chrono(3);
}
//If R is pressed, boot the non-updated NAND with the FIRM of the opposite one //If R is pressed, boot the non-updated NAND with the FIRM of the opposite one
if(pressed & BUTTON_R1) if(pressed & BUTTON_R1)