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

Merge branch 'master' into developer

Browse Source 
Conflicts:
	source/patches.c
This commit is contained in:
TuxSH 2016-08-04 00:18:53 +02:00
commit 81e2b7c11c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/firm.c
View File

@ -280,8 +280,8 @@ static inline u32 loadFirm(FirmwareType firmType)
if(!fileRead(firm, "/luma/firmware.bin") || (((u32)section[2].address >> 8) & 0xFF) != 0x68) if(!fileRead(firm, "/luma/firmware.bin") || (((u32)section[2].address >> 8) & 0xFF) != 0x68)
error("An old unsupported FIRM has been detected.\nCopy firmware.bin in /luma to boot"); error("An old unsupported FIRM has been detected.\nCopy firmware.bin in /luma to boot");
//9.6 O3DS FIRM //No assumption regarding FIRM version
firmVersion = 0x49; firmVersion = 0xffffffff;
} }
else decryptExeFs((u8 *)firm); else decryptExeFs((u8 *)firm);

2
source/patches.c
View File

@ -240,7 +240,7 @@ void patchTitleInstallMinVersionCheck(u8 *pos, u32 size)
u8 *off = memsearch(pos, pattern, size, 4); u8 *off = memsearch(pos, pattern, size, 4);
off[4] = 0xE0; if(off != NULL) off[4] = 0xE0;
} }
void applyLegacyFirmPatches(u8 *pos, FirmwareType firmType) void applyLegacyFirmPatches(u8 *pos, FirmwareType firmType)