deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add Bcat.DirectoryName and Resolved conflicts between new DirectoryName type and LibHac.Bcat.DirectoryName type

Browse source
This commit is contained in:
Yohoki 2024-05-06 20:22:32 -05:00
parent 047418ca1f
commit d34f7b0b64
9 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/BcatService.cs
View file

@ -18,7 +18,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc
} }
[CmifCommand(10101)] [CmifCommand(10101)]
public Result RequestSyncDeliveryCacheWithDirectoryName(out IDeliveryCacheProgressService deliveryCacheProgressService, LibHac.Bcat.DirectoryName arg1) public Result RequestSyncDeliveryCacheWithDirectoryName(out IDeliveryCacheProgressService deliveryCacheProgressService, DirectoryName directoryName)
{ {
// Just have the network request fail and pretend that everything is fine. // Just have the network request fail and pretend that everything is fine.
deliveryCacheProgressService = new DeliveryCacheProgressService(); deliveryCacheProgressService = new DeliveryCacheProgressService();

2
src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheDirectoryService.cs
View file

@ -20,7 +20,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc
} }
[CmifCommand(0)] [CmifCommand(0)]
public Result Open(DirectoryName directoryName) public Result Open(LibHac.Bcat.DirectoryName directoryName)
{ {
return _libHacService.Get.Open(ref directoryName).ToHorizonResult(); return _libHacService.Get.Open(ref directoryName).ToHorizonResult();
} }

2
src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheFileService.cs
View file

@ -20,7 +20,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc
} }
[CmifCommand(0)] [CmifCommand(0)]
public Result Open(DirectoryName directoryName, FileName fileName) public Result Open(LibHac.Bcat.DirectoryName directoryName, FileName fileName)
{ {
return _libHacService.Get.Open(ref directoryName, ref fileName).ToHorizonResult(); return _libHacService.Get.Open(ref directoryName, ref fileName).ToHorizonResult();
} }

2
src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheStorageService.cs
View file

@ -58,7 +58,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc
} }
[CmifCommand(10)] [CmifCommand(10)]
public Result EnumerateDeliveryCacheDirectory(out int count, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span<DirectoryName> directoryNames) public Result EnumerateDeliveryCacheDirectory(out int count, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span<LibHac.Bcat.DirectoryName> directoryNames)
{ {
return _libHacService.Get.EnumerateDeliveryCacheDirectory(out count, directoryNames).ToHorizonResult(); return _libHacService.Get.EnumerateDeliveryCacheDirectory(out count, directoryNames).ToHorizonResult();
} }

9
src/Ryujinx.Horizon/Sdk/Bcat/DirectoryName.cs Normal file
View file

@ -0,0 +1,9 @@
using System.Runtime.InteropServices;
namespace Ryujinx.Horizon.Sdk.Bcat
{
[StructLayout(LayoutKind.Sequential, Size = 0x20, Pack = 0x1)]
struct DirectoryName
{
}
}

2
src/Ryujinx.Horizon/Sdk/Bcat/IBcatService.cs
View file

@ -6,6 +6,6 @@ namespace Ryujinx.Horizon.Sdk.Bcat
internal interface IBcatService : IServiceObject internal interface IBcatService : IServiceObject
{ {
Result RequestSyncDeliveryCache(out IDeliveryCacheProgressService deliveryCacheProgressService); Result RequestSyncDeliveryCache(out IDeliveryCacheProgressService deliveryCacheProgressService);
Result RequestSyncDeliveryCacheWithDirectoryName(out IDeliveryCacheProgressService deliveryCacheProgressService, LibHac.Bcat.DirectoryName arg1); Result RequestSyncDeliveryCacheWithDirectoryName(out IDeliveryCacheProgressService deliveryCacheProgressService, DirectoryName directoryName);
} }
} }

2
src/Ryujinx.Horizon/Sdk/Bcat/IDeliveryCacheDirectoryService.cs
View file

@ -8,7 +8,7 @@ namespace Ryujinx.Horizon.Sdk.Bcat
internal interface IDeliveryCacheDirectoryService : IServiceObject internal interface IDeliveryCacheDirectoryService : IServiceObject
{ {
Result GetCount(out int count); Result GetCount(out int count);
Result Open(DirectoryName directoryName); Result Open(LibHac.Bcat.DirectoryName directoryName);
Result Read(out int entriesRead, Span<DeliveryCacheDirectoryEntry> entriesBuffer); Result Read(out int entriesRead, Span<DeliveryCacheDirectoryEntry> entriesBuffer);
} }
} }

2
src/Ryujinx.Horizon/Sdk/Bcat/IDeliveryCacheFileService.cs
View file

@ -9,7 +9,7 @@ namespace Ryujinx.Horizon.Sdk.Bcat
{ {
Result GetDigest(out Digest digest); Result GetDigest(out Digest digest);
Result GetSize(out long size); Result GetSize(out long size);
Result Open(DirectoryName directoryName, FileName fileName); Result Open(LibHac.Bcat.DirectoryName directoryName, FileName fileName);
Result Read(long offset, out long bytesRead, Span<byte> data); Result Read(long offset, out long bytesRead, Span<byte> data);
} }
} }

2
src/Ryujinx.Horizon/Sdk/Bcat/IDeliveryCacheStorageService.cs
View file

@ -9,6 +9,6 @@ namespace Ryujinx.Horizon.Sdk.Bcat
{ {
Result CreateDirectoryService(out IDeliveryCacheDirectoryService service); Result CreateDirectoryService(out IDeliveryCacheDirectoryService service);
Result CreateFileService(out IDeliveryCacheFileService service); Result CreateFileService(out IDeliveryCacheFileService service);
Result EnumerateDeliveryCacheDirectory(out int count, Span<DirectoryName> directoryNames); Result EnumerateDeliveryCacheDirectory(out int count, Span<LibHac.Bcat.DirectoryName> directoryNames);
} }
} }