MirrorBackup/SafeA9LHInstaller
1
0
Fork 0
forked from gnmmarechal/SafeA9LHInstaller
Code Pull Requests Activity

Cleanup, comment things better

Browse Source
This commit is contained in:
Aurora 2016-06-08 14:41:52 +02:00
parent 09435c282b
commit aa209a3ef7
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/installer.c
View File

@ -31,7 +31,7 @@ static const u8 firm1Hash[0x20] = {
0x2D, 0x3D, 0x56, 0x6C, 0x6A, 0x1A, 0x8E, 0x52, 0x54, 0xE3, 0x89, 0xC2, 0x95, 0x06, 0x23, 0xE5 0x2D, 0x3D, 0x56, 0x6C, 0x6A, 0x1A, 0x8E, 0x52, 0x54, 0xE3, 0x89, 0xC2, 0x95, 0x06, 0x23, 0xE5
}; };
int pos_y; int posY;
u32 console; u32 console;
@ -46,9 +46,9 @@ void main(void)
console = PDN_MPCORE_CFG == 7; console = PDN_MPCORE_CFG == 7;
drawString(TITLE, 10, 10, COLOR_TITLE); drawString(TITLE, 10, 10, COLOR_TITLE);
pos_y = drawString("Thanks to delebile, #cakey and StandardBus", 10, 40, COLOR_WHITE); posY = drawString("Thanks to delebile, #cakey and StandardBus", 10, 40, COLOR_WHITE);
pos_y = drawString(a9lhBoot ? "Press SELECT to update A9LH, START to uninstall" : "Press SELECT for a full install", 10, pos_y + SPACING_Y, COLOR_WHITE); posY = drawString(a9lhBoot ? "Press SELECT to update A9LH, START to uninstall" : "Press SELECT for a full install", 10, posY + SPACING_Y, COLOR_WHITE);
pos_y = drawString("Press any other button to shutdown", 10, pos_y, COLOR_WHITE); posY = drawString("Press any other button to shutdown", 10, posY, COLOR_WHITE);
u32 pressed = waitInput(); u32 pressed = waitInput();
if(pressed == BUTTON_SELECT) installer(a9lhBoot); if(pressed == BUTTON_SELECT) installer(a9lhBoot);
@ -156,7 +156,7 @@ static inline void installer(u32 a9lhBoot)
if(!size || size > MAX_STAGE2_SIZE) if(!size || size > MAX_STAGE2_SIZE)
shutdown(1, "Error: payload_stage2.bin doesn't exist or\nexceeds max size"); shutdown(1, "Error: payload_stage2.bin doesn't exist or\nexceeds max size");
pos_y = drawString("All checks passed, installing...", 10, pos_y + SPACING_Y, COLOR_WHITE); posY = drawString("All checks passed, installing...", 10, posY + SPACING_Y, COLOR_WHITE);
//Point of no return, install stuff in the safest order //Point of no return, install stuff in the safest order
sdmmc_nand_writesectors(0x5C000, 0x20, (vu8 *)STAGE2_OFFSET); sdmmc_nand_writesectors(0x5C000, 0x20, (vu8 *)STAGE2_OFFSET);
@ -169,10 +169,10 @@ static inline void installer(u32 a9lhBoot)
static inline void uninstaller(void) static inline void uninstaller(void)
{ {
pos_y = drawString("You are about to uninstall A9LH!", 10, pos_y + 10, COLOR_RED); posY = drawString("You are about to uninstall A9LH!", 10, posY + 10, COLOR_RED);
pos_y = drawString("Doing this will require having 9.0 to reinstall!", 10, pos_y, COLOR_RED); posY = drawString("Doing this will require having 9.0 to reinstall!", 10, posY, COLOR_RED);
pos_y = drawString("If you would like to continue, press:", 10, pos_y, COLOR_WHITE); posY = drawString("If you would like to continue, press:", 10, posY, COLOR_WHITE);
pos_y = drawString("Up, Down, Left, Right, B, A, START, SELECT", 10, pos_y, COLOR_WHITE); posY = drawString("Up, Down, Left, Right, B, A, START, SELECT", 10, posY, COLOR_WHITE);
u32 unlockSequence[] = { BUTTON_UP, BUTTON_DOWN, BUTTON_LEFT, BUTTON_RIGHT, BUTTON_B, BUTTON_A, BUTTON_START, BUTTON_SELECT }, u32 unlockSequence[] = { BUTTON_UP, BUTTON_DOWN, BUTTON_LEFT, BUTTON_RIGHT, BUTTON_B, BUTTON_A, BUTTON_START, BUTTON_SELECT },
sequenceSize = sizeof(unlockSequence) / sizeof(u32); sequenceSize = sizeof(unlockSequence) / sizeof(u32);
@ -183,6 +183,7 @@ static inline void uninstaller(void)
shutdown(1, "Button sequence not entered correctly"); shutdown(1, "Button sequence not entered correctly");
} }
//New 3DSes need a key sector with a proper key2, Old 3DSes have a blank key sector
if(console) if(console)
{ {
setupKeyslot0x11(1, NULL); setupKeyslot0x11(1, NULL);
@ -196,6 +197,7 @@ static inline void uninstaller(void)
if(!mountCTRNAND()) if(!mountCTRNAND())
shutdown(1, "Error: failed to mount CTRNAND"); shutdown(1, "Error: failed to mount CTRNAND");
//Read FIRM cxi from CTRNAND
switch(firmRead((void *)FIRM0_OFFSET)) switch(firmRead((void *)FIRM0_OFFSET))
{ {
case 1: case 1:
@ -207,17 +209,22 @@ static inline void uninstaller(void)
default: default:
break; break;
} }
//Decrypt it and get its size
u32 firmSize = decryptExeFs((void *)FIRM0_OFFSET); u32 firmSize = decryptExeFs((void *)FIRM0_OFFSET);
//writeFirm encrypts in-place, so we need two copies
memcpy((void *)FIRM1_OFFSET, (void *)FIRM0_OFFSET, firmSize); memcpy((void *)FIRM1_OFFSET, (void *)FIRM0_OFFSET, firmSize);
//Zero out the stage2 space on NAND
memset32((void *)STAGE2_OFFSET, 0, MAX_STAGE2_SIZE); memset32((void *)STAGE2_OFFSET, 0, MAX_STAGE2_SIZE);
pos_y = drawString("All checks passed, uninstalling...", 10, pos_y + SPACING_Y, COLOR_WHITE); posY = drawString("All checks passed, uninstalling...", 10, posY + SPACING_Y, COLOR_WHITE);
//Point of no return, install stuff in the safest order
sdmmc_nand_writesectors(0x96, 1, (vu8 *)SECTOR_OFFSET);
writeFirm((u8 *)FIRM0_OFFSET, 0, firmSize); writeFirm((u8 *)FIRM0_OFFSET, 0, firmSize);
writeFirm((u8 *)FIRM1_OFFSET, 1, firmSize); writeFirm((u8 *)FIRM1_OFFSET, 1, firmSize);
sdmmc_nand_writesectors(0x96, 1, (vu8 *)SECTOR_OFFSET);
sdmmc_nand_writesectors(0x5C000, 0x20, (vu8 *)STAGE2_OFFSET); sdmmc_nand_writesectors(0x5C000, 0x20, (vu8 *)STAGE2_OFFSET);
shutdown(2, "Uninstall: success!"); shutdown(2, "Uninstall: success!");

4
source/utils.c
View File

@ -37,8 +37,8 @@ void shutdown(u32 mode, const char *message)
{ {
if(mode) if(mode)
{ {
pos_y = drawString(message, 10, pos_y + SPACING_Y, mode == 1 ? COLOR_RED : COLOR_GREEN); posY = drawString(message, 10, posY + SPACING_Y, mode == 1 ? COLOR_RED : COLOR_GREEN);
drawString("Press any button to shutdown", 10, pos_y, COLOR_WHITE); drawString("Press any button to shutdown", 10, posY, COLOR_WHITE);
waitInput(); waitInput();
} }
i2cWriteRegister(I2C_DEV_MCU, 0x20, 1); i2cWriteRegister(I2C_DEV_MCU, 0x20, 1);

2
source/utils.h
View File

@ -21,7 +21,7 @@
#define COLOR_RED 0x0000FF #define COLOR_RED 0x0000FF
#define COLOR_GREEN 0x00FF00 #define COLOR_GREEN 0x00FF00
int pos_y; extern int posY;
u32 waitInput(void); u32 waitInput(void);
void shutdown(u32 mode, const char *message); void shutdown(u32 mode, const char *message);