Skip to content
This repository has been archived by the owner on Jul 20, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/LumaTeam/Luma3DS into off…
Browse files Browse the repository at this point in the history 
…icial
  • Loading branch information
@PabloMK7
PabloMK7 committed Feb 9, 2023
2 parents 45c1d83 + 89f77db commit 8778982
Show file tree
Hide file tree
Showing 52 changed files with 1,786 additions and 473 deletions.
Binary file modified arm9/data/config_template.ini
View file
Binary file not shown.
209 changes: 196 additions & 13 deletions arm9/source/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
* reasonable ways as different from the original version.
*/

#define _GNU_SOURCE // for strchrnul

#include <assert.h>
#include <strings.h>
#include "config.h"
Expand All @@ -42,6 +44,9 @@

#define MAKE_LUMA_VERSION_MCU(major, minor, build) (u16)(((major) & 0xFF) << 8 | ((minor) & 0x1F) << 5 | ((build) & 7))

#define FLOAT_CONV_MULT 100000000ll
#define FLOAT_CONV_PRECISION 8u

CfgData configData;
ConfigurationStatus needConfig;
static CfgData oldConfig;
Expand All @@ -57,8 +62,10 @@ static const char *singleOptionIniNamesBoot[] = {
"use_emunand_firm_if_r_pressed",
"enable_external_firm_and_modules",
"enable_game_patching",
"app_syscore_threads_on_core_2",
"show_system_settings_string",
"show_gba_boot_screen",
"force_headphone_output",
};

static const char *singleOptionIniNamesMisc[] = {
Expand Down Expand Up @@ -95,10 +102,9 @@ static int parseBoolOption(bool *out, const char *val)
}
}

static int parseDecIntOption(s64 *out, const char *val, s64 minval, s64 maxval)
static int parseDecIntOptionImpl(s64 *out, const char *val, size_t numDigits, s64 minval, s64 maxval)
{
*out = 0;
size_t numDigits = strlen(val);
s64 res = 0;
size_t i = 0;

Expand Down Expand Up @@ -130,6 +136,61 @@ static int parseDecIntOption(s64 *out, const char *val, s64 minval, s64 maxval)
}
}

static int parseDecIntOption(s64 *out, const char *val, s64 minval, s64 maxval)
{
return parseDecIntOptionImpl(out, val, strlen(val), minval, maxval);
}

static int parseDecFloatOption(s64 *out, const char *val, s64 minval, s64 maxval)
{
char *point = strchrnul(val, '.');
if (point == val) {
return -1;
}

// Parse integer part, then fractional part
s64 intPart = 0;
s64 fracPart = 0;
int rc = parseDecIntOptionImpl(&intPart, val, point - val, INT64_MIN, INT64_MAX);

if (rc != 0) {
return -1;
}

s64 sign = intPart < 0 ? -1 : 1;
s64 intPartAbs = sign == -1 ? -intPart : intPart;
s64 res = 0;
bool of = __builtin_mul_overflow(intPartAbs, FLOAT_CONV_MULT, &res);

if (of) {
return -1;
}

s64 mul = FLOAT_CONV_MULT / 10;

// Check if there's a fractional part
if (point[0] != '\0' && point[1] != '\0') {
for (char *pos = point + 1; *pos != '\0' && mul > 0; pos++) {
if (*pos < '0' || *pos > '9') {
return -1;
}

res += (*pos - '0') * mul;
mul /= 10;
}
}


res = sign * (res + fracPart);

if (res <= maxval && res >= minval && !of) {
*out = res;
return 0;
} else {
return -1;
}
}

static int parseHexIntOption(u64 *out, const char *val, u64 minval, u64 maxval)
{
*out = 0;
Expand Down Expand Up @@ -222,6 +283,34 @@ static void menuComboToString(char *out, u32 combo)
out[-1] = 0;
}

