Merge branch 'master' into developer
Conflicts: source/config.c source/firm.c
This commit is contained in:
commit
259bcc686c
@ -3,28 +3,7 @@
|
|||||||
#include "patcher.h"
|
#include "patcher.h"
|
||||||
#include "ifile.h"
|
#include "ifile.h"
|
||||||
|
|
||||||
typedef struct __attribute__((packed))
|
static CFWInfo info = {0};
|
||||||
{
|
|
||||||
char magic[4];
|
|
||||||
|
|
||||||
u8 versionMajor;
|
|
||||||
u8 versionMinor;
|
|
||||||
u8 versionBuild;
|
|
||||||
u8 flags; /* bit 0: dev branch; bit 1: is release */
|
|
||||||
|
|
||||||
u32 commitHash;
|
|
||||||
|
|
||||||
u32 config;
|
|
||||||
} CFWInfo;
|
|
||||||
|
|
||||||
CFWInfo info = {0};
|
|
||||||
|
|
||||||
#ifndef PATH_MAX
|
|
||||||
#define PATH_MAX 255
|
|
||||||
#define CONFIG(a) (((info.config >> (a + 16)) & 1) != 0)
|
|
||||||
#define MULTICONFIG(a) ((info.config >> (a * 2 + 6)) & 3)
|
|
||||||
#define BOOTCONFIG(a, b) ((info.config >> a) & b)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int memcmp(const void *buf1, const void *buf2, u32 size)
|
static int memcmp(const void *buf1, const void *buf2, u32 size)
|
||||||
{
|
{
|
||||||
@ -114,6 +93,7 @@ int __attribute__((naked)) svcGetCFWInfo(CFWInfo __attribute__((unused)) *out)
|
|||||||
static void loadCFWInfo(void)
|
static void loadCFWInfo(void)
|
||||||
{
|
{
|
||||||
static bool infoLoaded = false;
|
static bool infoLoaded = false;
|
||||||
|
|
||||||
if(!infoLoaded)
|
if(!infoLoaded)
|
||||||
{
|
{
|
||||||
svcGetCFWInfo(&info);
|
svcGetCFWInfo(&info);
|
||||||
@ -122,8 +102,9 @@ static void loadCFWInfo(void)
|
|||||||
{
|
{
|
||||||
IFile_Close(&file);
|
IFile_Close(&file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
infoLoaded = true;
|
||||||
}
|
}
|
||||||
infoLoaded = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool secureInfoExists(void)
|
static bool secureInfoExists(void)
|
||||||
@ -338,6 +319,7 @@ static void patchCfgGetRegion(u8 *code, u32 size, u8 regionId, u32 CFGUHandleOff
|
|||||||
void patchCode(u64 progId, u8 *code, u32 size)
|
void patchCode(u64 progId, u8 *code, u32 size)
|
||||||
{
|
{
|
||||||
loadCFWInfo();
|
loadCFWInfo();
|
||||||
|
|
||||||
switch(progId)
|
switch(progId)
|
||||||
{
|
{
|
||||||
case 0x0004003000008F02LL: // USA Menu
|
case 0x0004003000008F02LL: // USA Menu
|
||||||
|
@ -2,4 +2,23 @@
|
|||||||
|
|
||||||
#include <3ds/types.h>
|
#include <3ds/types.h>
|
||||||
|
|
||||||
|
#define PATH_MAX 255
|
||||||
|
#define CONFIG(a) (((info.config >> (a + 16)) & 1) != 0)
|
||||||
|
#define MULTICONFIG(a) ((info.config >> (a * 2 + 6)) & 3)
|
||||||
|
#define BOOTCONFIG(a, b) ((info.config >> a) & b)
|
||||||
|
|
||||||
|
typedef struct __attribute__((packed))
|
||||||
|
{
|
||||||
|
char magic[4];
|
||||||
|
|
||||||
|
u8 versionMajor;
|
||||||
|
u8 versionMinor;
|
||||||
|
u8 versionBuild;
|
||||||
|
u8 flags; /* bit 0: dev branch; bit 1: is release */
|
||||||
|
|
||||||
|
u32 commitHash;
|
||||||
|
|
||||||
|
u32 config;
|
||||||
|
} CFWInfo;
|
||||||
|
|
||||||
void patchCode(u64 progId, u8 *code, u32 size);
|
void patchCode(u64 progId, u8 *code, u32 size);
|
@ -135,7 +135,7 @@ patchesStart:
|
|||||||
.halfword 1
|
.halfword 1
|
||||||
.halfword 8
|
.halfword 8
|
||||||
.byte 0x83, 0x30, 0x2e, 0xa4, 0xb0, 0xe2, 0xc2, 0xd6 ; (decrypted = 0x02, 0x01, 0x1a, 0xe3, 0x08, 0x60, 0x87, 0x05)
|
.byte 0x83, 0x30, 0x2e, 0xa4, 0xb0, 0xe2, 0xc2, 0xd6 ; (decrypted = 0x02, 0x01, 0x1a, 0xe3, 0x08, 0x60, 0x87, 0x05)
|
||||||
.byte 0x89, 0x53, 0xb2, 0xa4, 0xb0, 0xe2, 0xc2, 0xd6 ; (decrypted = 0x08, 0x62, 0x86, 0xe3, 0x08, 0x60, 0x87, 0xe5)
|
.byte 0x83, 0x50, 0xf2, 0xa4, 0xb0, 0xe2, 0xc2, 0xd6 ; (decrypted = 0x02, 0x61, 0xc6, 0xe3, 0x08, 0x60, 0x87, 0xe5)
|
||||||
|
|
||||||
patchesEnd:
|
patchesEnd:
|
||||||
|
|
||||||
|
@ -24,10 +24,9 @@
|
|||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "screen.h"
|
#include "screen.h"
|
||||||
#include "draw.h"
|
#include "draw.h"
|
||||||
#include "fs.h"
|
|
||||||
#include "buttons.h"
|
#include "buttons.h"
|
||||||
|
|
||||||
void configureCFW(const char *configPath)
|
void configureCFW(void)
|
||||||
{
|
{
|
||||||
initScreens();
|
initScreens();
|
||||||
|
|
||||||
@ -46,6 +45,7 @@ void configureCFW(const char *configPath)
|
|||||||
"( ) Show GBA boot screen in patched AGB_FIRM",
|
"( ) Show GBA boot screen in patched AGB_FIRM",
|
||||||
"( ) Display splash screen before payloads",
|
"( ) Display splash screen before payloads",
|
||||||
"( ) Use a PIN",
|
"( ) Use a PIN",
|
||||||
|
"( ) Enable experimental TwlBg patches",
|
||||||
"( ) Disable access checks" };
|
"( ) Disable access checks" };
|
||||||
|
|
||||||
struct multiOption {
|
struct multiOption {
|
||||||
@ -196,13 +196,6 @@ void configureCFW(const char *configPath)
|
|||||||
for(u32 i = 0; i < singleOptionsAmount; i++)
|
for(u32 i = 0; i < singleOptionsAmount; i++)
|
||||||
config |= (singleOptions[i].enabled ? 1 : 0) << (i + 16);
|
config |= (singleOptions[i].enabled ? 1 : 0) << (i + 16);
|
||||||
|
|
||||||
if(!fileWrite(&config, configPath, 4))
|
|
||||||
{
|
|
||||||
createDirectory("luma");
|
|
||||||
if(!fileWrite(&config, configPath, 4))
|
|
||||||
error("Error writing the configuration file");
|
|
||||||
}
|
|
||||||
|
|
||||||
//Wait for the pressed buttons to change
|
//Wait for the pressed buttons to change
|
||||||
while(HID_PAD == BUTTON_START);
|
while(HID_PAD == BUTTON_START);
|
||||||
}
|
}
|
@ -32,4 +32,4 @@
|
|||||||
|
|
||||||
extern u32 config;
|
extern u32 config;
|
||||||
|
|
||||||
void configureCFW(const char *configPath);
|
void configureCFW(void);
|
||||||
|
@ -107,7 +107,7 @@ void main(void)
|
|||||||
//Determine if the user chose to use the SysNAND FIRM as default for a R boot
|
//Determine if the user chose to use the SysNAND FIRM as default for a R boot
|
||||||
bool useSysAsDefault = isA9lh ? CONFIG(1) : false;
|
bool useSysAsDefault = isA9lh ? CONFIG(1) : false;
|
||||||
|
|
||||||
newConfig = (u32)isA9lh << 3;
|
newConfig = (config & 0xFFFFFFC0) | ((u32)isA9lh << 3);
|
||||||
|
|
||||||
//If it's a MCU reboot, try to force boot options
|
//If it's a MCU reboot, try to force boot options
|
||||||
if(isA9lh && CFG_BOOTENV)
|
if(isA9lh && CFG_BOOTENV)
|
||||||
@ -148,7 +148,7 @@ void main(void)
|
|||||||
|
|
||||||
if(shouldLoadConfigurationMenu)
|
if(shouldLoadConfigurationMenu)
|
||||||
{
|
{
|
||||||
configureCFW(configPath);
|
configureCFW();
|
||||||
|
|
||||||
if(!pinExists && CONFIG(7)) newPin();
|
if(!pinExists && CONFIG(7)) newPin();
|
||||||
|
|
||||||
@ -214,13 +214,17 @@ void main(void)
|
|||||||
|
|
||||||
/* If the boot configuration is different from previously, overwrite it.
|
/* If the boot configuration is different from previously, overwrite it.
|
||||||
Just the no-forcing flag being set is not enough */
|
Just the no-forcing flag being set is not enough */
|
||||||
if((newConfig & 0x2F) != (config & 0x3F))
|
if((newConfig & 0xFFFFFFEF) != config)
|
||||||
{
|
{
|
||||||
//Preserve user settings (last 26 bits)
|
//Update the last boot configuration
|
||||||
newConfig |= config & 0xFFFFFFC0;
|
config |= newConfig & 0x3F;
|
||||||
|
|
||||||
if(!fileWrite(&newConfig, configPath, 4))
|
if(!fileWrite(&config, configPath, 4))
|
||||||
error("Error writing the configuration file");
|
{
|
||||||
|
createDirectory("luma");
|
||||||
|
if(!fileWrite(&config, configPath, 4))
|
||||||
|
error("Error writing the configuration file");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -338,7 +342,7 @@ static inline void patchNativeFirm(u32 firmVersion, FirmwareSource nandType, u32
|
|||||||
patchKernel11Panic(arm11Section1, section[1].size);
|
patchKernel11Panic(arm11Section1, section[1].size);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(CONFIG(8))
|
if(CONFIG(9))
|
||||||
{
|
{
|
||||||
patchArm11SvcAccessChecks(arm11Section1, section[1].size);
|
patchArm11SvcAccessChecks(arm11Section1, section[1].size);
|
||||||
patchK11ModuleChecks(arm11Section1, section[1].size);
|
patchK11ModuleChecks(arm11Section1, section[1].size);
|
||||||
@ -372,7 +376,7 @@ static inline void patchLegacyFirm(FirmwareType firmType)
|
|||||||
|
|
||||||
applyLegacyFirmPatches((u8 *)firm, firmType);
|
applyLegacyFirmPatches((u8 *)firm, firmType);
|
||||||
|
|
||||||
if(firmType == TWL_FIRM)
|
if(firmType == TWL_FIRM && CONFIG(8))
|
||||||
patchTwlBg((u8 *)firm + section[1].offset);
|
patchTwlBg((u8 *)firm + section[1].offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -409,20 +413,19 @@ static inline void copySection0AndInjectSystemModules(FirmwareType firmType)
|
|||||||
u32 size;
|
u32 size;
|
||||||
char name[8];
|
char name[8];
|
||||||
const u8 *addr;
|
const u8 *addr;
|
||||||
} modules[5] = {{0}};
|
} modules[5];
|
||||||
|
|
||||||
u8 *pos = arm11Section0, *end = pos + section[0].size;
|
u8 *pos = arm11Section0;
|
||||||
u32 n = 0;
|
u32 n = 0;
|
||||||
|
|
||||||
u32 loaderIndex = 0;
|
u32 loaderIndex = 0;
|
||||||
|
|
||||||
while(pos < end)
|
for(u8 *end = pos + section[0].size; pos < end; pos += modules[n++].size)
|
||||||
{
|
{
|
||||||
modules[n].addr = pos;
|
modules[n].addr = pos;
|
||||||
modules[n].size = *(u32 *)(pos + 0x104) * 0x200;
|
modules[n].size = *(u32 *)(pos + 0x104) * 0x200;
|
||||||
|
|
||||||
memcpy(modules[n].name, pos + 0x200, 8);
|
memcpy(modules[n].name, pos + 0x200, 8);
|
||||||
pos += modules[n].size;
|
|
||||||
|
|
||||||
//Read modules from files if they exist
|
//Read modules from files if they exist
|
||||||
u32 nameOff;
|
u32 nameOff;
|
||||||
@ -438,8 +441,6 @@ static inline void copySection0AndInjectSystemModules(FirmwareType firmType)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(firmType == NATIVE_FIRM && memcmp(modules[n].name, "loader", 7) == 0) loaderIndex = n;
|
if(firmType == NATIVE_FIRM && memcmp(modules[n].name, "loader", 7) == 0) loaderIndex = n;
|
||||||
|
|
||||||
n++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(firmType == NATIVE_FIRM && modules[loaderIndex].addr != NULL)
|
if(firmType == NATIVE_FIRM && modules[loaderIndex].addr != NULL)
|
||||||
@ -449,7 +450,7 @@ static inline void copySection0AndInjectSystemModules(FirmwareType firmType)
|
|||||||
}
|
}
|
||||||
|
|
||||||
pos = section[0].address;
|
pos = section[0].address;
|
||||||
for(u32 i = 0; i < n; i++)
|
for(u32 i = 0; i < n; pos += modules[i++].size)
|
||||||
{
|
{
|
||||||
if(modules[i].addr != NULL)
|
if(modules[i].addr != NULL)
|
||||||
memcpy(pos, modules[i].addr, modules[i].size);
|
memcpy(pos, modules[i].addr, modules[i].size);
|
||||||
@ -461,9 +462,7 @@ static inline void copySection0AndInjectSystemModules(FirmwareType firmType)
|
|||||||
memcpy(fileName + 17, modules[i].name, nameOff);
|
memcpy(fileName + 17, modules[i].name, nameOff);
|
||||||
memcpy(fileName + 17 + nameOff, ext, 5);
|
memcpy(fileName + 17 + nameOff, ext, 5);
|
||||||
fileRead(pos, fileName);
|
fileRead(pos, fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
pos += modules[i].size;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -334,26 +334,10 @@ void reimplementSvcBackdoor(u8 *pos, u32 size)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extern u32 config;
|
|
||||||
|
|
||||||
void implementSvcGetCFWInfo(u8 *pos, u32 size)
|
void implementSvcGetCFWInfo(u8 *pos, u32 size)
|
||||||
{
|
{
|
||||||
typedef struct __attribute__((packed))
|
|
||||||
{
|
|
||||||
char magic[4];
|
|
||||||
|
|
||||||
u8 versionMajor;
|
|
||||||
u8 versionMinor;
|
|
||||||
u8 versionBuild;
|
|
||||||
u8 flags;
|
|
||||||
|
|
||||||
u32 commitHash;
|
|
||||||
|
|
||||||
u32 config;
|
|
||||||
} CFWInfo;
|
|
||||||
|
|
||||||
const char *rev = REVISION;
|
const char *rev = REVISION;
|
||||||
bool isRelease = false;
|
bool isRelease;
|
||||||
|
|
||||||
findArm11ExceptionsPageAndSvcHandlerAndTable(pos, size);
|
findArm11ExceptionsPageAndSvcHandlerAndTable(pos, size);
|
||||||
findFreeK11Space(pos, size);
|
findFreeK11Space(pos, size);
|
||||||
|
@ -33,7 +33,22 @@ typedef struct patchData {
|
|||||||
u32 type;
|
u32 type;
|
||||||
} patchData;
|
} patchData;
|
||||||
|
|
||||||
|
typedef struct __attribute__((packed))
|
||||||
|
{
|
||||||
|
char magic[4];
|
||||||
|
|
||||||
|
u8 versionMajor;
|
||||||
|
u8 versionMinor;
|
||||||
|
u8 versionBuild;
|
||||||
|
u8 flags;
|
||||||
|
|
||||||
|
u32 commitHash;
|
||||||
|
|
||||||
|
u32 config;
|
||||||
|
} CFWInfo;
|
||||||
|
|
||||||
extern bool isN3DS;
|
extern bool isN3DS;
|
||||||
|
extern u32 config;
|
||||||
|
|
||||||
u8 *getProcess9(u8 *pos, u32 size, u32 *process9Size, u32 *process9MemAddr);
|
u8 *getProcess9(u8 *pos, u32 size, u32 *process9Size, u32 *process9MemAddr);
|
||||||
u32* getInfoForArm11ExceptionHandlers(u8 *pos, u32 size, u32 *stackAddr, u32 *codeSetOffset);
|
u32* getInfoForArm11ExceptionHandlers(u8 *pos, u32 size, u32 *stackAddr, u32 *codeSetOffset);
|
||||||
|
Reference in New Issue
Block a user