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

Fix latest commit

Browse Source
This commit is contained in:
TuxSH 2019-03-15 21:43:12 +01:00
parent 0195ab34e9
commit 8b51141f54
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arm9/source/large_patches.s
View File

@ -146,13 +146,13 @@ rebootPatch:
mov r1, #0 mov r1, #0
mov r2, #0 mov r2, #0
mov r3, #0 mov r3, #0
swi 0x7C svc 0x7C
goto_reboot: goto_reboot:
@ Jump to reboot code @ Jump to reboot code
ldr r0, kernel_func_displ ldr r0, kernel_func_displ
add r0, pc @ pc is two instructions ahead of the instruction being executed (12 = 2*4 + 4) add r0, pc @ pc is two instructions ahead of the instruction being executed (12 = 2*4 + 4)
swi 0x7B svc 0x7B
die: die:
b die b die
@ -171,7 +171,7 @@ rebootPatch:
panic: panic:
mov r1, r0 @ unused register mov r1, r0 @ unused register
mov r0, #0 mov r0, #0
swi 0x3C @ svcBreak(USERBREAK_PANIC) svc 0x3C @ svcBreak(USERBREAK_PANIC)
b die b die
kernel_func_displ: kernel_func_displ:

15
arm9/source/main.c
View File

@ -61,7 +61,7 @@ void main(int argc, char **argv, u32 magicWord)
FirmwareSource nandType; FirmwareSource nandType;
const vu8 *bootMediaStatus = (const vu8 *)0x1FFFE00C; const vu8 *bootMediaStatus = (const vu8 *)0x1FFFE00C;
const vu32 *bootPartitionsStatus = (const vu32 *)0x1FFFE010; const vu32 *bootPartitionsStatus = (const vu32 *)0x1FFFE010;
char firmlaunchTid[16+1]; u32 firmlaunchTidLow = 0;
//Shell closed, no error booting NTRCARD, NAND paritions not even considered //Shell closed, no error booting NTRCARD, NAND paritions not even considered
isNtrBoot = bootMediaStatus[3] == 2 && !bootMediaStatus[1] && !bootPartitionsStatus[0] && !bootPartitionsStatus[1]; isNtrBoot = bootMediaStatus[3] == 2 && !bootMediaStatus[1] && !bootPartitionsStatus[0] && !bootPartitionsStatus[1];
@ -85,7 +85,8 @@ void main(int argc, char **argv, u32 magicWord)
launchedPath[i] = p[i]; launchedPath[i] = p[i];
launchedPath[i] = 0; launchedPath[i] = 0;
strncpy(firmlaunchTid, argv[1], 16); for(i = 0; i < 8; i++)
firmlaunchTidLow = (argv[1][2 * i] > '9' ? argv[1][2 * i] - 'a' + 10 : argv[1][2 * i] - '0') | (firmlaunchTidLow << 4);
} }
else if(magicWord == 0xB002) //FIRM/NTRCARD boot else if(magicWord == 0xB002) //FIRM/NTRCARD boot
{ {
@ -164,15 +165,15 @@ void main(int argc, char **argv, u32 magicWord)
{ {
if(needConfig == CREATE_CONFIGURATION) mcuPowerOff(); if(needConfig == CREATE_CONFIGURATION) mcuPowerOff();
switch(firmlaunchTid[14]) switch(firmlaunchTidLow & 0xF)
{ {
case '2': case 2:
firmType = (FirmwareType)(firmlaunchTid[10] - '0'); firmType = (FirmwareType)((firmlaunchTidLow >> 8) & 0xF);
break; break;
case '3': case 3:
firmType = SAFE_FIRM; firmType = SAFE_FIRM;
break; break;
case '1': case 1:
firmType = SYSUPDATER_FIRM; firmType = SYSUPDATER_FIRM;
break; break;
} }