aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Horizon.cs
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.HLE/HOS/Horizon.cs')
-rw-r--r--Ryujinx.HLE/HOS/Horizon.cs104
1 files changed, 69 insertions, 35 deletions
diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs
index 80c9ef0c..0deb7ac1 100644
--- a/Ryujinx.HLE/HOS/Horizon.cs
+++ b/Ryujinx.HLE/HOS/Horizon.cs
@@ -1,6 +1,9 @@
using LibHac;
using LibHac.Fs;
-using LibHac.Fs.NcaUtils;
+using LibHac.FsService;
+using LibHac.FsSystem;
+using LibHac.FsSystem.NcaUtils;
+using LibHac.Spl;
using Ryujinx.Common.Logging;
using Ryujinx.HLE.FileSystem.Content;
using Ryujinx.HLE.HOS.Font;
@@ -116,6 +119,9 @@ namespace Ryujinx.HLE.HOS
internal long HidBaseAddress { get; private set; }
+ internal FileSystemServer FsServer { get; private set; }
+ internal EmulatedGameCard GameCard { get; private set; }
+
public Horizon(Switch device)
{
ControlData = new Nacp();
@@ -228,6 +234,21 @@ namespace Ryujinx.HLE.HOS
// FIXME: TimeZone shoud be init here but it's actually done in ContentManager
TimeServiceManager.Instance.SetupEphemeralNetworkSystemClock();
+
+ LocalFileSystem serverBaseFs = new LocalFileSystem(device.FileSystem.GetBasePath());
+
+ DefaultFsServerObjects fsServerObjects = DefaultFsServerObjects.GetDefaultEmulatedCreators(serverBaseFs, KeySet);
+
+ GameCard = fsServerObjects.GameCard;
+
+ FileSystemServerConfig fsServerConfig = new FileSystemServerConfig
+ {
+ FsCreators = fsServerObjects.FsCreators,
+ DeviceOperator = fsServerObjects.DeviceOperator,
+ ExternalKeySet = KeySet.ExternalKeySet
+ };
+
+ FsServer = new FileSystemServer(fsServerConfig);
}
public void LoadCart(string exeFsDir, string romFsFile = null)
@@ -283,25 +304,31 @@ namespace Ryujinx.HLE.HOS
XciPartition securePartition = xci.OpenPartition(XciPartitionType.Secure);
- foreach (DirectoryEntry ticketEntry in securePartition.EnumerateEntries("*.tik"))
+ foreach (DirectoryEntryEx ticketEntry in securePartition.EnumerateEntries("/", "*.tik"))
{
- Ticket ticket = new Ticket(securePartition.OpenFile(ticketEntry.FullPath, OpenMode.Read).AsStream());
+ Result result = securePartition.OpenFile(out IFile ticketFile, ticketEntry.FullPath, OpenMode.Read);
- if (!KeySet.TitleKeys.ContainsKey(ticket.RightsId))
+ if (result.IsSuccess())
{
- KeySet.TitleKeys.Add(ticket.RightsId, ticket.GetTitleKey(KeySet));
+ Ticket ticket = new Ticket(ticketFile.AsStream());
+
+ KeySet.ExternalKeySet.Add(new RightsId(ticket.RightsId), new AccessKey(ticket.GetTitleKey(KeySet)));
}
}
- foreach (DirectoryEntry fileEntry in securePartition.EnumerateEntries("*.nca"))
+ foreach (DirectoryEntryEx fileEntry in securePartition.EnumerateEntries("/", "*.nca"))
{
- IStorage ncaStorage = securePartition.OpenFile(fileEntry.FullPath, OpenMode.Read).AsStorage();
+ Result result = securePartition.OpenFile(out IFile ncaFile, fileEntry.FullPath, OpenMode.Read);
+ if (result.IsFailure())
+ {
+ continue;
+ }
- Nca nca = new Nca(KeySet, ncaStorage);
+ Nca nca = new Nca(KeySet, ncaFile.AsStorage());
- if (nca.Header.ContentType == ContentType.Program)
+ if (nca.Header.ContentType == NcaContentType.Program)
{
- int dataIndex = Nca.GetSectionIndexFromType(NcaSectionType.Data, ContentType.Program);
+ int dataIndex = Nca.GetSectionIndexFromType(NcaSectionType.Data, NcaContentType.Program);
if (nca.Header.GetFsHeader(dataIndex).IsPatchSection())
{
@@ -312,7 +339,7 @@ namespace Ryujinx.HLE.HOS
mainNca = nca;
}
}
- else if (nca.Header.ContentType == ContentType.Control)
+ else if (nca.Header.ContentType == NcaContentType.Control)
{
controlNca = nca;
}
@@ -335,11 +362,14 @@ namespace Ryujinx.HLE.HOS
{
IFileSystem controlFs = controlNca.OpenFileSystem(NcaSectionType.Data, FsIntegrityCheckLevel);
- IFile controlFile = controlFs.OpenFile("/control.nacp", OpenMode.Read);
+ Result result = controlFs.OpenFile(out IFile controlFile, "/control.nacp", OpenMode.Read);
- ControlData = new Nacp(controlFile.AsStream());
+ if (result.IsSuccess())
+ {
+ ControlData = new Nacp(controlFile.AsStream());
- TitleName = CurrentTitle = ControlData.Descriptions[(int)State.DesiredTitleLanguage].Title;
+ TitleName = CurrentTitle = ControlData.Descriptions[(int) State.DesiredTitleLanguage].Title;
+ }
}
public void LoadNca(string ncaFile)
@@ -357,13 +387,15 @@ namespace Ryujinx.HLE.HOS
PartitionFileSystem nsp = new PartitionFileSystem(file.AsStorage());
- foreach (DirectoryEntry ticketEntry in nsp.EnumerateEntries("*.tik"))
+ foreach (DirectoryEntryEx ticketEntry in nsp.EnumerateEntries("/", "*.tik"))
{
- Ticket ticket = new Ticket(nsp.OpenFile(ticketEntry.FullPath, OpenMode.Read).AsStream());
+ Result result = nsp.OpenFile(out IFile ticketFile, ticketEntry.FullPath, OpenMode.Read);
- if (!KeySet.TitleKeys.ContainsKey(ticket.RightsId))
+ if (result.IsSuccess())
{
- KeySet.TitleKeys.Add(ticket.RightsId, ticket.GetTitleKey(KeySet));
+ Ticket ticket = new Ticket(ticketFile.AsStream());
+
+ KeySet.ExternalKeySet.Add(new RightsId(ticket.RightsId), new AccessKey(ticket.GetTitleKey(KeySet)));
}
}
@@ -371,15 +403,15 @@ namespace Ryujinx.HLE.HOS
Nca patchNca = null;
Nca controlNca = null;
- foreach (DirectoryEntry fileEntry in nsp.EnumerateEntries("*.nca"))
+ foreach (DirectoryEntryEx fileEntry in nsp.EnumerateEntries("/", "*.nca"))
{
- IStorage ncaStorage = nsp.OpenFile(fileEntry.FullPath, OpenMode.Read).AsStorage();
+ nsp.OpenFile(out IFile ncaFile, fileEntry.FullPath, OpenMode.Read).ThrowIfFailure();
- Nca nca = new Nca(KeySet, ncaStorage);
+ Nca nca = new Nca(KeySet, ncaFile.AsStorage());
- if (nca.Header.ContentType == ContentType.Program)
+ if (nca.Header.ContentType == NcaContentType.Program)
{
- int dataIndex = Nca.GetSectionIndexFromType(NcaSectionType.Data, ContentType.Program);
+ int dataIndex = Nca.GetSectionIndexFromType(NcaSectionType.Data, NcaContentType.Program);
if (nca.Header.GetFsHeader(dataIndex).IsPatchSection())
{
@@ -390,7 +422,7 @@ namespace Ryujinx.HLE.HOS
mainNca = nca;
}
}
- else if (nca.Header.ContentType == ContentType.Control)
+ else if (nca.Header.ContentType == NcaContentType.Control)
{
controlNca = nca;
}
@@ -409,7 +441,7 @@ namespace Ryujinx.HLE.HOS
public void LoadNca(Nca mainNca, Nca patchNca, Nca controlNca)
{
- if (mainNca.Header.ContentType != ContentType.Program)
+ if (mainNca.Header.ContentType != NcaContentType.Program)
{
Logger.PrintError(LogClass.Loader, "Selected NCA is not a \"Program\" NCA");
@@ -466,7 +498,7 @@ namespace Ryujinx.HLE.HOS
{
IFileSystem controlRomfs = controlNca.OpenFileSystem(NcaSectionType.Data, FsIntegrityCheckLevel);
- IFile controlFile = controlRomfs.OpenFile("/control.nacp", OpenMode.Read);
+ controlRomfs.OpenFile(out IFile controlFile, "/control.nacp", OpenMode.Read).ThrowIfFailure();
Nacp controlData = new Nacp(controlFile.AsStream());
@@ -493,24 +525,24 @@ namespace Ryujinx.HLE.HOS
private void LoadExeFs(IFileSystem codeFs, out Npdm metaData)
{
- if (codeFs.FileExists("/main.npdm"))
- {
- Logger.PrintInfo(LogClass.Loader, "Loading main.npdm...");
+ Result result = codeFs.OpenFile(out IFile npdmFile, "/main.npdm", OpenMode.Read);
- metaData = new Npdm(codeFs.OpenFile("/main.npdm", OpenMode.Read).AsStream());
- }
- else
+ if (result == ResultFs.PathNotFound)
{
Logger.PrintWarning(LogClass.Loader, "NPDM file not found, using default values!");
metaData = GetDefaultNpdm();
}
+ else
+ {
+ metaData = new Npdm(npdmFile.AsStream());
+ }
List<IExecutable> staticObjects = new List<IExecutable>();
void LoadNso(string filename)
{
- foreach (DirectoryEntry file in codeFs.EnumerateEntries($"{filename}*"))
+ foreach (DirectoryEntryEx file in codeFs.EnumerateEntries("/", $"{filename}*"))
{
if (Path.GetExtension(file.Name) != string.Empty)
{
@@ -519,7 +551,9 @@ namespace Ryujinx.HLE.HOS
Logger.PrintInfo(LogClass.Loader, $"Loading {file.Name}...");
- NxStaticObject staticObject = new NxStaticObject(codeFs.OpenFile(file.FullPath, OpenMode.Read).AsStream());
+ codeFs.OpenFile(out IFile nsoFile, file.FullPath, OpenMode.Read).ThrowIfFailure();
+
+ NxStaticObject staticObject = new NxStaticObject(nsoFile.AsStream());
staticObjects.Add(staticObject);
}
@@ -654,7 +688,7 @@ namespace Ryujinx.HLE.HOS
LoadSetAtPath(Path.Combine(home, ".switch"));
LoadSetAtPath(Device.FileSystem.GetSystemPath());
- KeySet = ExternalKeys.ReadKeyFile(keyFile, titleKeyFile, consoleKeyFile);
+ KeySet = ExternalKeyReader.ReadKeyFile(keyFile, titleKeyFile, consoleKeyFile);
void LoadSetAtPath(string basePath)
{
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-31 00:13:02 +0000