8 files changed, 33 insertions, 35 deletions
diff --git a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
index 5d5a26c2..86720217 100644
--- a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
@@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Applets
 {
     internal class ControllerApplet : IApplet
     {
-        private Horizon _system;
+        private readonly Horizon _system;
 
         private AppletSession _normalSession;
 
@@ -65,7 +65,7 @@ namespace Ryujinx.HLE.HOS.Applets
             }
             else
             {
-                Logger.Stub?.PrintStub(LogClass.ServiceHid, $"ControllerSupportArg Version Unknown");
+                Logger.Stub?.PrintStub(LogClass.ServiceHid, "ControllerSupportArg Version Unknown");
 
                 argHeader = IApplet.ReadStruct<ControllerSupportArgHeader>(controllerSupportArg); // Read just the header
             }
@@ -82,17 +82,17 @@ namespace Ryujinx.HLE.HOS.Applets
                 playerMin = playerMax = 1;
             }
 
-            int configuredCount = 0;
-            PlayerIndex primaryIndex = PlayerIndex.Unknown;
+            int configuredCount;
+            PlayerIndex primaryIndex;
             while (!_system.Device.Hid.Npads.Validate(playerMin, playerMax, (ControllerType)privateArg.NpadStyleSet, out configuredCount, out primaryIndex))
             {
-                ControllerAppletUiArgs uiArgs = new ControllerAppletUiArgs
+                ControllerAppletUiArgs uiArgs = new()
                 {
                     PlayerCountMin = playerMin,
                     PlayerCountMax = playerMax,
                     SupportedStyles = (ControllerType)privateArg.NpadStyleSet,
                     SupportedPlayers = _system.Device.Hid.Npads.GetSupportedPlayers(),
-                    IsDocked = _system.State.DockedMode
+                    IsDocked = _system.State.DockedMode,
                 };
 
                 if (!_system.Device.UiHandler.DisplayMessageDialog(uiArgs))
@@ -101,10 +101,10 @@ namespace Ryujinx.HLE.HOS.Applets
                 }
             }
 
-            ControllerSupportResultInfo result = new ControllerSupportResultInfo
+            ControllerSupportResultInfo result = new()
             {
                 PlayerCount = (sbyte)configuredCount,
-                SelectedId = (uint)GetNpadIdTypeFromIndex(primaryIndex)
+                SelectedId = (uint)GetNpadIdTypeFromIndex(primaryIndex),
             };
 
             Logger.Stub?.PrintStub(LogClass.ServiceHid, $"ControllerApplet ReturnResult {result.PlayerCount} {result.SelectedId}");
@@ -122,26 +122,24 @@ namespace Ryujinx.HLE.HOS.Applets
             return ResultCode.Success;
         }
 
-        private byte[] BuildResponse(ControllerSupportResultInfo result)
+        private static byte[] BuildResponse(ControllerSupportResultInfo result)
         {
-            using (MemoryStream stream = MemoryStreamManager.Shared.GetStream())
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                writer.Write(MemoryMarshal.AsBytes(MemoryMarshal.CreateReadOnlySpan(ref result, Unsafe.SizeOf<ControllerSupportResultInfo>())));
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            writer.Write(MemoryMarshal.AsBytes(MemoryMarshal.CreateReadOnlySpan(ref result, Unsafe.SizeOf<ControllerSupportResultInfo>())));
+
+            return stream.ToArray();
         }
 
-        private byte[] BuildResponse()
+        private static byte[] BuildResponse()
         {
-            using (MemoryStream stream = MemoryStreamManager.Shared.GetStream())
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                writer.Write((ulong)ResultCode.Success);
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            writer.Write((ulong)ResultCode.Success);
+
+            return stream.ToArray();
         }
     }
 }
diff --git a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerAppletUiArgs.cs b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerAppletUiArgs.cs
index cc15a406..bf440515 100644
--- a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerAppletUiArgs.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerAppletUiArgs.cs
@@ -11,4 +11,4 @@ namespace Ryujinx.HLE.HOS.Applets
         public IEnumerable<PlayerIndex> SupportedPlayers;
         public bool IsDocked;
     }
-}
-\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs
index 141994a8..b066da8e 100644
--- a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs
@@ -2,7 +2,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Applets
 {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct ControllerSupportArgHeader
     {
@@ -15,4 +15,4 @@ namespace Ryujinx.HLE.HOS.Applets
         public byte EnableIdentificationColor;
     }
 #pragma warning restore CS0649
-}
-\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgPrivate.cs b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgPrivate.cs
index d4c8177e..d5a18d46 100644
--- a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgPrivate.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgPrivate.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Applets
 {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
     struct ControllerSupportArgPrivate
     {
         public uint PrivateSize;
@@ -13,4 +13,4 @@ namespace Ryujinx.HLE.HOS.Applets
         public uint NpadJoyHoldType;
     }
 #pragma warning restore CS0649
-}
-\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs
index 98c413be..0969493f 100644
--- a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs
@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Applets
 {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
     // (8.0.0+ version)
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct ControllerSupportArgV7
@@ -23,4 +23,4 @@ namespace Ryujinx.HLE.HOS.Applets
         }
     }
 #pragma warning restore CS0649
-}
-\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgVPre7.cs b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgVPre7.cs
index 87417e16..88678255 100644
--- a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgVPre7.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgVPre7.cs
@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Applets
 {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
     // (1.0.0+ version)
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct ControllerSupportArgVPre7
@@ -23,4 +23,4 @@ namespace Ryujinx.HLE.HOS.Applets
         }
     }
 #pragma warning restore CS0649
-}
-\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportMode.cs b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportMode.cs
index 9496c1dd..5e181e19 100644
--- a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportMode.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportMode.cs
@@ -4,6 +4,6 @@ namespace Ryujinx.HLE.HOS.Applets
     {
         ShowControllerSupport = 0,
         ShowControllerStrapGuide = 1,
-        ShowControllerFirmwareUpdate = 2
+        ShowControllerFirmwareUpdate = 2,
     }
-}
-\ No newline at end of file
+}
diff --git a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs
index 689a54de..96cfd590 100644
--- a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Applets
 {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct ControllerSupportResultInfo
     {
@@ -13,4 +13,4 @@ namespace Ryujinx.HLE.HOS.Applets
         public uint Result;
     }
 #pragma warning restore CS0649
-}
-\ No newline at end of file
+}