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

Enable reading TwlBg and AgbBg as well as TWL_FIRM, AGB_FIRM and SAFE_FIRM from SD card.

Browse Source 
It's up to the user to provide supported versions of these firmware binaries (>= 5.x for NATIVE_FIRM, latest versions for the other firmwares) when using this feature.
This commit is contained in:
TuxSH 2016-08-04 13:44:51 +02:00
parent c36ad54bcb
commit eccf9eab93
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/firm.c
View File

@ -271,21 +271,27 @@ void main(void)
static inline u32 loadFirm(FirmwareType firmType) static inline u32 loadFirm(FirmwareType firmType)
{ {
section = firm->section; section = firm->section;
bool externalFirmExists = getFileSize("/luma/firmware.bin") != 0; const char *firmwareFiles[4] = {
"/luma/firmware.bin",
"/luma/firmware_twl.bin",
"/luma/firmware_agb.bin",
"/luma/firmware_safe.bin"
};
//Load FIRM from CTRNAND, unless it's an O3DS and we're loading a pre-5.0 NATIVE FIRM u32 firmVersion;
u32 firmVersion = firmRead(firm, (u32)firmType);
if(firmType == NATIVE_FIRM && ((!isN3DS && firmVersion < 0x25) || externalFirmExists)) if(fileRead(firm, firmwareFiles[(u32)firmType]))
{ {
//Always load the external firmware file if it exists
if((!fileRead(firm, "/luma/firmware.bin") || (((u32)section[2].address >> 8) & 0xFF) != 0x68) && (!isN3DS && firmVersion < 0x25))
error("An old unsupported FIRM has been detected.\nCopy firmware.bin in /luma to boot");
//No assumption regarding FIRM version
firmVersion = 0xffffffff; firmVersion = 0xffffffff;
} }
else decryptExeFs((u8 *)firm); else
{
firmVersion = firmRead(firm, (u32)firmType);
if(firmType == NATIVE_FIRM && !isN3DS && firmVersion < 0x25)
error("An old unsupported FIRM has been detected.\nCopy firmware.bin in /luma to boot");
decryptExeFs((u8 *)firm);
}
return firmVersion; return firmVersion;
} }
@ -469,7 +475,7 @@ static inline void launchFirm(FirmwareType firmType, bool isFirmlaunch)
{ {
//If we're booting NATIVE_FIRM, section0 needs to be copied separately to inject 3ds_injector //If we're booting NATIVE_FIRM, section0 needs to be copied separately to inject 3ds_injector
u32 sectionNum; u32 sectionNum;
if(firmType == NATIVE_FIRM) if(firmType != SAFE_FIRM)
{ {
copySection0AndInjectSystemModules(); copySection0AndInjectSystemModules();
sectionNum = 1; sectionNum = 1;