static int encodedFloatToString(char *out, s64 val)
{
s64 sign = val >= 0 ? 1 : -1;

s64 intPart = (sign * val) / FLOAT_CONV_MULT;
s64 fracPart = (sign * val) % FLOAT_CONV_MULT;

while (fracPart % 10 != 0) {
// Remove trailing zeroes
fracPart /= 10;
}

int n = sprintf(out, "%lld", sign * intPart);
if (fracPart != 0) {
n += sprintf(out + n, ".%0*lld", (int)FLOAT_CONV_PRECISION, fracPart);

// Remove trailing zeroes
int n2 = n - 1;
while (out[n2] == '0') {
out[n2--] = '\0';
}

n = n2;
}

return n;
}

static bool hasIniParseError = false;
static int iniParseErrorLine = 0;

Expand Down Expand Up @@ -339,18 +428,66 @@ static int configIniHandler(void* user, const char* section, const char* name, c
CHECK_PARSE_OPTION(parseKeyComboOption(&opt, value));
cfg->rosalinaMenuCombo = opt;
return 1;
} else if (strcmp(name, "screen_filters_cct") == 0) {
s64 opt;
CHECK_PARSE_OPTION(parseDecIntOption(&opt, value, 1000, 25100));
cfg->screenFiltersCct = (u32)opt;
return 1;
} else if (strcmp(name, "ntp_tz_offset_min") == 0) {
s64 opt;
CHECK_PARSE_OPTION(parseDecIntOption(&opt, value, -779, 899));
cfg->ntpTzOffetMinutes = (s16)opt;
return 1;
} else {
CHECK_PARSE_OPTION(-1);
}
else {
} else if (strcmp(section, "screen_filters") == 0) {
if (strcmp(name, "screen_filters_top_cct") == 0) {
s64 opt;
CHECK_PARSE_OPTION(parseDecIntOption(&opt, value, 1000, 25100));
cfg->topScreenFilter.cct = (u32)opt;
return 1;
} else if (strcmp(name, "screen_filters_top_gamma") == 0) {
s64 opt;
CHECK_PARSE_OPTION(parseDecFloatOption(&opt, value, 0, 1411 * FLOAT_CONV_MULT));
cfg->topScreenFilter.gammaEnc = opt;
return 1;
} else if (strcmp(name, "screen_filters_top_contrast") == 0) {
s64 opt;
CHECK_PARSE_OPTION(parseDecFloatOption(&opt, value, 0, 255 * FLOAT_CONV_MULT));
cfg->topScreenFilter.contrastEnc = opt;
return 1;
} else if (strcmp(name, "screen_filters_top_brightness") == 0) {
s64 opt;
CHECK_PARSE_OPTION(parseDecFloatOption(&opt, value, -1 * FLOAT_CONV_MULT, 1 * FLOAT_CONV_MULT));
cfg->topScreenFilter.brightnessEnc = opt;
return 1;
} else if (strcmp(name, "screen_filters_top_invert") == 0) {
bool opt;
CHECK_PARSE_OPTION(parseBoolOption(&opt, value));
cfg->topScreenFilter.invert = opt;
return 1;
} else if (strcmp(name, "screen_filters_bot_cct") == 0) {
s64 opt;
CHECK_PARSE_OPTION(parseDecIntOption(&opt, value, 1000, 25100));
cfg->bottomScreenFilter.cct = (u32)opt;
return 1;
} else if (strcmp(name, "screen_filters_bot_gamma") == 0) {
s64 opt;
CHECK_PARSE_OPTION(parseDecFloatOption(&opt, value, 0, 1411 * FLOAT_CONV_MULT));
cfg->bottomScreenFilter.gammaEnc = opt;
return 1;
} else if (strcmp(name, "screen_filters_bot_contrast") == 0) {
s64 opt;
CHECK_PARSE_OPTION(parseDecFloatOption(&opt, value, 0, 255 * FLOAT_CONV_MULT));
cfg->bottomScreenFilter.contrastEnc = opt;
return 1;
} else if (strcmp(name, "screen_filters_bot_brightness") == 0) {
s64 opt;
CHECK_PARSE_OPTION(parseDecFloatOption(&opt, value, -1 * FLOAT_CONV_MULT, 1 * FLOAT_CONV_MULT));
cfg->bottomScreenFilter.brightnessEnc = opt;
return 1;
} else if (strcmp(name, "screen_filters_bot_invert") == 0) {
bool opt;
CHECK_PARSE_OPTION(parseBoolOption(&opt, value));
cfg->bottomScreenFilter.invert = opt;
return 1;
} else {
CHECK_PARSE_OPTION(-1);
}
} else if (strcmp(section, "autoboot") == 0) {
Expand Down Expand Up @@ -423,21 +560,42 @@ static size_t saveLumaIniConfigToStr(char *out)
static const int pinOptionToDigits[] = { 0, 4, 6, 8 };
int pinNumDigits = pinOptionToDigits[MULTICONFIG(PIN)];

char topScreenFilterGammaStr[32];
char topScreenFilterContrastStr[32];
char topScreenFilterBrightnessStr[32];
encodedFloatToString(topScreenFilterGammaStr, cfg->topScreenFilter.gammaEnc);
encodedFloatToString(topScreenFilterContrastStr, cfg->topScreenFilter.contrastEnc);
encodedFloatToString(topScreenFilterBrightnessStr, cfg->topScreenFilter.brightnessEnc);

char bottomScreenFilterGammaStr[32];
char bottomScreenFilterContrastStr[32];
char bottomScreenFilterBrightnessStr[32];
encodedFloatToString(bottomScreenFilterGammaStr, cfg->bottomScreenFilter.gammaEnc);
encodedFloatToString(bottomScreenFilterContrastStr, cfg->bottomScreenFilter.contrastEnc);
encodedFloatToString(bottomScreenFilterBrightnessStr, cfg->bottomScreenFilter.brightnessEnc);

int n = sprintf(
out, (const char *)config_template_ini,
lumaVerStr, lumaRevSuffixStr,

(int)CONFIG_VERSIONMAJOR, (int)CONFIG_VERSIONMINOR,
(int)CONFIG(AUTOBOOTEMU), (int)CONFIG(USEEMUFIRM),
(int)CONFIG(LOADEXTFIRMSANDMODULES), (int)CONFIG(PATCHGAMES),
(int)CONFIG(PATCHVERSTRING), (int)CONFIG(SHOWGBABOOT),
(int)CONFIG(REDIRECTAPPTHREADS), (int)CONFIG(PATCHVERSTRING),
(int)CONFIG(SHOWGBABOOT), (int)CONFIG(FORCEHEADPHONEOUTPUT),

1 + (int)MULTICONFIG(DEFAULTEMU), 4 - (int)MULTICONFIG(BRIGHTNESS),
splashPosStr, (unsigned int)cfg->splashDurationMsec,
pinNumDigits, n3dsCpuStr, (int)MULTICONFIG(AUTOBOOTMODE),

cfg->hbldr3dsxTitleId, rosalinaMenuComboStr,
(int)cfg->screenFiltersCct, (int)cfg->ntpTzOffetMinutes,
(int)cfg->ntpTzOffetMinutes,

(int)cfg->topScreenFilter.cct, (int)cfg->bottomScreenFilter.cct,
topScreenFilterGammaStr, bottomScreenFilterGammaStr,
topScreenFilterContrastStr, bottomScreenFilterContrastStr,
topScreenFilterBrightnessStr, bottomScreenFilterBrightnessStr,
(int)cfg->topScreenFilter.invert, (int)cfg->bottomScreenFilter.invert,

cfg->autobootTwlTitleId, (int)cfg->autobootCtrAppmemtype,

Expand Down Expand Up @@ -546,7 +704,10 @@ bool readConfig(void)
configData.splashDurationMsec = 3000;
configData.hbldr3dsxTitleId = HBLDR_DEFAULT_3DSX_TID;
configData.rosalinaMenuCombo = 1u << 9 | 1u << 7 | 1u << 2; // L+Start+Select
configData.screenFiltersCct = 6500; // default temp, no-op
configData.topScreenFilter.cct = 6500; // default temp, no-op
configData.topScreenFilter.gammaEnc = 1 * FLOAT_CONV_MULT; // 1.0f
configData.topScreenFilter.contrastEnc = 1 * FLOAT_CONV_MULT; // 1.0f
configData.bottomScreenFilter = configData.topScreenFilter;
configData.autobootTwlTitleId = AUTOBOOT_DEFAULT_TWL_TID;
ret = false;
}
Expand Down Expand Up @@ -596,8 +757,10 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
"( ) Use EmuNAND FIRM if booting with R",
"( ) Enable loading external FIRMs and modules",
"( ) Enable game patching",
"( ) Redirect app. syscore threads to core2",
"( ) Show NAND or user string in System Settings",
"( ) Show GBA boot screen in patched AGB_FIRM",
"( ) Force routing audio output to headphones"
};

