aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-07-16 19:31:14 +0200
committerGitHub <noreply@github.com>2023-07-16 19:31:14 +0200
commit326749498bed4360e5a4b11fc67d5ec7cb9a3076 (patch)
treeae21fb26f99b401ca4e9efaab72b679a81c22369 /src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
parentfec8291c17fa106c28f58b56419e90d49a41a1ea (diff)
[Ryujinx.HLE] Address dotnet-format issues (#5380)1.1.962
* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2208 warnings * Address or silence dotnet format CA1806 and a few CA1854 warnings * Address dotnet format CA2211 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address or silence dotnet format CA2211 warnings * Address review comments * Address dotnet format CA2208 warnings properly * Make ProcessResult readonly * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Add previously silenced warnings back I have no clue how these disappeared * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix a few disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Run dotnet format after rebase * Use using declaration instead of block syntax * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Fix typo * Add trailing commas, use targeted new and use array initializer * Fix build issues * Fix remaining build issues * Remove SuppressMessage for CA1069 where possible * Address dotnet format issues * Address formatting issues Co-authored-by: Ac_K <acoustik666@gmail.com> * Add GetHashCode implementation for RenderingSurfaceInfo * Explicitly silence CA1822 for every affected method in Syscall * Address formatting issues in Demangler.cs * Address review feedback Co-authored-by: Ac_K <acoustik666@gmail.com> * Revert marking service methods as static * Next dotnet format pass * Address review feedback --------- Co-authored-by: Ac_K <acoustik666@gmail.com>
Diffstat (limited to 'src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs')
-rw-r--r--src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs111
1 files changed, 54 insertions, 57 deletions
diff --git a/src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs b/src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
index 07c9f6b3..65748be3 100644
--- a/src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
@@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings
// GetFirmwareVersion2() -> buffer<nn::settings::system::FirmwareVersion, 0x1a, 0x100>
public ResultCode GetFirmwareVersion2(ServiceCtx context)
{
- ulong replyPos = context.Request.RecvListBuff[0].Position;
+ ulong replyPos = context.Request.RecvListBuff[0].Position;
context.Response.PtrBuff[0] = context.Response.PtrBuff[0].WithSize(0x100L);
@@ -46,43 +46,42 @@ namespace Ryujinx.HLE.HOS.Services.Settings
const byte MajorFwVersion = 0x03;
const byte MinorFwVersion = 0x00;
const byte MicroFwVersion = 0x00;
- const byte Unknown = 0x00; //Build?
+ const byte Unknown = 0x00; //Build?
const int RevisionNumber = 0x0A;
- const string Platform = "NX";
+ const string Platform = "NX";
const string UnknownHex = "7fbde2b0bba4d14107bf836e4643043d9f6c8e47";
- const string Version = "3.0.0";
- const string Build = "NintendoSDK Firmware for NX 3.0.0-10.0";
+ const string Version = "3.0.0";
+ const string Build = "NintendoSDK Firmware for NX 3.0.0-10.0";
// http://switchbrew.org/index.php?title=System_Version_Title
- using (MemoryStream ms = new MemoryStream(0x100))
- {
- BinaryWriter writer = new BinaryWriter(ms);
+ using MemoryStream ms = new(0x100);
- writer.Write(MajorFwVersion);
- writer.Write(MinorFwVersion);
- writer.Write(MicroFwVersion);
- writer.Write(Unknown);
+ BinaryWriter writer = new(ms);
- writer.Write(RevisionNumber);
+ writer.Write(MajorFwVersion);
+ writer.Write(MinorFwVersion);
+ writer.Write(MicroFwVersion);
+ writer.Write(Unknown);
- writer.Write(Encoding.ASCII.GetBytes(Platform));
+ writer.Write(RevisionNumber);
- ms.Seek(0x28, SeekOrigin.Begin);
+ writer.Write(Encoding.ASCII.GetBytes(Platform));
- writer.Write(Encoding.ASCII.GetBytes(UnknownHex));
+ ms.Seek(0x28, SeekOrigin.Begin);
- ms.Seek(0x68, SeekOrigin.Begin);
+ writer.Write(Encoding.ASCII.GetBytes(UnknownHex));
- writer.Write(Encoding.ASCII.GetBytes(Version));
+ ms.Seek(0x68, SeekOrigin.Begin);
- ms.Seek(0x80, SeekOrigin.Begin);
+ writer.Write(Encoding.ASCII.GetBytes(Version));
- writer.Write(Encoding.ASCII.GetBytes(Build));
+ ms.Seek(0x80, SeekOrigin.Begin);
- context.Memory.Write(replyPos, ms.ToArray());
- }
+ writer.Write(Encoding.ASCII.GetBytes(Build));
+
+ context.Memory.Write(replyPos, ms.ToArray());
return ResultCode.Success;
}
@@ -111,10 +110,10 @@ namespace Ryujinx.HLE.HOS.Services.Settings
// GetSettingsItemValueSize(buffer<nn::settings::SettingsName, 0x19>, buffer<nn::settings::SettingsItemKey, 0x19>) -> u64
public ResultCode GetSettingsItemValueSize(ServiceCtx context)
{
- ulong classPos = context.Request.PtrBuff[0].Position;
+ ulong classPos = context.Request.PtrBuff[0].Position;
ulong classSize = context.Request.PtrBuff[0].Size;
- ulong namePos = context.Request.PtrBuff[1].Position;
+ ulong namePos = context.Request.PtrBuff[1].Position;
ulong nameSize = context.Request.PtrBuff[1].Size;
byte[] classBuffer = new byte[classSize];
@@ -160,13 +159,13 @@ namespace Ryujinx.HLE.HOS.Services.Settings
// GetSettingsItemValue(buffer<nn::settings::SettingsName, 0x19, 0x48>, buffer<nn::settings::SettingsItemKey, 0x19, 0x48>) -> (u64, buffer<unknown, 6, 0>)
public ResultCode GetSettingsItemValue(ServiceCtx context)
{
- ulong classPos = context.Request.PtrBuff[0].Position;
+ ulong classPos = context.Request.PtrBuff[0].Position;
ulong classSize = context.Request.PtrBuff[0].Size;
- ulong namePos = context.Request.PtrBuff[1].Position;
+ ulong namePos = context.Request.PtrBuff[1].Position;
ulong nameSize = context.Request.PtrBuff[1].Size;
- ulong replyPos = context.Request.ReceiveBuff[0].Position;
+ ulong replyPos = context.Request.ReceiveBuff[0].Position;
ulong replySize = context.Request.ReceiveBuff[0].Size;
byte[] classBuffer = new byte[classSize];
@@ -250,7 +249,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings
public ResultCode GetDeviceNickName(ServiceCtx context)
{
ulong deviceNickNameBufferPosition = context.Request.ReceiveBuff[0].Position;
- ulong deviceNickNameBufferSize = context.Request.ReceiveBuff[0].Size;
+ ulong deviceNickNameBufferSize = context.Request.ReceiveBuff[0].Size;
if (deviceNickNameBufferPosition == 0)
{
@@ -272,7 +271,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings
public ResultCode SetDeviceNickName(ServiceCtx context)
{
ulong deviceNickNameBufferPosition = context.Request.SendBuff[0].Position;
- ulong deviceNickNameBufferSize = context.Request.SendBuff[0].Size;
+ ulong deviceNickNameBufferSize = context.Request.SendBuff[0].Size;
byte[] deviceNickNameBuffer = new byte[deviceNickNameBufferSize];
@@ -306,43 +305,41 @@ namespace Ryujinx.HLE.HOS.Services.Settings
return null;
}
- string firmwareTitlePath = device.FileSystem.SwitchPathToSystemPath(contentPath);
+ string firmwareTitlePath = FileSystem.VirtualFileSystem.SwitchPathToSystemPath(contentPath);
- using(IStorage firmwareStorage = new LocalStorage(firmwareTitlePath, FileAccess.Read))
- {
- Nca firmwareContent = new Nca(device.System.KeySet, firmwareStorage);
-
- if (!firmwareContent.CanOpenSection(NcaSectionType.Data))
- {
- return null;
- }
+ using IStorage firmwareStorage = new LocalStorage(firmwareTitlePath, FileAccess.Read);
+ Nca firmwareContent = new(device.System.KeySet, firmwareStorage);
- IFileSystem firmwareRomFs = firmwareContent.OpenFileSystem(NcaSectionType.Data, device.System.FsIntegrityCheckLevel);
+ if (!firmwareContent.CanOpenSection(NcaSectionType.Data))
+ {
+ return null;
+ }
- using var firmwareFile = new UniqueRef<IFile>();
+ IFileSystem firmwareRomFs = firmwareContent.OpenFileSystem(NcaSectionType.Data, device.System.FsIntegrityCheckLevel);
- Result result = firmwareRomFs.OpenFile(ref firmwareFile.Ref, "/file".ToU8Span(), OpenMode.Read);
- if (result.IsFailure())
- {
- return null;
- }
+ using var firmwareFile = new UniqueRef<IFile>();
- result = firmwareFile.Get.GetSize(out long fileSize);
- if (result.IsFailure())
- {
- return null;
- }
+ Result result = firmwareRomFs.OpenFile(ref firmwareFile.Ref, "/file".ToU8Span(), OpenMode.Read);
+ if (result.IsFailure())
+ {
+ return null;
+ }
- byte[] data = new byte[fileSize];
+ result = firmwareFile.Get.GetSize(out long fileSize);
+ if (result.IsFailure())
+ {
+ return null;
+ }
- result = firmwareFile.Get.Read(out _, 0, data);
- if (result.IsFailure())
- {
- return null;
- }
+ byte[] data = new byte[fileSize];
- return data;
+ result = firmwareFile.Get.Read(out _, 0, data);
+ if (result.IsFailure())
+ {
+ return null;
}
+
+ return data;
}
}
}
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-03-25 08:47:48 +0000