From 02b5c7ea89bb6aae1c214b78fb1047872382dc43 Mon Sep 17 00:00:00 2001 From: TSRBerry <20988865+TSRBerry@users.noreply.github.com> Date: Sat, 1 Jul 2023 12:42:10 +0200 Subject: [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 --- src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/BcatService.cs | 7 +------ .../Bcat/Ipc/ServiceCreator/DeliveryCacheDirectoryService.cs | 2 +- .../Bcat/Ipc/ServiceCreator/DeliveryCacheFileService.cs | 2 +- .../Bcat/Ipc/ServiceCreator/DeliveryCacheProgressService.cs | 2 +- .../Bcat/Ipc/ServiceCreator/Types/DeliveryCacheProgressImpl.cs | 4 ++-- 5 files changed, 6 insertions(+), 11 deletions(-) (limited to 'src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator') diff --git a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/BcatService.cs b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/BcatService.cs index e82f597e..9ea2dc11 100644 --- a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/BcatService.cs +++ b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/BcatService.cs @@ -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) diff --git a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheDirectoryService.cs b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheDirectoryService.cs index dd13eefb..c8b38c28 100644 --- a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheDirectoryService.cs +++ b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheDirectoryService.cs @@ -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 entriesBuffer) + public Result Read(out int entriesRead, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span entriesBuffer) { return _libHacService.Get.Read(out entriesRead, entriesBuffer).ToHorizonResult(); } diff --git a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheFileService.cs b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheFileService.cs index d23f5f41..a26c3258 100644 --- a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheFileService.cs +++ b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheFileService.cs @@ -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 data) { - return _libHacService.Get.Read(out bytesRead, offset, data).ToHorizonResult(); + return _libHacService.Get.Read(out bytesRead, offset, data).ToHorizonResult(); } [CmifCommand(2)] diff --git a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheProgressService.cs b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheProgressService.cs index 91aa2686..578c18f4 100644 --- a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheProgressService.cs +++ b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/DeliveryCacheProgressService.cs @@ -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); diff --git a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/Types/DeliveryCacheProgressImpl.cs b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/Types/DeliveryCacheProgressImpl.cs index 10e0b54f..9e5274a6 100644 --- a/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/Types/DeliveryCacheProgressImpl.cs +++ b/src/Ryujinx.Horizon/Bcat/Ipc/ServiceCreator/Types/DeliveryCacheProgressImpl.cs @@ -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 } } -- cgit v1.2.3