static const char *optionsDescription[] = { "Select the default EmuNAND.\n\n"
Expand Down Expand Up @@ -669,10 +832,19 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
"of patched code binaries, exHeaders,\n"
"IPS code patches and LayeredFS\n"
"for specific games.\n\n"
"Also makes certain DLCs\n"
"for out-of-region games work.\n\n"
"Also makes certain DLCs for out-of-\n"
"region games work.\n\n"
"Refer to the wiki for instructions.",

"Redirect app. threads that would spawn\n"
"on core1, to core2 (which is an extra\n"
"CPU core for applications that usually\n"
"remains unused).\n\n"
"This improves the performance of very\n"
"demanding games (like Pok\x82mon US/UM)\n" // CP437
"by about 10%. Can break some games\n"
"and other applications.\n",

"Enable showing the current NAND/FIRM:\n\n"
"\t* Sys = SysNAND\n"
"\t* Emu = EmuNAND 1\n"
Expand All @@ -687,6 +859,15 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)

"Enable showing the GBA boot screen\n"
"when booting GBA games.",

"Force audio output to headphones.\n\n"
"Currently only for NATIVE_FIRM.\n\n"
"Due to software limitations, this gets\n"
"undone if you actually insert then\n"
"remove HPs (just enter then exit sleep\n"
"mode if this happens).\n\n"
"Also gets bypassed for camera shutter\n"
"sound.",
};

