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

Remove A9LH self payload handling in vMem drive

Browse Source
This commit is contained in:
d0k3 2017-05-31 23:06:24 +02:00
parent 540daed73a
commit 3e14fd3f44
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/common/common.h
View File

@ -51,9 +51,6 @@
// GodMode9 version // GodMode9 version
#define VERSION "1.2.0" #define VERSION "1.2.0"
// Maximum payload size (arbitrary value!)
#define SELF_MAX_SIZE (320 * 1024) // 320kB
// input / output paths // input / output paths
#define INPUT_PATHS "0:", "0:/files9", "1:/rw/files9" #define INPUT_PATHS "0:", "0:/files9", "1:/rw/files9"
#define OUTPUT_PATH "0:/gm9out" #define OUTPUT_PATH "0:/gm9out"

6
source/godmode.c
View File

@ -244,12 +244,6 @@ u32 SdFormatMenu(void) {
return 1; return 1;
} }
if (IS_A9LH && !IS_SIGHAX) {
InitSDCardFS(); // on A9LH: copy the payload from mem to SD root
FileSetData("0:/arm9loaderhax_si.bin", (u8*) 0x23F00000, SELF_MAX_SIZE, 0, true);
DeinitSDCardFS();
}
VirtualFile nand; VirtualFile nand;
if (!GetVirtualFile(&nand, "S:/nand_minsize.bin")) if (!GetVirtualFile(&nand, "S:/nand_minsize.bin"))
return 0; return 0;

7
source/virtual/vmem.c
View File

@ -3,7 +3,6 @@
#include "sha.h" #include "sha.h"
#include "aes.h" #include "aes.h"
#define VFLAG_PAYLOAD (1UL<<27)
#define VFLAG_BOOT9 (1UL<<28) #define VFLAG_BOOT9 (1UL<<28)
#define VFLAG_BOOT11 (1UL<<29) #define VFLAG_BOOT11 (1UL<<29)
#define VFLAG_OTP (1UL<<30) #define VFLAG_OTP (1UL<<30)
@ -45,8 +44,7 @@ static const VirtualFile vMemFileTemplates[] = {
{ "otp.mem" , 0x10012000, 0x00000100, 0xFF, VFLAG_OTP }, { "otp.mem" , 0x10012000, 0x00000100, 0xFF, VFLAG_OTP },
{ "otp_dec.mem" , 0x10012000, 0x00000100, 0x11, VFLAG_OTP | VFLAG_BOOT9 }, { "otp_dec.mem" , 0x10012000, 0x00000100, 0x11, VFLAG_OTP | VFLAG_BOOT9 },
// { "bootrom.mem" , 0xFFFF0000, 0x00010000, 0xFF, 0 }, // { "bootrom.mem" , 0xFFFF0000, 0x00010000, 0xFF, 0 },
// { "bootrom_unp.mem" , 0xFFFF0000, 0x00008000, 0xFF, 0 }, // { "bootrom_unp.mem" , 0xFFFF0000, 0x00008000, 0xFF, 0 }
{ "godmode9.bin" , 0x23F00000, SELF_MAX_SIZE, 0xFF, VFLAG_PAYLOAD }
}; };
bool ReadVMemDir(VirtualFile* vfile, VirtualDir* vdir) { // uses a generic vdir object generated in virtual.c bool ReadVMemDir(VirtualFile* vfile, VirtualDir* vdir) { // uses a generic vdir object generated in virtual.c
@ -61,8 +59,7 @@ bool ReadVMemDir(VirtualFile* vfile, VirtualDir* vdir) { // uses a generic vdir
if (((vfile->flags & VFLAG_N3DS_ONLY) && (IS_O3DS)) || // this is not on O3DS consoles if (((vfile->flags & VFLAG_N3DS_ONLY) && (IS_O3DS)) || // this is not on O3DS consoles
((vfile->flags & VFLAG_OTP) && !(IS_UNLOCKED)) || // OTP still locked ((vfile->flags & VFLAG_OTP) && !(IS_UNLOCKED)) || // OTP still locked
((vfile->flags & VFLAG_BOOT9) && (sha_cmp(boot9_sha256, (u8*) BOOT9_POS, BOOT9_LEN, SHA256_MODE) != 0)) || // boot9 not found ((vfile->flags & VFLAG_BOOT9) && (sha_cmp(boot9_sha256, (u8*) BOOT9_POS, BOOT9_LEN, SHA256_MODE) != 0)) || // boot9 not found
((vfile->flags & VFLAG_BOOT11) && (sha_cmp(boot11_sha256, (u8*) BOOT11_POS, BOOT11_LEN, SHA256_MODE) != 0)) || // boot11 not found ((vfile->flags & VFLAG_BOOT11) && (sha_cmp(boot11_sha256, (u8*) BOOT11_POS, BOOT11_LEN, SHA256_MODE) != 0))) // boot11 not found
((vfile->flags & VFLAG_PAYLOAD) && IS_SIGHAX)) // not available on SigHax (yet)
continue; continue;
// found if arriving here // found if arriving here