From d7f3cbc6c8ad864e38c9aeb4cdc8dc52557f27c6 Mon Sep 17 00:00:00 2001
From: Thog <me@thog.eu>
Date: Fri, 11 Oct 2019 03:24:59 +0200
Subject: [PATCH] Apply Ac_K's suggestion about EndianSwap

---
 Ryujinx.Common/Utilities/BitUtils.cs                    | 4 +---
 {Ryujinx.HLE => Ryujinx.Common}/Utilities/EndianSwap.cs | 4 ++--
 Ryujinx.HLE/HOS/Font/SharedFontManager.cs               | 2 +-
 Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs         | 3 ++-
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename {Ryujinx.HLE => Ryujinx.Common}/Utilities/EndianSwap.cs (87%)

diff --git a/Ryujinx.Common/Utilities/BitUtils.cs b/Ryujinx.Common/Utilities/BitUtils.cs
index af395451f2..4ac57cb455 100644
--- a/Ryujinx.Common/Utilities/BitUtils.cs
+++ b/Ryujinx.Common/Utilities/BitUtils.cs
@@ -144,9 +144,7 @@ namespace Ryujinx.Common
 
             if (BitConverter.IsLittleEndian)
             {
-                byte[] bytes = BitConverter.GetBytes(result);
-                Array.Reverse(bytes, 0, bytes.Length);
-                result = BitConverter.ToUInt32(bytes, 0);
+                result = (uint)EndianSwap.Swap32((int)result);
             }
 
             return result;
diff --git a/Ryujinx.HLE/Utilities/EndianSwap.cs b/Ryujinx.Common/Utilities/EndianSwap.cs
similarity index 87%
rename from Ryujinx.HLE/Utilities/EndianSwap.cs
rename to Ryujinx.Common/Utilities/EndianSwap.cs
index df08191ac6..6fe1d99522 100644
--- a/Ryujinx.HLE/Utilities/EndianSwap.cs
+++ b/Ryujinx.Common/Utilities/EndianSwap.cs
@@ -1,6 +1,6 @@
-namespace Ryujinx.HLE.Utilities
+namespace Ryujinx.Common
 {
-    static class EndianSwap
+    public static class EndianSwap
     {
         public static ushort Swap16(ushort value) => (ushort)(((value >> 8) & 0xff) | (value << 8));
 
diff --git a/Ryujinx.HLE/HOS/Font/SharedFontManager.cs b/Ryujinx.HLE/HOS/Font/SharedFontManager.cs
index dfb87f3c94..8a936dbf55 100644
--- a/Ryujinx.HLE/HOS/Font/SharedFontManager.cs
+++ b/Ryujinx.HLE/HOS/Font/SharedFontManager.cs
@@ -1,9 +1,9 @@
 using LibHac.Fs;
 using LibHac.Fs.NcaUtils;
+using Ryujinx.Common;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.FileSystem.Content;
 using Ryujinx.HLE.Resource;
-using Ryujinx.HLE.Utilities;
 using System.Collections.Generic;
 using System.IO;
 using static Ryujinx.HLE.Utilities.FontUtils;
diff --git a/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs b/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs
index 3a02e06c05..7db8066a6b 100644
--- a/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs
+++ b/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs
@@ -1,4 +1,5 @@
-using Ryujinx.Common.Logging;
+using Ryujinx.Common;
+using Ryujinx.Common.Logging;
 using Ryujinx.HLE.Utilities;
 using System.Collections.Generic;
 using System.Net;