MirrorBackup/SafeB9SInstaller
1
0
Fork 0
forked from Mirror/SafeB9SInstaller
Code Pull Requests Activity

Misc cosmetics and edits

Browse Source
This commit is contained in:
d0k3 2017-02-03 01:14:45 +01:00
parent e197604d19
commit 65734816f2
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
README.md
View File

@ -1,6 +1,21 @@
# SafeSigHaxInstaller # SafeSigHaxInstaller
Safe, simple, user-friendly installer for sighaxed FIRMs Safe, simple, user-friendly installer for sighaxed FIRMs
**THIS DOES NOT DO ANYTHING YET** **DON'T USE THIS YET**
Stop asking - it's done when it's done(tm) **Stop asking - it's done when it's done(tm)**
For usage instructions, refer to [Plailect's guide](https://3ds.guide/).
## Credits
* **Normmatt**, for sdmmc.c / sdmmc.h
* **Cha(N)**, **Kane49**, and all other FatFS contributors for FatFS
* **SciresM** for being the first fearless person to test this
* **TuxSH** for FIRM research and usefule hints
* **hedgeberg** for dumping the bootrom (when it's done)
* **Plailect** for providing the guide and making this accessible to the common user
* **stuckpixel** for his tireless behind-the-scenes work
* **Gelex** for being of great help on countless occasions
* The fine folks on **freenode #Cakey**
* All **[3dbrew.org](https://www.3dbrew.org/wiki/Main_Page) editors**
* Everyone I possibly forgot, if you think you deserve to be mentioned, just contact me!

2
source/common/common.h
View File

@ -38,7 +38,7 @@
(((v) % (a)) ? ((v) + (a) - ((v) % (a))) : (v)) (((v) % (a)) ? ((v) + (a) - ((v) % (a))) : (v))
// SafeSigHaxInstaller version // SafeSigHaxInstaller version
#define VERSION "0.0.2" #define VERSION "0.0.3"
// input / output paths // input / output paths
#define INPUT_PATH "0:/sighax" #define INPUT_PATH "0:/sighax"

21
source/installer.c
View File

@ -43,13 +43,14 @@ static char msgInstall[64] = "not started";
u32 ShowInstallerStatus(void) { u32 ShowInstallerStatus(void) {
const u32 pos_xb = 10; const u32 pos_xb = 10;
const u32 pos_x0 = pos_xb; const u32 pos_x0 = pos_xb + 4;
const u32 pos_x1 = pos_x0 + (17*FONT_WIDTH_EXT); const u32 pos_x1 = pos_x0 + (17*FONT_WIDTH_EXT);
const u32 pos_yb = 10; const u32 pos_yb = 10;
const u32 pos_y0 = pos_yb + 20; const u32 pos_yu = 230;
const u32 stp = 12; const u32 pos_y0 = pos_yb + 50;
const u32 stp = 14;
DrawStringF(BOT_SCREEN, pos_xb, pos_yb, COLOR_STD_FONT, COLOR_STD_BG, "SafeSigHaxInstaller v" VERSION); DrawStringF(BOT_SCREEN, pos_xb, pos_yb, COLOR_STD_FONT, COLOR_STD_BG, "SafeSigHaxInstaller v" VERSION "\n" "--------------------------" "\n" "https://github.com/d0k3/SafeSigHaxInstaller");
DrawStringF(BOT_SCREEN, pos_x0, pos_y0 + (0*stp), COLOR_STD_FONT, COLOR_STD_BG, "ARM9LoaderHax -"); DrawStringF(BOT_SCREEN, pos_x0, pos_y0 + (0*stp), COLOR_STD_FONT, COLOR_STD_BG, "ARM9LoaderHax -");
DrawStringF(BOT_SCREEN, pos_x0, pos_y0 + (1*stp), COLOR_STD_FONT, COLOR_STD_BG, "MicroSD Card -"); DrawStringF(BOT_SCREEN, pos_x0, pos_y0 + (1*stp), COLOR_STD_FONT, COLOR_STD_BG, "MicroSD Card -");
@ -67,6 +68,7 @@ u32 ShowInstallerStatus(void) {
DrawStringF(BOT_SCREEN, pos_x1, pos_y0 + (5*stp), COLOR_STATUS(statusBackup) , COLOR_STD_BG, "%-21.21s", msgBackup ); DrawStringF(BOT_SCREEN, pos_x1, pos_y0 + (5*stp), COLOR_STATUS(statusBackup) , COLOR_STD_BG, "%-21.21s", msgBackup );
DrawStringF(BOT_SCREEN, pos_x1, pos_y0 + (6*stp), COLOR_STATUS(statusInstall), COLOR_STD_BG, "%-21.21s", msgInstall); DrawStringF(BOT_SCREEN, pos_x1, pos_y0 + (6*stp), COLOR_STATUS(statusInstall), COLOR_STD_BG, "%-21.21s", msgInstall);
DrawStringF(BOT_SCREEN, pos_xb, pos_yu - 10, COLOR_STD_FONT, COLOR_STD_BG, "Usage instructions: https://3ds.guide/");
return 0; return 0;
} }
@ -78,6 +80,7 @@ u32 SafeSigHaxInstaller(void) {
// step #0 - a9lh check // step #0 - a9lh check
InitNandCrypto(); // for sector0x96 crypto and NAND drives
snprintf(msgA9lh, 64, CheckA9lh() ? "installed" : "not installed"); snprintf(msgA9lh, 64, CheckA9lh() ? "installed" : "not installed");
statusA9lh = STATUS_GREEN; statusA9lh = STATUS_GREEN;
ShowInstallerStatus(); ShowInstallerStatus();
@ -95,7 +98,6 @@ u32 SafeSigHaxInstaller(void) {
statusSdCard = STATUS_RED; statusSdCard = STATUS_RED;
return 1; return 1;
} }
InitNandCrypto(); // for sector0x96 crypto and NAND drives
snprintf(msgSdCard, 64, "%lluMB/%lluMB free", sdFree / (1024 * 1024), sdTotal / (1024 * 1024)); snprintf(msgSdCard, 64, "%lluMB/%lluMB free", sdFree / (1024 * 1024), sdTotal / (1024 * 1024));
statusSdCard = (sdFree < MIN_SD_FREE) ? STATUS_RED : STATUS_GREEN; statusSdCard = (sdFree < MIN_SD_FREE) ? STATUS_RED : STATUS_GREEN;
ShowInstallerStatus(); ShowInstallerStatus();
@ -179,7 +181,7 @@ u32 SafeSigHaxInstaller(void) {
// step #X - point of no return // step #X - point of no return
if (!ShowUnlockSequence(1, "All input files verified.\nTo install FIRM, enter the sequence\nbelow or press B to cancel.")) { if (!ShowUnlockSequence(1, "All input files verified.\n \nTo install FIRM, enter the sequence\nbelow or press B to cancel.")) {
snprintf(msgBackup, 64, "cancelled by user"); snprintf(msgBackup, 64, "cancelled by user");
snprintf(msgInstall, 64, "cancelled by user"); snprintf(msgInstall, 64, "cancelled by user");
statusBackup = STATUS_YELLOW; statusBackup = STATUS_YELLOW;
@ -236,8 +238,8 @@ u32 SafeSigHaxInstaller(void) {
ShowInstallerStatus(); ShowInstallerStatus();
// backups done // backups done
// step #6 - install sighaxed FIRM // step #6 - install sighaxed FIRM
// ShowPrompt(false, "Install not finished - this is only a preview");
snprintf(msgInstall, 64, "FIRM install..."); snprintf(msgInstall, 64, "FIRM install...");
statusInstall = STATUS_YELLOW; statusInstall = STATUS_YELLOW;
ShowInstallerStatus(); ShowInstallerStatus();
@ -271,12 +273,13 @@ u32 SafeSigHaxInstaller(void) {
snprintf(msgA9lh, 64, "fucked up"); snprintf(msgA9lh, 64, "fucked up");
statusA9lh = STATUS_RED; statusA9lh = STATUS_RED;
} }
ShowInstallerStatus();
} }
// if we end up here: uhoh // if we end up here: uhoh
ShowPrompt(false, "SafeSigHaxInstaller failed!\nThis really should not have happened :/."); ShowPrompt(false, "SafeSigHaxInstaller failed!\nThis really should not have happened :/.");
ShowPrompt(false, "You can now load an external payload\nto try and fix up your system.\n \nThis may be your LAST CHANCE!\nUse it wisely."); ShowPrompt(false, "You may launch an external payload\nto try and fix up your system.\n \nThis may be your LAST CHANCE!\nUse it wisely.");
const char* optionstr[2] = { "Unmount SD card", "Launch " INPUT_PATH "/payload.bin" }; const char* optionstr[2] = { "Unmount SD card", "Run " INPUT_PATH "/payload.bin" };
while (true) { while (true) {
u32 user_select = ShowSelectPrompt(2, optionstr, "Make your choice."); u32 user_select = ShowSelectPrompt(2, optionstr, "Make your choice.");
if (user_select == 1) { if (user_select == 1) {