From 686c3f4142fddb0a46c22d0b0949e59a80a08d36 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Thu, 16 Aug 2018 11:12:38 -0300 Subject: [PATCH] Code style fixes on IGeneralService --- Ryujinx.HLE/HOS/Services/Nifm/IGeneralService.cs | 14 +++++++------- Ryujinx.HLE/HOS/Services/Nifm/NifmErr.cs | 7 +++++++ 2 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 Ryujinx.HLE/HOS/Services/Nifm/NifmErr.cs diff --git a/Ryujinx.HLE/HOS/Services/Nifm/IGeneralService.cs b/Ryujinx.HLE/HOS/Services/Nifm/IGeneralService.cs index 56be894073..ec68247ba9 100644 --- a/Ryujinx.HLE/HOS/Services/Nifm/IGeneralService.cs +++ b/Ryujinx.HLE/HOS/Services/Nifm/IGeneralService.cs @@ -7,6 +7,8 @@ using System.Net; using System.Net.NetworkInformation; using System.Net.Sockets; +using static Ryujinx.HLE.HOS.ErrorCode; + namespace Ryujinx.HLE.HOS.Services.Nifm { class IGeneralService : IpcService @@ -24,9 +26,6 @@ namespace Ryujinx.HLE.HOS.Services.Nifm }; } - public const int NoInternetConnection = 0x2586e; - - //CreateRequest(i32) public long CreateRequest(ServiceCtx Context) { int Unknown = Context.RequestData.ReadInt32(); @@ -42,15 +41,16 @@ namespace Ryujinx.HLE.HOS.Services.Nifm { if (!NetworkInterface.GetIsNetworkAvailable()) { - return NoInternetConnection; + return MakeError(ErrorModule.Nifm, NifmErr.NoInternetConnection); } - IPHostEntry Host = Dns.GetHostEntry(Dns.GetHostName()); - IPAddress Address = Host.AddressList.FirstOrDefault(A => A.AddressFamily == AddressFamily.InterNetwork); + IPHostEntry Host = Dns.GetHostEntry(Dns.GetHostName()); + + IPAddress Address = Host.AddressList.FirstOrDefault(A => A.AddressFamily == AddressFamily.InterNetwork); Context.ResponseData.Write(BitConverter.ToUInt32(Address.GetAddressBytes())); - Context.Device.Log.PrintInfo(LogClass.ServiceNifm, $"Console's local IP is {Address.ToString()}"); + Context.Device.Log.PrintInfo(LogClass.ServiceNifm, $"Console's local IP is \"{Address}\"."); return 0; } diff --git a/Ryujinx.HLE/HOS/Services/Nifm/NifmErr.cs b/Ryujinx.HLE/HOS/Services/Nifm/NifmErr.cs new file mode 100644 index 0000000000..3abeb8389f --- /dev/null +++ b/Ryujinx.HLE/HOS/Services/Nifm/NifmErr.cs @@ -0,0 +1,7 @@ +namespace Ryujinx.HLE.HOS.Services.Nifm +{ + static class NifmErr + { + public const int NoInternetConnection = 300; + } +} \ No newline at end of file