See merge request ryubing/ryujinx!214
This commit is contained in:
GreemDev
2025-11-11 12:55:36 -06:00
parent 49c70efdd5
commit 6b814fb973
171 changed files with 6011 additions and 6335 deletions

View File

@@ -52,7 +52,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc
service = null;
}
return resultCode.ToHorizonResult();
return resultCode.Horizon;
}
[CmifCommand(2)]
@@ -71,7 +71,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc
service = null;
}
return resultCode.ToHorizonResult();
return resultCode.Horizon;
}
public void Dispose()

View File

@@ -22,19 +22,19 @@ namespace Ryujinx.Horizon.Bcat.Ipc
[CmifCommand(0)]
public Result Open(DirectoryName directoryName)
{
return _libHacService.Get.Open(ref directoryName).ToHorizonResult();
return _libHacService.Get.Open(ref directoryName).Horizon;
}
[CmifCommand(1)]
public Result Read(out int entriesRead, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span<DeliveryCacheDirectoryEntry> entriesBuffer)
{
return _libHacService.Get.Read(out entriesRead, entriesBuffer).ToHorizonResult();
return _libHacService.Get.Read(out entriesRead, entriesBuffer).Horizon;
}
[CmifCommand(2)]
public Result GetCount(out int count)
{
return _libHacService.Get.GetCount(out count).ToHorizonResult();
return _libHacService.Get.GetCount(out count).Horizon;
}
public void Dispose()

View File

@@ -22,25 +22,25 @@ namespace Ryujinx.Horizon.Bcat.Ipc
[CmifCommand(0)]
public Result Open(DirectoryName directoryName, FileName fileName)
{
return _libHacService.Get.Open(ref directoryName, ref fileName).ToHorizonResult();
return _libHacService.Get.Open(ref directoryName, ref fileName).Horizon;
}
[CmifCommand(1)]
public Result Read(long offset, out long bytesRead, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span<byte> data)
{
return _libHacService.Get.Read(out bytesRead, offset, data).ToHorizonResult();
return _libHacService.Get.Read(out bytesRead, offset, data).Horizon;
}
[CmifCommand(2)]
public Result GetSize(out long size)
{
return _libHacService.Get.GetSize(out size).ToHorizonResult();
return _libHacService.Get.GetSize(out size).Horizon;
}
[CmifCommand(3)]
public Result GetDigest(out Digest digest)
{
return _libHacService.Get.GetDigest(out digest).ToHorizonResult();
return _libHacService.Get.GetDigest(out digest).Horizon;
}
public void Dispose()

View File

@@ -35,7 +35,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc
service = null;
}
return resultCode.ToHorizonResult();
return resultCode.Horizon;
}
[CmifCommand(1)]
@@ -54,13 +54,13 @@ namespace Ryujinx.Horizon.Bcat.Ipc
service = null;
}
return resultCode.ToHorizonResult();
return resultCode.Horizon;
}
[CmifCommand(10)]
public Result EnumerateDeliveryCacheDirectory(out int count, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span<DirectoryName> directoryNames)
{
return _libHacService.Get.EnumerateDeliveryCacheDirectory(out count, directoryNames).ToHorizonResult();
return _libHacService.Get.EnumerateDeliveryCacheDirectory(out count, directoryNames).Horizon;
}
public void Dispose()

View File

@@ -4,9 +4,9 @@ namespace Ryujinx.Horizon
{
public static class LibHacResultExtensions
{
public static Result ToHorizonResult(this LibHac.Result result)
extension(LibHac.Result libHacResult)
{
return new Result((int)result.Module, (int)result.Description);
public Result Horizon => new((int)libHacResult.Module, (int)libHacResult.Description);
}
}
}