aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Horizon/Sm
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-07-01 12:42:10 +0200
committerGitHub <noreply@github.com>2023-07-01 12:42:10 +0200
commit02b5c7ea89bb6aae1c214b78fb1047872382dc43 (patch)
treea115799d95dd6214afcdfa805dce2362d80382f2 /src/Ryujinx.Horizon/Sm
parent801b71a12883f8a104c699a92a9aa997e2a6d609 (diff)
[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
Diffstat (limited to 'src/Ryujinx.Horizon/Sm')
-rw-r--r--src/Ryujinx.Horizon/Sm/Impl/ServiceInfo.cs10
-rw-r--r--src/Ryujinx.Horizon/Sm/Impl/ServiceManager.cs12
-rw-r--r--src/Ryujinx.Horizon/Sm/Ipc/UserService.cs6
-rw-r--r--src/Ryujinx.Horizon/Sm/SmMain.cs10
-rw-r--r--src/Ryujinx.Horizon/Sm/SmResult.cs4
-rw-r--r--src/Ryujinx.Horizon/Sm/SmServerManager.cs6
-rw-r--r--src/Ryujinx.Horizon/Sm/Types/SmPortIndex.cs4
7 files changed, 26 insertions, 26 deletions
diff --git a/src/Ryujinx.Horizon/Sm/Impl/ServiceInfo.cs b/src/Ryujinx.Horizon/Sm/Impl/ServiceInfo.cs
index 50c18a2c..fed420aa 100644
--- a/src/Ryujinx.Horizon/Sm/Impl/ServiceInfo.cs
+++ b/src/Ryujinx.Horizon/Sm/Impl/ServiceInfo.cs
@@ -5,16 +5,16 @@ namespace Ryujinx.Horizon.Sm.Impl
struct ServiceInfo
{
public ServiceName Name;
- public ulong OwnerProcessId;
- public int PortHandle;
+ public ulong OwnerProcessId;
+ public int PortHandle;
public void Free()
{
HorizonStatic.Syscall.CloseHandle(PortHandle);
- Name = ServiceName.Invalid;
+ Name = ServiceName.Invalid;
OwnerProcessId = 0L;
- PortHandle = 0;
+ PortHandle = 0;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Horizon/Sm/Impl/ServiceManager.cs b/src/Ryujinx.Horizon/Sm/Impl/ServiceManager.cs
index d1f94267..929474aa 100644
--- a/src/Ryujinx.Horizon/Sm/Impl/ServiceManager.cs
+++ b/src/Ryujinx.Horizon/Sm/Impl/ServiceManager.cs
@@ -40,7 +40,7 @@ namespace Ryujinx.Horizon.Sm.Impl
return result == KernelResult.SessionCountExceeded ? SmResult.OutOfSessions : result;
}
- private Result GetServiceImpl(out int handle, ref ServiceInfo serviceInfo)
+ private static Result GetServiceImpl(out int handle, ref ServiceInfo serviceInfo)
{
return HorizonStatic.Syscall.ConnectToPort(out handle, serviceInfo.PortHandle);
}
@@ -96,8 +96,8 @@ namespace Ryujinx.Horizon.Sm.Impl
return result;
}
- freeService.PortHandle = clientPort;
- freeService.Name = name;
+ freeService.PortHandle = clientPort;
+ freeService.Name = name;
freeService.OwnerProcessId = processId;
return Result.Success;
@@ -140,7 +140,7 @@ namespace Ryujinx.Horizon.Sm.Impl
int nameLength = 1;
- for (; nameLength < name.Length; nameLength++)
+ for (; nameLength < ServiceName.Length; nameLength++)
{
if (name[nameLength] == 0)
{
@@ -148,7 +148,7 @@ namespace Ryujinx.Horizon.Sm.Impl
}
}
- while (nameLength < name.Length)
+ while (nameLength < ServiceName.Length)
{
if (name[nameLength++] != 0)
{
@@ -182,4 +182,4 @@ namespace Ryujinx.Horizon.Sm.Impl
return -1;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Horizon/Sm/Ipc/UserService.cs b/src/Ryujinx.Horizon/Sm/Ipc/UserService.cs
index d093913a..868a15e6 100644
--- a/src/Ryujinx.Horizon/Sm/Ipc/UserService.cs
+++ b/src/Ryujinx.Horizon/Sm/Ipc/UserService.cs
@@ -10,7 +10,7 @@ namespace Ryujinx.Horizon.Sm.Ipc
private readonly ServiceManager _serviceManager;
private ulong _clientProcessId;
- private bool _initialized;
+ private bool _initialized;
public UserService(ServiceManager serviceManager)
{
@@ -21,7 +21,7 @@ namespace Ryujinx.Horizon.Sm.Ipc
public Result Initialize([ClientProcessId] ulong clientProcessId)
{
_clientProcessId = clientProcessId;
- _initialized = true;
+ _initialized = true;
return Result.Success;
}
@@ -63,4 +63,4 @@ namespace Ryujinx.Horizon.Sm.Ipc
return _serviceManager.UnregisterService(_clientProcessId, name);
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Horizon/Sm/SmMain.cs b/src/Ryujinx.Horizon/Sm/SmMain.cs
index f0b4d330..7303847a 100644
--- a/src/Ryujinx.Horizon/Sm/SmMain.cs
+++ b/src/Ryujinx.Horizon/Sm/SmMain.cs
@@ -1,6 +1,4 @@
-using Ryujinx.Horizon.Prepo;
-using Ryujinx.Horizon.Prepo.Types;
-using Ryujinx.Horizon.Sdk.Sf.Hipc;
+using Ryujinx.Horizon.Sdk.Sf.Hipc;
using Ryujinx.Horizon.Sdk.Sm;
using Ryujinx.Horizon.Sm.Impl;
using Ryujinx.Horizon.Sm.Types;
@@ -9,8 +7,8 @@ namespace Ryujinx.Horizon.Sm
{
public class SmMain
{
- private const int SmMaxSessionsCount = 64;
- private const int SmmMaxSessionsCount = 1;
+ private const int SmMaxSessionsCount = 64;
+ private const int SmmMaxSessionsCount = 1;
private const int SmTotalMaxSessionsCount = SmMaxSessionsCount + SmmMaxSessionsCount;
private const int MaxPortsCount = 2;
@@ -31,4 +29,4 @@ namespace Ryujinx.Horizon.Sm
_serverManager.ServiceRequests();
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Horizon/Sm/SmResult.cs b/src/Ryujinx.Horizon/Sm/SmResult.cs
index 2d503a4f..75f47ca9 100644
--- a/src/Ryujinx.Horizon/Sm/SmResult.cs
+++ b/src/Ryujinx.Horizon/Sm/SmResult.cs
@@ -6,6 +6,7 @@ namespace Ryujinx.Horizon.Sm
{
private const int ModuleId = 21;
+#pragma warning disable IDE0055 // Disable formatting
public static Result OutOfProcess => new(ModuleId, 1);
public static Result InvalidClient => new(ModuleId, 2);
public static Result OutOfSessions => new(ModuleId, 3);
@@ -15,5 +16,6 @@ namespace Ryujinx.Horizon.Sm
public static Result NotRegistered => new(ModuleId, 7);
public static Result NotAllowed => new(ModuleId, 8);
public static Result TooLargeAccessControl => new(ModuleId, 9);
+#pragma warning restore IDE0055
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Horizon/Sm/SmServerManager.cs b/src/Ryujinx.Horizon/Sm/SmServerManager.cs
index dc8dc5b6..c0412345 100644
--- a/src/Ryujinx.Horizon/Sm/SmServerManager.cs
+++ b/src/Ryujinx.Horizon/Sm/SmServerManager.cs
@@ -21,10 +21,10 @@ namespace Ryujinx.Horizon.Sm
{
return (SmPortIndex)portIndex switch
{
- SmPortIndex.User => AcceptImpl(server, new UserService(_serviceManager)),
+ SmPortIndex.User => AcceptImpl(server, new UserService(_serviceManager)),
SmPortIndex.Manager => AcceptImpl(server, new ManagerService()),
- _ => throw new ArgumentOutOfRangeException(nameof(portIndex)),
+ _ => throw new ArgumentOutOfRangeException(nameof(portIndex)),
};
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.Horizon/Sm/Types/SmPortIndex.cs b/src/Ryujinx.Horizon/Sm/Types/SmPortIndex.cs
index 5325558b..a2977856 100644
--- a/src/Ryujinx.Horizon/Sm/Types/SmPortIndex.cs
+++ b/src/Ryujinx.Horizon/Sm/Types/SmPortIndex.cs
@@ -3,6 +3,6 @@
enum SmPortIndex
{
User,
- Manager
+ Manager,
}
-} \ No newline at end of file
+}