Added build source identifiers to key areas.

This commit is contained in:
Steven Mattera 2018-12-01 23:04:51 -05:00
parent d4deffbb56
commit e127bd29db
3 changed files with 17 additions and 3 deletions

View File

@ -292,7 +292,12 @@ void CrashReport::SaveReport() {
void CrashReport::SaveToFile(FILE *f_report) {
char buf[0x10] = {0};
fprintf(f_report, "Atmosphère Crash Report (v1.2):\n");
#ifdef ATMOSPHERE_BUILD_SOURCE
fprintf(f_report, "Atmosphère Crash Report (v1.2 [%s]):\n", ATMOSPHERE_BUILD_SOURCE);
#else
fprintf(f_report, "Atmosphère Crash Report (v1.2):\n");
#endif
fprintf(f_report, "Result: 0x%X (2%03d-%04d)\n\n", this->result, R_MODULE(this->result), R_DESCRIPTION(this->result));
/* Process Info. */

View File

@ -208,7 +208,11 @@ Result ShowFatalTask::ShowFatal() {
FontManager::AddSpacingLines(0.5f);
FontManager::PrintFormatLine("Title: %016lX", this->title_id);
FontManager::AddSpacingLines(0.5f);
FontManager::PrintFormatLine(u8"Firmware: %s (Atmosphère %u.%u.%u-%s)", GetFatalConfig()->firmware_version.display_version, CURRENT_ATMOSPHERE_VERSION, GetAtmosphereGitRevision());
#ifdef ATMOSPHERE_BUILD_SOURCE
FontManager::PrintFormatLine(u8"Firmware: %s (Atmosphère %u.%u.%u-%s [%s])", GetFatalConfig()->firmware_version.display_version, CURRENT_ATMOSPHERE_VERSION, GetAtmosphereGitRevision(), ATMOSPHERE_BUILD_SOURCE);
#else
FontManager::PrintFormatLine(u8"Firmware: %s (Atmosphère %u.%u.%u-%s)", GetFatalConfig()->firmware_version.display_version, CURRENT_ATMOSPHERE_VERSION, GetAtmosphereGitRevision());
#endif
FontManager::AddSpacingLines(1.5f);
if (this->ctx->error_code != 0xCAFEF) {
FontManager::Print(config->error_desc);

View File

@ -36,7 +36,12 @@ static Result _GetFirmwareVersion(SetSysFirmwareVersion *out) {
char display_version[sizeof(g_fw_version.display_version)] = {0};
GetAtmosphereApiVersion(&major, &minor, &micro, nullptr, nullptr);
snprintf(display_version, sizeof(display_version), "%s (AMS %u.%u.%u)", g_fw_version.display_version, major, minor, micro);
#ifdef ATMOSPHERE_BUILD_SOURCE
snprintf(display_version, sizeof(display_version), "%s (AMS %u.%u.%u [%s])", g_fw_version.display_version, major, minor, micro, ATMOSPHERE_BUILD_SOURCE);
#else
snprintf(display_version, sizeof(display_version), "%s (AMS %u.%u.%u)", g_fw_version.display_version, major, minor, micro);
#endif
memcpy(g_fw_version.display_version, display_version, sizeof(g_fw_version.display_version));
}