Merge branch 'master' into developer

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

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)
error("An old unsupported FIRM has been detected.\nCopy firmware.bin in /luma to boot");
//9.6 O3DS FIRM
firmVersion = 0x49;
//No assumption regarding FIRM version
firmVersion = 0xffffffff;
}
else decryptExeFs((u8 *)firm);

View File

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