aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Services
diff options
context:
space:
mode:
authorAc_K <Acoustik666@gmail.com>2021-06-24 01:18:36 +0200
committerGitHub <noreply@github.com>2021-06-24 01:18:36 +0200
commite053663f27132baec4a4d7c223894eb0322c6c03 (patch)
tree73b449a1bb6c7c759ad98a0dd8a79f47c1bad825 /Ryujinx.HLE/HOS/Services
parent55e0c714898cc331173628714bdc8e64fb9a3756 (diff)
settings: Implement GetDeviceNickName and SetDeviceNickName (#2383)
* settings: Implement GetDeviceNickName and SetDeviceNickName This PR implement `set` and `sys:set` calls : `GetDeviceNickName` and `SetDeviceNickName` accordingly to RE. I've cleaned up both services a bit and `SystemStateMgr` class too. Closes #2110 * Addresses gdkchan_s feedback
Diffstat (limited to 'Ryujinx.HLE/HOS/Services')
-rw-r--r--Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs29
-rw-r--r--Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs40
2 files changed, 65 insertions, 4 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs b/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs
index 6f106789..703f6163 100644
--- a/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs
+++ b/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs
@@ -1,6 +1,7 @@
using Ryujinx.Common.Logging;
using Ryujinx.HLE.HOS.SystemState;
using System;
+using System.Text;
namespace Ryujinx.HLE.HOS.Services.Settings
{
@@ -117,11 +118,33 @@ namespace Ryujinx.HLE.HOS.Services.Settings
return GetKeyCodeMapImpl(context, 2);
}
- public ResultCode GetKeyCodeMapImpl(ServiceCtx context, int version)
+ [CommandHipc(11)] // 10.1.0+
+ // GetDeviceNickName() -> buffer<nn::settings::system::DeviceNickName, 0x16>
+ public ResultCode GetDeviceNickName(ServiceCtx context)
+ {
+ ulong deviceNickNameBufferPosition = context.Request.ReceiveBuff[0].Position;
+ ulong deviceNickNameBufferSize = context.Request.ReceiveBuff[0].Size;
+
+ if (deviceNickNameBufferPosition == 0)
+ {
+ return ResultCode.NullDeviceNicknameBuffer;
+ }
+
+ if (deviceNickNameBufferSize != 0x80)
+ {
+ Logger.Warning?.Print(LogClass.ServiceSet, "Wrong buffer size");
+ }
+
+ context.Memory.Write(deviceNickNameBufferPosition, Encoding.ASCII.GetBytes(context.Device.System.State.DeviceNickName + '\0'));
+
+ return ResultCode.Success;
+ }
+
+ private ResultCode GetKeyCodeMapImpl(ServiceCtx context, int version)
{
if (context.Request.ReceiveBuff[0].Size != 0x1000)
{
- Logger.Warning?.Print(LogClass.ServiceSet, "Bad size");
+ Logger.Warning?.Print(LogClass.ServiceSet, "Wrong buffer size");
}
byte[] keyCodeMap;
@@ -200,7 +223,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings
return ResultCode.Success;
}
- public ResultCode GetAvailableLanguagesCodesImpl(ServiceCtx context, ulong position, ulong size, int maxSize)
+ private ResultCode GetAvailableLanguagesCodesImpl(ServiceCtx context, ulong position, ulong size, int maxSize)
{
int count = (int)(size / 8);
diff --git a/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs b/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
index 54076b4b..66b768ee 100644
--- a/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
+++ b/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
@@ -228,7 +228,45 @@ namespace Ryujinx.HLE.HOS.Services.Settings
// NOTE: When set to true, is automatically synced with the internet.
context.ResponseData.Write(true);
- Logger.Stub?.PrintStub(LogClass.ServiceSet, "Stubbed");
+ Logger.Stub?.PrintStub(LogClass.ServiceSet);
+
+ return ResultCode.Success;
+ }
+
+ [CommandHipc(77)]
+ // GetDeviceNickName() -> buffer<nn::settings::system::DeviceNickName, 0x16>
+ public ResultCode GetDeviceNickName(ServiceCtx context)
+ {
+ ulong deviceNickNameBufferPosition = context.Request.ReceiveBuff[0].Position;
+ ulong deviceNickNameBufferSize = context.Request.ReceiveBuff[0].Size;
+
+ if (deviceNickNameBufferPosition == 0)
+ {
+ return ResultCode.NullDeviceNicknameBuffer;
+ }
+
+ if (deviceNickNameBufferSize != 0x80)
+ {
+ Logger.Warning?.Print(LogClass.ServiceSet, "Wrong buffer size");
+ }
+
+ context.Memory.Write(deviceNickNameBufferPosition, Encoding.ASCII.GetBytes(context.Device.System.State.DeviceNickName + '\0'));
+
+ return ResultCode.Success;
+ }
+
+ [CommandHipc(78)]
+ // SetDeviceNickName(buffer<nn::settings::system::DeviceNickName, 0x15>)
+ public ResultCode SetDeviceNickName(ServiceCtx context)
+ {
+ ulong deviceNickNameBufferPosition = context.Request.SendBuff[0].Position;
+ ulong deviceNickNameBufferSize = context.Request.SendBuff[0].Size;
+
+ byte[] deviceNickNameBuffer = new byte[deviceNickNameBufferSize];
+
+ context.Memory.Read(deviceNickNameBufferPosition, deviceNickNameBuffer);
+
+ context.Device.System.State.DeviceNickName = Encoding.ASCII.GetString(deviceNickNameBuffer);
return ResultCode.Success;
}