diff --git a/Ryujinx.Common/HexUtils.cs b/Ryujinx.Common/HexUtils.cs index ad04695027..63587ceaa8 100644 --- a/Ryujinx.Common/HexUtils.cs +++ b/Ryujinx.Common/HexUtils.cs @@ -48,11 +48,11 @@ namespace Ryujinx.Common line[2] = HexChars[(i >> 20) & 0xF]; line[3] = HexChars[(i >> 16) & 0xF]; line[4] = HexChars[(i >> 12) & 0xF]; - line[5] = HexChars[(i >> 8) & 0xF]; - line[6] = HexChars[(i >> 4) & 0xF]; - line[7] = HexChars[(i >> 0) & 0xF]; + line[5] = HexChars[(i >> 8) & 0xF]; + line[6] = HexChars[(i >> 4) & 0xF]; + line[7] = HexChars[(i >> 0) & 0xF]; - int hexColumn = firstHexColumn; + int hexColumn = firstHexColumn; int charColumn = firstCharColumn; for (int j = 0; j < bytesPerLine; j++) @@ -64,16 +64,17 @@ namespace Ryujinx.Common if (i + j >= bytesLength) { - line[hexColumn] = ' '; + line[hexColumn] = ' '; line[hexColumn + 1] = ' '; - line[charColumn] = ' '; + line[charColumn] = ' '; } else { byte b = bytes[i + j]; - line[hexColumn] = HexChars[(b >> 4) & 0xF]; + + line[hexColumn] = HexChars[(b >> 4) & 0xF]; line[hexColumn + 1] = HexChars[b & 0xF]; - line[charColumn] = (b < 32 ? '·' : (char)b); + line[charColumn] = (b < 32 ? '·' : (char)b); } hexColumn += 3; diff --git a/Ryujinx.Common/Logging/LogEventArgs.cs b/Ryujinx.Common/Logging/LogEventArgs.cs index 462b27f3e1..363a45b9ad 100644 --- a/Ryujinx.Common/Logging/LogEventArgs.cs +++ b/Ryujinx.Common/Logging/LogEventArgs.cs @@ -13,19 +13,19 @@ namespace Ryujinx.Common.Logging public LogEventArgs(LogLevel level, TimeSpan time, int threadId, string message) { - this.Level = level; - this.Time = time; + this.Level = level; + this.Time = time; this.ThreadId = threadId; - this.Message = message; + this.Message = message; } public LogEventArgs(LogLevel level, TimeSpan time, int threadId, string message, object data) { - this.Level = level; - this.Time = time; + this.Level = level; + this.Time = time; this.ThreadId = threadId; - this.Message = message; - this.Data = data; + this.Message = message; + this.Data = data; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs b/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs index 4c4e8dc54b..03c83a1636 100644 --- a/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs +++ b/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs @@ -64,19 +64,19 @@ namespace Ryujinx.HLE.Exceptions if (callingType != null && callingMethod != null) { - var ipcService = Context.Session.Service; + var ipcService = Context.Session.Service; var ipcCommands = ipcService.Commands; // Find the handler for the method called - var ipcHandler = ipcCommands.FirstOrDefault(x => x.Value.Method == callingMethod); + var ipcHandler = ipcCommands.FirstOrDefault(x => x.Value.Method == callingMethod); var ipcCommandId = ipcHandler.Key; - var ipcMethod = ipcHandler.Value; + var ipcMethod = ipcHandler.Value; - if(ipcMethod != null) + if (ipcMethod != null) { sb.AppendLine($"Service Command: {Session.ServiceName} {ipcService.GetType().Name}: {ipcCommandId} ({ipcMethod.Method.Name})"); sb.AppendLine(); - } + } } // Print buffer information @@ -85,6 +85,7 @@ namespace Ryujinx.HLE.Exceptions if (Request.PtrBuff.Count > 0) { sb.AppendLine("\tPtrBuff:"); + foreach (var buff in Request.PtrBuff) { sb.AppendLine($"\t[{buff.Index}] Position: 0x{buff.Position:x16} Size: 0x{buff.Size:x16}"); @@ -94,6 +95,7 @@ namespace Ryujinx.HLE.Exceptions if (Request.SendBuff.Count > 0) { sb.AppendLine("\tSendBuff:"); + foreach (var buff in Request.SendBuff) { sb.AppendLine($"\tPosition: 0x{buff.Position:x16} Size: 0x{buff.Size:x16} Flags: {buff.Flags}"); @@ -103,6 +105,7 @@ namespace Ryujinx.HLE.Exceptions if (Request.ReceiveBuff.Count > 0) { sb.AppendLine("\tReceiveBuff:"); + foreach (var buff in Request.ReceiveBuff) { sb.AppendLine($"\tPosition: 0x{buff.Position:x16} Size: 0x{buff.Size:x16} Flags: {buff.Flags}"); @@ -112,6 +115,7 @@ namespace Ryujinx.HLE.Exceptions if (Request.ExchangeBuff.Count > 0) { sb.AppendLine("\tExchangeBuff:"); + foreach (var buff in Request.ExchangeBuff) { sb.AppendLine($"\tPosition: 0x{buff.Position:x16} Size: 0x{buff.Size:x16} Flags: {buff.Flags}"); @@ -121,6 +125,7 @@ namespace Ryujinx.HLE.Exceptions if (Request.RecvListBuff.Count > 0) { sb.AppendLine("\tRecvListBuff:"); + foreach (var buff in Request.RecvListBuff) { sb.AppendLine($"\tPosition: 0x{buff.Position:x16} Size: 0x{buff.Size:x16}"); diff --git a/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs b/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs index 098fd1e026..e5b56a6090 100644 --- a/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs +++ b/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs @@ -377,7 +377,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid int sixAxisSensorHandle = context.RequestData.ReadInt32(); long appletResourceUserId = context.RequestData.ReadInt64(); - Logger.PrintStub(LogClass.ServiceHid, new {appletResourceUserId, sixAxisSensorHandle }); + Logger.PrintStub(LogClass.ServiceHid, new { appletResourceUserId, sixAxisSensorHandle }); return 0; }