From 492bb6ee5ff7d5eb1c24d569cdb71da04cba15cd Mon Sep 17 00:00:00 2001
From: mageven <62494521+mageven@users.noreply.github.com>
Date: Sun, 10 May 2020 19:32:41 +0530
Subject: [PATCH] Suppress CS0169 CS0649 warns from HID structs (#1222)

Also fix typo in a pragma restore in Logger
---
 ARMeilleure/Diagnostics/Logger.cs                               | 2 +-
 Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArg.cs      | 2 ++
 .../HOS/Applets/Controller/ControllerSupportArgHeader.cs        | 2 ++
 .../HOS/Applets/Controller/ControllerSupportArgPrivate.cs       | 2 ++
 .../HOS/Applets/Controller/ControllerSupportResultInfo.cs       | 2 ++
 .../HOS/Services/Hid/Types/SharedMem/StructArrayHelpers.cs      | 2 ++
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ARMeilleure/Diagnostics/Logger.cs b/ARMeilleure/Diagnostics/Logger.cs
index e7a0ba5c..8ff63091 100644
--- a/ARMeilleure/Diagnostics/Logger.cs
+++ b/ARMeilleure/Diagnostics/Logger.cs
@@ -10,7 +10,7 @@ namespace ARMeilleure.Diagnostics
         private static long _startTime;
 
         private static long[] _accumulatedTime;
-#pragma warning restore CS0196
+#pragma warning restore CS0169
 
         static Logger()
         {
diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArg.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArg.cs
index 62ebff30..908e9049 100644
--- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArg.cs
+++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArg.cs
@@ -1,5 +1,6 @@
 namespace Ryujinx.HLE.HOS.Applets
 {
+#pragma warning disable CS0649
     // (8.0.0+ version)
     unsafe struct ControllerSupportArg
     {
@@ -8,4 +9,5 @@ namespace Ryujinx.HLE.HOS.Applets
         public byte EnableExplainText;
         public fixed byte ExplainText[8 * 0x81];
     }
+#pragma warning restore CS0649
 }
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs
index dfe26093..945f0ef6 100644
--- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs
+++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs
@@ -1,5 +1,6 @@
 namespace Ryujinx.HLE.HOS.Applets
 {
+#pragma warning disable CS0649
     struct ControllerSupportArgHeader
     {
         public sbyte PlayerCountMin;
@@ -10,4 +11,5 @@ namespace Ryujinx.HLE.HOS.Applets
         public byte EnableSingleMode;
         public byte EnableIdentificationColor;
     }
+#pragma warning restore CS0649
 }
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgPrivate.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgPrivate.cs
index 2e393de4..d4c8177e 100644
--- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgPrivate.cs
+++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgPrivate.cs
@@ -1,5 +1,6 @@
 namespace Ryujinx.HLE.HOS.Applets
 {
+#pragma warning disable CS0649
     struct ControllerSupportArgPrivate
     {
         public uint PrivateSize;
@@ -11,4 +12,5 @@ namespace Ryujinx.HLE.HOS.Applets
         public uint NpadStyleSet;
         public uint NpadJoyHoldType;
     }
+#pragma warning restore CS0649
 }
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs
index 4fcd37db..09a19bf0 100644
--- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs
+++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs
@@ -1,5 +1,6 @@
 namespace Ryujinx.HLE.HOS.Applets
 {
+#pragma warning disable CS0649
     unsafe struct ControllerSupportResultInfo
     {
         public sbyte PlayerCount;
@@ -7,4 +8,5 @@ namespace Ryujinx.HLE.HOS.Applets
         public uint SelectedId;
         public uint Result;
     }
+#pragma warning restore CS0649
 }
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMem/StructArrayHelpers.cs b/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMem/StructArrayHelpers.cs
index f513cf8b..f40d16a0 100644
--- a/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMem/StructArrayHelpers.cs
+++ b/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMem/StructArrayHelpers.cs
@@ -2,6 +2,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Services.Hid
 {
+#pragma warning disable CS0169
     struct Array2<T> where T : unmanaged
     {
         T e0, e1;
@@ -50,4 +51,5 @@ namespace Ryujinx.HLE.HOS.Services.Hid
         public ref T this[int index] => ref MemoryMarshal.CreateSpan(ref e0, 17)[index];
         public int Length => 17;
     }
+#pragma warning restore CS0169
 }
\ No newline at end of file