MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Add Firmware keyword in log if it is indeed firmware #343

Merged
WilliamWsyHK merged 8 commits from enhancement/firmware-text-log into master 2024-12-07 10:03:01 +00:00
Conversation 6 Commits 8 Files Changed 7 +15 -5
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a7f8eb4381 - Show all commits

20
src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs
View File

@ -84,15 +84,25 @@ namespace Ryujinx.HLE.Loaders.Processes
return false;
}
bool isGame = ProgramId > 0x0100000000007FFF;
bool IsFirmware(ulong programId)
{
return programId switch
{
>= 0x0100000000000819 and <= 0x010000000000081C => true,
_ => false
};
}
bool isFirmware = IsFirmware(ProgramId);
bool isMiiEdit = ProgramId == 0x0100000000001009;
string name = isGame || !string.IsNullOrWhiteSpace(Name)
? Name
string name = !isFirmware
? isMiiEdit ? "miiEdit from Firmware" : (!string.IsNullOrWhiteSpace(Name) ? Name : "<Unknown Name>")
: "Firmware";
// TODO: LibHac npdm currently doesn't support version field.
string version = isGame || !string.IsNullOrWhiteSpace(DisplayVersion)
? DisplayVersion
string version = !isFirmware && !isMiiEdit
? (!string.IsNullOrWhiteSpace(DisplayVersion) ? DisplayVersion : "<Unknown Version>")
: device.System.ContentManager.GetCurrentFirmwareVersion()?.VersionString ?? "?";
Logger.Info?.Print(LogClass.Loader, $"Application Loaded: {name} v{version} [{ProgramIdText}] [{(Is64Bit ? "64-bit" : "32-bit")}]");