OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loader/fs.mitm: Support override config changes at runtime

Browse Source
This commit is contained in:
Michael Scire
2018-10-22 22:53:40 -07:00
parent e61bb00d7a
commit f96e1d5074
4 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
stratosphere/fs_mitm/source/fsmitm_utils.cpp
View File

@@ -34,6 +34,9 @@ static std::atomic_bool g_has_hid_session = false;
static u64 g_override_key_combination = KEY_R;
static bool g_override_by_default = true;
/* Static buffer for loader.ini contents at runtime. */
static char g_config_ini_data[0x800];
static bool IsHexadecimal(const char *str) {
while (*str) {
if (isxdigit(*str)) {
@@ -93,12 +96,7 @@ void Utils::InitializeSdThreadFunc(void *args) {
fsDirClose(&titles_dir);
}
FsFile config_file;
if (R_SUCCEEDED(fsFsOpenFile(&g_sd_filesystem, "/atmosphere/loader.ini", FS_OPEN_READ, &config_file))) {
Utils::LoadConfiguration(&config_file);
fsFileClose(&config_file);
}
Utils::RefreshConfiguration();
g_has_initialized = true;
@@ -251,6 +249,9 @@ bool Utils::HasOverrideButton(u64 tid) {
return true;
}
/* Unconditionally refresh loader.ini contents. */
RefreshConfiguration();
u64 kDown = 0;
bool keys_triggered = (R_SUCCEEDED(GetKeysDown(&kDown)) && ((kDown & g_override_key_combination) != 0));
return IsSdInitialized() && (g_override_by_default ^ keys_triggered);
@@ -314,27 +315,26 @@ static int FsMitMIniHandler(void *user, const char *section, const char *name, c
}
void Utils::LoadConfiguration(FsFile *f) {
if (f == NULL) {
void Utils::RefreshConfiguration() {
FsFile config_file;
if (R_FAILED(fsFsOpenFile(&g_sd_filesystem, "/atmosphere/loader.ini", FS_OPEN_READ, &config_file))) {
return;
}
u64 size;
if (R_FAILED(fsFileGetSize(f, &size))) {
if (R_FAILED(fsFileGetSize(&config_file, &size))) {
return;
}
size = std::min(size, (decltype(size))0x7FF);
char *config_str = new char[0x800];
if (config_str != NULL) {
/* Read in string. */
std::fill(config_str, config_str + 0x800, 0);
size_t r_s;
fsFileRead(f, 0, config_str, size, &r_s);
/* Read in string. */
std::fill(g_config_ini_data, g_config_ini_data + 0x800, 0);
size_t r_s;
fsFileRead(&config_file, 0, g_config_ini_data, size, &r_s);
ini_parse_string(g_config_ini_data, FsMitMIniHandler, NULL);
ini_parse_string(config_str, FsMitMIniHandler, NULL);
delete[] config_str;
}
fsFileClose(&config_file);
}