FirmwareSource nandType = FIRMWARE_SYSNAND;
Expand Down Expand Up @@ -719,6 +900,8 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
{ .visible = nandType == FIRMWARE_EMUNAND },
{ .visible = true },
{ .visible = true },
{ .visible = ISN3DS },
{ .visible = true },
{ .visible = true },
{ .visible = true },
};
Expand Down
4 changes: 3 additions & 1 deletion arm9/source/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#define CONFIG_FILE "config.bin"
#define CONFIG_VERSIONMAJOR 3
#define CONFIG_VERSIONMINOR 1
#define CONFIG_VERSIONMINOR 5

#define BOOTCFG_NAND BOOTCONFIG(0, 7)
#define BOOTCFG_FIRM BOOTCONFIG(3, 7)
Expand All @@ -59,8 +59,10 @@ enum singleOptions
USEEMUFIRM,
LOADEXTFIRMSANDMODULES,
PATCHGAMES,
REDIRECTAPPTHREADS,
PATCHVERSTRING,
SHOWGBABOOT,
FORCEHEADPHONEOUTPUT,
PATCHUNITINFO,
DISABLEARM11EXCHANDLERS,
ENABLESAFEFIRMROSALINA,
Expand Down
Loading

0 comments on commit 8778982

Please sign in to comment.