mirror of
https://git.zaroz.cloud/nintendo-back-up/Ryujinx.git
synced 2026-01-11 05:04:48 +00:00
[Ryujinx.Horizon] Address dotnet-format issues (#5381)
* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Address dotnet format CA1822 warnings * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Revert formatting changes for while and for-loops * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Add comments to disabled warnings * Remove a few unused parameters * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Address IDE0251 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Add trailing commas and fix formatting issues * Convert if-else chain to switch block * Address review feedback
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
using Ryujinx.Horizon.Bcat.Ipc;
|
||||
using Ryujinx.Horizon.Bcat.Types;
|
||||
using Ryujinx.Horizon.Bcat.Types;
|
||||
using Ryujinx.Horizon.Sdk.Sf.Hipc;
|
||||
using Ryujinx.Horizon.Sdk.Sm;
|
||||
|
||||
@@ -8,7 +7,7 @@ namespace Ryujinx.Horizon.Bcat
|
||||
internal class BcatIpcServer
|
||||
{
|
||||
private const int BcatMaxSessionsCount = 8;
|
||||
private const int BcatTotalMaxSessionsCount = BcatMaxSessionsCount * 4;
|
||||
private const int BcatTotalMaxSessionsCount = BcatMaxSessionsCount * 4;
|
||||
|
||||
private const int PointerBufferSize = 0x400;
|
||||
private const int MaxDomains = 64;
|
||||
@@ -29,10 +28,12 @@ namespace Ryujinx.Horizon.Bcat
|
||||
|
||||
_serverManager = new BcatServerManager(allocator, _sm, MaxPortsCount, _bcatManagerOptions, BcatTotalMaxSessionsCount);
|
||||
|
||||
#pragma warning disable IDE0055 // Disable formatting
|
||||
_serverManager.RegisterServer((int)BcatPortIndex.Admin, ServiceName.Encode("bcat:a"), BcatMaxSessionsCount);
|
||||
_serverManager.RegisterServer((int)BcatPortIndex.Manager, ServiceName.Encode("bcat:m"), BcatMaxSessionsCount);
|
||||
_serverManager.RegisterServer((int)BcatPortIndex.User, ServiceName.Encode("bcat:u"), BcatMaxSessionsCount);
|
||||
_serverManager.RegisterServer((int)BcatPortIndex.System, ServiceName.Encode("bcat:s"), BcatMaxSessionsCount);
|
||||
#pragma warning restore IDE0055
|
||||
}
|
||||
|
||||
public void ServiceRequests()
|
||||
|
||||
@@ -1,11 +1,4 @@
|
||||
using Ryujinx.Horizon.LogManager;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Ryujinx.Horizon.Bcat
|
||||
namespace Ryujinx.Horizon.Bcat
|
||||
{
|
||||
internal class BcatMain : IService
|
||||
{
|
||||
|
||||
@@ -17,12 +17,12 @@ namespace Ryujinx.Horizon.Bcat
|
||||
{
|
||||
return (BcatPortIndex)portIndex switch
|
||||
{
|
||||
BcatPortIndex.Admin => AcceptImpl(server, new ServiceCreator("bcat:a", BcatServicePermissionLevel.Admin)),
|
||||
BcatPortIndex.Admin => AcceptImpl(server, new ServiceCreator("bcat:a", BcatServicePermissionLevel.Admin)),
|
||||
BcatPortIndex.Manager => AcceptImpl(server, new ServiceCreator("bcat:m", BcatServicePermissionLevel.Manager)),
|
||||
BcatPortIndex.User => AcceptImpl(server, new ServiceCreator("bcat:u", BcatServicePermissionLevel.User)),
|
||||
BcatPortIndex.System => AcceptImpl(server, new ServiceCreator("bcat:s", BcatServicePermissionLevel.System)),
|
||||
_ => throw new ArgumentOutOfRangeException(nameof(portIndex)),
|
||||
BcatPortIndex.User => AcceptImpl(server, new ServiceCreator("bcat:u", BcatServicePermissionLevel.User)),
|
||||
BcatPortIndex.System => AcceptImpl(server, new ServiceCreator("bcat:s", BcatServicePermissionLevel.System)),
|
||||
_ => throw new ArgumentOutOfRangeException(nameof(portIndex)),
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,12 +7,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc
|
||||
{
|
||||
partial class BcatService : IBcatService
|
||||
{
|
||||
private readonly BcatServicePermissionLevel _permissionLevel;
|
||||
|
||||
public BcatService(BcatServicePermissionLevel permissionLevel)
|
||||
{
|
||||
_permissionLevel = permissionLevel;
|
||||
}
|
||||
public BcatService(BcatServicePermissionLevel permissionLevel) { }
|
||||
|
||||
[CmifCommand(10100)]
|
||||
public Result RequestSyncDeliveryCache(out IDeliveryCacheProgressService deliveryCacheProgressService)
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc
|
||||
}
|
||||
|
||||
[CmifCommand(1)]
|
||||
public Result Read(out int entriesRead, [Buffer(Sdk.Sf.Hipc.HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span<DeliveryCacheDirectoryEntry> entriesBuffer)
|
||||
public Result Read(out int entriesRead, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span<DeliveryCacheDirectoryEntry> entriesBuffer)
|
||||
{
|
||||
return _libHacService.Get.Read(out entriesRead, entriesBuffer).ToHorizonResult();
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc
|
||||
[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).ToHorizonResult();
|
||||
}
|
||||
|
||||
[CmifCommand(2)]
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace Ryujinx.Horizon.Bcat.Ipc
|
||||
deliveryCacheProgressImpl = new DeliveryCacheProgressImpl
|
||||
{
|
||||
State = DeliveryCacheProgressImpl.Status.Done,
|
||||
Result = 0
|
||||
Result = 0,
|
||||
};
|
||||
|
||||
Logger.Stub?.PrintStub(LogClass.ServiceBcat);
|
||||
|
||||
@@ -8,11 +8,11 @@ namespace Ryujinx.Horizon.Bcat.Ipc.Types
|
||||
public enum Status
|
||||
{
|
||||
// TODO: determine other values
|
||||
Done = 9
|
||||
Done = 9,
|
||||
}
|
||||
|
||||
public Status State;
|
||||
public uint Result;
|
||||
public uint Result;
|
||||
// TODO: reverse the rest of the structure
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,6 @@
|
||||
Admin,
|
||||
Manager,
|
||||
User,
|
||||
System
|
||||
System,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
{
|
||||
enum BcatServicePermissionLevel
|
||||
{
|
||||
Admin = -1,
|
||||
User = 1,
|
||||
System = 2,
|
||||
Manager = 6
|
||||
Admin = -1,
|
||||
User = 1,
|
||||
System = 2,
|
||||
Manager = 6,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user