aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.HLE/HOS/Services/Spl
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-07-16 19:31:14 +0200
committerGitHub <noreply@github.com>2023-07-16 19:31:14 +0200
commit326749498bed4360e5a4b11fc67d5ec7cb9a3076 (patch)
treeae21fb26f99b401ca4e9efaab72b679a81c22369 /src/Ryujinx.HLE/HOS/Services/Spl
parentfec8291c17fa106c28f58b56419e90d49a41a1ea (diff)
[Ryujinx.HLE] Address dotnet-format issues (#5380)
* 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 or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2208 warnings * Address or silence dotnet format CA1806 and a few CA1854 warnings * Address dotnet format CA2211 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address or silence dotnet format CA2211 warnings * Address review comments * Address dotnet format CA2208 warnings properly * Make ProcessResult readonly * 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 * Add previously silenced warnings back I have no clue how these disappeared * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix a few disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Run dotnet format after rebase * Use using declaration instead of block syntax * Address IDE0251 warnings * Address a few disabled IDE0060 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 * Fix naming rule violations * Fix typo * Add trailing commas, use targeted new and use array initializer * Fix build issues * Fix remaining build issues * Remove SuppressMessage for CA1069 where possible * Address dotnet format issues * Address formatting issues Co-authored-by: Ac_K <acoustik666@gmail.com> * Add GetHashCode implementation for RenderingSurfaceInfo * Explicitly silence CA1822 for every affected method in Syscall * Address formatting issues in Demangler.cs * Address review feedback Co-authored-by: Ac_K <acoustik666@gmail.com> * Revert marking service methods as static * Next dotnet format pass * Address review feedback --------- Co-authored-by: Ac_K <acoustik666@gmail.com>
Diffstat (limited to 'src/Ryujinx.HLE/HOS/Services/Spl')
-rw-r--r--src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs14
-rw-r--r--src/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs6
-rw-r--r--src/Ryujinx.HLE/HOS/Services/Spl/ResultCode.cs6
-rw-r--r--src/Ryujinx.HLE/HOS/Services/Spl/Types/ConfigItem.cs34
-rw-r--r--src/Ryujinx.HLE/HOS/Services/Spl/Types/DramId.cs4
-rw-r--r--src/Ryujinx.HLE/HOS/Services/Spl/Types/HardwareState.cs4
-rw-r--r--src/Ryujinx.HLE/HOS/Services/Spl/Types/HardwareType.cs2
-rw-r--r--src/Ryujinx.HLE/HOS/Services/Spl/Types/SmcResult.cs23
8 files changed, 46 insertions, 47 deletions
diff --git a/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs b/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs
index aa350b73..951ed530 100644
--- a/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs
@@ -58,8 +58,10 @@ namespace Ryujinx.HLE.HOS.Services.Spl
{
configValue = default;
- SystemVersion version = context.Device.System.ContentManager.GetCurrentFirmwareVersion();
- MemorySize memorySize = context.Device.Configuration.MemoryConfiguration.ToKernelMemorySize();
+#pragma warning disable IDE0059 // Remove unnecessary value assignment
+ SystemVersion version = context.Device.System.ContentManager.GetCurrentFirmwareVersion();
+#pragma warning restore IDE0059
+ MemorySize memorySize = context.Device.Configuration.MemoryConfiguration.ToKernelMemorySize();
switch (configItem)
{
@@ -80,9 +82,9 @@ namespace Ryujinx.HLE.HOS.Services.Spl
configValue = (ulong)DramId.IcosaSamsung4GiB;
}
break;
- case ConfigItem.SecurityEngineInterruptNumber:
+ case ConfigItem.SecurityEngineInterruptNumber:
return SmcResult.NotImplemented;
- case ConfigItem.FuseVersion:
+ case ConfigItem.FuseVersion:
return SmcResult.NotImplemented;
case ConfigItem.HardwareType:
configValue = (ulong)HardwareType.Icosa;
@@ -93,7 +95,7 @@ namespace Ryujinx.HLE.HOS.Services.Spl
case ConfigItem.IsRecoveryBoot:
configValue = 0;
break;
- case ConfigItem.DeviceId:
+ case ConfigItem.DeviceId:
return SmcResult.NotImplemented;
case ConfigItem.BootReason:
// This was removed in firmware 4.0.0.
@@ -123,4 +125,4 @@ namespace Ryujinx.HLE.HOS.Services.Spl
return SmcResult.Success;
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs b/src/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs
index db224163..922fd34a 100644
--- a/src/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs
@@ -5,9 +5,7 @@ namespace Ryujinx.HLE.HOS.Services.Spl
[Service("csrng")]
class IRandomInterface : DisposableIpcService
{
- private RandomNumberGenerator _rng;
-
- private readonly object _lock = new();
+ private readonly RandomNumberGenerator _rng;
public IRandomInterface(ServiceCtx context)
{
@@ -35,4 +33,4 @@ namespace Ryujinx.HLE.HOS.Services.Spl
}
}
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Spl/ResultCode.cs b/src/Ryujinx.HLE/HOS/Services/Spl/ResultCode.cs
index 4f61998a..fe77c753 100644
--- a/src/Ryujinx.HLE/HOS/Services/Spl/ResultCode.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Spl/ResultCode.cs
@@ -2,11 +2,11 @@ namespace Ryujinx.HLE.HOS.Services.Spl
{
enum ResultCode
{
- ModuleId = 26,
+ ModuleId = 26,
ErrorCodeShift = 9,
Success = 0,
- InvalidArguments = (101 << ErrorCodeShift) | ModuleId
+ InvalidArguments = (101 << ErrorCodeShift) | ModuleId,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Spl/Types/ConfigItem.cs b/src/Ryujinx.HLE/HOS/Services/Spl/Types/ConfigItem.cs
index f08bbeaa..6822ad13 100644
--- a/src/Ryujinx.HLE/HOS/Services/Spl/Types/ConfigItem.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Spl/Types/ConfigItem.cs
@@ -3,22 +3,22 @@
enum ConfigItem
{
// Standard config items.
- DisableProgramVerification = 1,
- DramId = 2,
+ DisableProgramVerification = 1,
+ DramId = 2,
SecurityEngineInterruptNumber = 3,
- FuseVersion = 4,
- HardwareType = 5,
- HardwareState = 6,
- IsRecoveryBoot = 7,
- DeviceId = 8,
- BootReason = 9,
- MemoryMode = 10,
- IsDevelopmentFunctionEnabled = 11,
- KernelConfiguration = 12,
- IsChargerHiZModeEnabled = 13,
- QuestState = 14,
- RegulatorType = 15,
- DeviceUniqueKeyGeneration = 16,
- Package2Hash = 17
+ FuseVersion = 4,
+ HardwareType = 5,
+ HardwareState = 6,
+ IsRecoveryBoot = 7,
+ DeviceId = 8,
+ BootReason = 9,
+ MemoryMode = 10,
+ IsDevelopmentFunctionEnabled = 11,
+ KernelConfiguration = 12,
+ IsChargerHiZModeEnabled = 13,
+ QuestState = 14,
+ RegulatorType = 15,
+ DeviceUniqueKeyGeneration = 16,
+ Package2Hash = 17,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Spl/Types/DramId.cs b/src/Ryujinx.HLE/HOS/Services/Spl/Types/DramId.cs
index 422c8d69..05a46557 100644
--- a/src/Ryujinx.HLE/HOS/Services/Spl/Types/DramId.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Spl/Types/DramId.cs
@@ -30,6 +30,6 @@
IowaMicron1y4GiB,
HoagMicron1y4GiB,
AulaMicron1y4GiB,
- AulaSamsung1y8GiBX
+ AulaSamsung1y8GiBX,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Spl/Types/HardwareState.cs b/src/Ryujinx.HLE/HOS/Services/Spl/Types/HardwareState.cs
index 414d0f11..8ab0ba9b 100644
--- a/src/Ryujinx.HLE/HOS/Services/Spl/Types/HardwareState.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Spl/Types/HardwareState.cs
@@ -3,6 +3,6 @@
enum HardwareState
{
Development,
- Production
+ Production,
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Spl/Types/HardwareType.cs b/src/Ryujinx.HLE/HOS/Services/Spl/Types/HardwareType.cs
index 491eb943..82d73330 100644
--- a/src/Ryujinx.HLE/HOS/Services/Spl/Types/HardwareType.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Spl/Types/HardwareType.cs
@@ -9,4 +9,4 @@
Calcio,
Aula
}
-} \ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Services/Spl/Types/SmcResult.cs b/src/Ryujinx.HLE/HOS/Services/Spl/Types/SmcResult.cs
index d5f424a6..ade0378c 100644
--- a/src/Ryujinx.HLE/HOS/Services/Spl/Types/SmcResult.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Spl/Types/SmcResult.cs
@@ -2,19 +2,18 @@
{
enum SmcResult
{
- Success = 0,
- NotImplemented = 1,
- InvalidArgument = 2,
- Busy = 3,
- NoAsyncOperation = 4,
+ Success = 0,
+ NotImplemented = 1,
+ InvalidArgument = 2,
+ Busy = 3,
+ NoAsyncOperation = 4,
InvalidAsyncOperation = 5,
- NotPermitted = 6,
- NotInitialized = 7,
+ NotPermitted = 6,
+ NotInitialized = 7,
- PsciSuccess = 0,
- PsciNotSupported = -1,
+ PsciNotSupported = -1,
PsciInvalidParameters = -2,
- PsciDenied = -3,
- PsciAlreadyOn = -4
+ PsciDenied = -3,
+ PsciAlreadyOn = -4,
}
-} \ No newline at end of file
+}