anod/Luma3DS-autorun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert force-setting SysNAND when launching TWL Mode

Browse Source 
This being said, neither legacy FIRM nor DSiWare actually support
EmuNAND; installing the same TWL title on both SysNAND and EmuNAND and
then launch it from EmuNAND will work though.

It is only when exiting AGB firm that we want to boot SysNAND no matter
what, because the save file has been written on a partition in SysNAND.

This is mainly to ensure we reboot to the proper NAND in case we reboot.
This commit is contained in:
TuxSH 2023-01-03 21:31:37 +01:00
parent fe4bb0857b
commit da0b1a1389
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arm9/source/main.c
View File

@ -1,6 +1,6 @@
/* /*
* This file is part of Luma3DS * This file is part of Luma3DS
* Copyright (C) 2016-2022 Aurora Wright, TuxSH * Copyright (C) 2016-2023 Aurora Wright, TuxSH
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -219,13 +219,12 @@ void main(int argc, char **argv, u32 magicWord)
{ {
u32 bootenv = CFG_BOOTENV; u32 bootenv = CFG_BOOTENV;
bool validTlnc = bootenv == 3 && hasValidTlncAutobootParams(); bool validTlnc = bootenv == 3 && hasValidTlncAutobootParams();
bool twlIntoCtr = validTlnc && isTwlToCtrLaunch();
if (validTlnc) if (validTlnc)
needToInitSd = true; needToInitSd = true;
//Always force a SysNAND boot when quitting AGB_FIRM, or when doing a TWL -> (ns ->) TWL reboot //Always force a SysNAND boot when quitting AGB_FIRM
if(bootenv == 7 || (validTlnc && !twlIntoCtr)) if(bootenv == 7)
{ {
nandType = FIRMWARE_SYSNAND; nandType = FIRMWARE_SYSNAND;
firmSource = (BOOTCFG_NAND != 0) == (BOOTCFG_FIRM != 0) ? FIRMWARE_SYSNAND : (FirmwareSource)BOOTCFG_FIRM; firmSource = (BOOTCFG_NAND != 0) == (BOOTCFG_FIRM != 0) ? FIRMWARE_SYSNAND : (FirmwareSource)BOOTCFG_FIRM;
@ -236,9 +235,9 @@ void main(int argc, char **argv, u32 magicWord)
goto boot; goto boot;
} }
/* Force the last used boot options if doing TWL->CTR, or unless a button is pressed /* Force the last used boot options if doing autolaunch from TWL, or unless a button is pressed
or the no-forcing flag is set */ or the no-forcing flag is set */
if(twlIntoCtr || !(pressed || BOOTCFG_NOFORCEFLAG)) if(validTlnc || !(pressed || BOOTCFG_NOFORCEFLAG))
{ {
nandType = (FirmwareSource)BOOTCFG_NAND; nandType = (FirmwareSource)BOOTCFG_NAND;
firmSource = (FirmwareSource)BOOTCFG_FIRM; firmSource = (FirmwareSource)BOOTCFG_FIRM;
@ -310,16 +309,9 @@ void main(int argc, char **argv, u32 magicWord)
goto boot; goto boot;
} }
// Set-up autoboot, and if we're booting into TWL mode, always use SysNAND // Set-up autoboot
if (MULTICONFIG(AUTOBOOTMODE) != 0) if (MULTICONFIG(AUTOBOOTMODE) != 0)
{ configureHomebrewAutoboot();
bool ok = configureHomebrewAutoboot();
if (ok && MULTICONFIG(AUTOBOOTMODE) == 2)
{
nandType = FIRMWARE_SYSNAND;
firmSource = FIRMWARE_SYSNAND;
}
}
//If booting from CTRNAND, always use SysNAND //If booting from CTRNAND, always use SysNAND
if(!isSdMode) nandType = FIRMWARE_SYSNAND; if(!isSdMode) nandType = FIRMWARE_SYSNAND;