emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

nfc/nfp: Implement ISystemManager and ISystem (#2381)

Browse source 
* nfc/nfp: Implement ISystemManager and ISystem

This PR add permission levels for `nfc` and `nfp` services:
- `nfc`: `CreateUserInterface` and `CreateSystemInterface` are implemented.
- `INfc`: `Initialize` and `IsNfcEnabled` calls are stubbed.
- `nfp`: `CreateDebugInterface` and `CreateSystemInterface` are implemented.
- `INfp`: `GetRegisterInfo2` for `IDebug` and `ISystem` are implemented.

* Addresses gdkchan feedback
This commit is contained in:
Ac_K 2021-06-24 01:05:40 +02:00 committed by GitHub
parent aea7a6631c
commit 55e0c71489
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 153 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Ryujinx.Common/Logging/LogClass.cs
View file

@ -38,6 +38,7 @@ namespace Ryujinx.Common.Logging
ServiceLdr,
ServiceLm,
ServiceMm,
ServiceNfc,
ServiceNfp,
ServiceNgct,
ServiceNifm,

2
Ryujinx.HLE/HOS/Horizon.cs
View file

@ -22,7 +22,7 @@ using Ryujinx.HLE.HOS.Services.Arp;
using Ryujinx.HLE.HOS.Services.Audio.AudioRenderer;
using Ryujinx.HLE.HOS.Services.Caps;
using Ryujinx.HLE.HOS.Services.Mii;
using Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager;
using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager;
using Ryujinx.HLE.HOS.Services.Nv;
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl;
using Ryujinx.HLE.HOS.Services.Pcv.Bpc;

13
Ryujinx.HLE/HOS/Services/Nfc/ISystemManager.cs
View file

@ -1,8 +1,19 @@
namespace Ryujinx.HLE.HOS.Services.Nfc
using Ryujinx.HLE.HOS.Services.Nfc.NfcManager;
namespace Ryujinx.HLE.HOS.Services.Nfc
{
[Service("nfc:sys")]
class ISystemManager : IpcService
{
public ISystemManager(ServiceCtx context) { }
[CommandHipc(0)]
// CreateSystemInterface() -> object<nn::nfc::detail::ISystem>
public ResultCode CreateSystemInterface(ServiceCtx context)
{
MakeObject(context, new INfc(NfcPermissionLevel.System));
return ResultCode.Success;
}
}
}

13
Ryujinx.HLE/HOS/Services/Nfc/IUserManager.cs
View file

@ -1,8 +1,19 @@
namespace Ryujinx.HLE.HOS.Services.Nfc
using Ryujinx.HLE.HOS.Services.Nfc.NfcManager;
namespace Ryujinx.HLE.HOS.Services.Nfc
{
[Service("nfc:user")]
class IUserManager : IpcService
{
public IUserManager(ServiceCtx context) { }
[CommandHipc(0)]
// CreateUserInterface() -> object<nn::nfc::detail::IUser>
public ResultCode CreateUserInterface(ServiceCtx context)
{
MakeObject(context, new INfc(NfcPermissionLevel.User));
return ResultCode.Success;
}
}
}

37
Ryujinx.HLE/HOS/Services/Nfc/NfcManager/INfc.cs Normal file
View file

@ -0,0 +1,37 @@
using Ryujinx.Common.Logging;
namespace Ryujinx.HLE.HOS.Services.Nfc.NfcManager
{
class INfc : IpcService
{
private NfcPermissionLevel _permissionLevel;
public INfc(NfcPermissionLevel permissionLevel)
{
_permissionLevel = permissionLevel;
}
[CommandHipc(0)]
[CommandHipc(400)] // 4.0.0+
// Initialize()
public ResultCode Initialize(ServiceCtx context)
{
Logger.Stub?.PrintStub(LogClass.ServiceNfc, new { _permissionLevel });
return ResultCode.Success;
}
[CommandHipc(3)]
[CommandHipc(403)] // 4.0.0+
// IsNfcEnabled() -> b8
public ResultCode IsNfcEnabled(ServiceCtx context)
{
// NOTE: Write false value here could make nfp service not called.
context.ResponseData.Write(true);
Logger.Stub?.PrintStub(LogClass.ServiceNfc, new { _permissionLevel });
return ResultCode.Success;
}
}
}

8
Ryujinx.HLE/HOS/Services/Nfc/NfcManager/Types/NfcPermissionLevel.cs Normal file
View file

@ -0,0 +1,8 @@
namespace Ryujinx.HLE.HOS.Services.Nfc.NfcManager
{
enum NfcPermissionLevel
{
User,
System
}
}

13
Ryujinx.HLE/HOS/Services/Nfc/Nfp/IDebugManager.cs
View file

@ -1,8 +1,19 @@
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager;
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
{
[Service("nfp:dbg")]
class IAmManager : IpcService
{
public IAmManager(ServiceCtx context) { }
[CommandHipc(0)]
// CreateDebugInterface() -> object<nn::nfp::detail::IDebug>
public ResultCode CreateDebugInterface(ServiceCtx context)
{
MakeObject(context, new INfp(NfpPermissionLevel.Debug));
return ResultCode.Success;
}
}
}

13
Ryujinx.HLE/HOS/Services/Nfc/Nfp/ISystemManager.cs
View file

@ -1,8 +1,19 @@
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager;
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
{
[Service("nfp:sys")]
class ISystemManager : IpcService
{
public ISystemManager(ServiceCtx context) { }
[CommandHipc(0)]
// CreateSystemInterface() -> object<nn::nfp::detail::ISystem>
public ResultCode CreateSystemInterface(ServiceCtx context)
{
MakeObject(context, new INfp(NfpPermissionLevel.System));
return ResultCode.Success;
}
}
}

8
Ryujinx.HLE/HOS/Services/Nfc/Nfp/IUserManager.cs
View file

@ -1,4 +1,6 @@
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager;
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
{
[Service("nfp:user")]
class IUserManager : IpcService
@ -7,9 +9,9 @@
[CommandHipc(0)]
// CreateUserInterface() -> object<nn::nfp::detail::IUser>
public ResultCode GetUserInterface(ServiceCtx context)
public ResultCode CreateUserInterface(ServiceCtx context)
{
MakeObject(context, new IUser());
MakeObject(context, new INfp(NfpPermissionLevel.User));
return ResultCode.Success;
}

31
Ryujinx.HLE/HOS/Services/Nfc/Nfp/UserManager/IUser.cs → Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/INfp.cs
View file

@ -6,7 +6,7 @@ using Ryujinx.HLE.HOS.Kernel.Common;
using Ryujinx.HLE.HOS.Kernel.Threading;
using Ryujinx.HLE.HOS.Services.Hid;
using Ryujinx.HLE.HOS.Services.Hid.HidServer;
using Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager;
using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager;
using System;
using System.Buffers.Binary;
using System.Globalization;
@ -16,7 +16,7 @@ using System.Threading.Tasks;
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
{
class IUser : IpcService
class INfp : IpcService
{
private ulong _appletResourceUserId;
private ulong _mcuVersionData;
@ -28,7 +28,12 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
private CancellationTokenSource _cancelTokenSource;
public IUser() { }
private NfpPermissionLevel _permissionLevel;
public INfp(NfpPermissionLevel permissionLevel)
{
_permissionLevel = permissionLevel;
}
[CommandHipc(0)]
// Initialize(u64, u64, pid, buffer<unknown, 5>)
@ -213,9 +218,9 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
return resultCode;
}
uint deviceHandle = (uint)context.RequestData.ReadUInt64();
UserManager.DeviceType deviceType = (UserManager.DeviceType)context.RequestData.ReadUInt32();
MountTarget mountTarget = (MountTarget)context.RequestData.ReadUInt32();
uint deviceHandle = (uint)context.RequestData.ReadUInt64();
DeviceType deviceType = (DeviceType)context.RequestData.ReadUInt32();
MountTarget mountTarget = (MountTarget)context.RequestData.ReadUInt32();
if (deviceType != 0)
{
@ -969,6 +974,20 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
throw new ServiceNotImplementedException(this, context, false);
}
[CommandHipc(102)]
// GetRegisterInfo2(bytes<8, 4>) -> buffer<unknown<0x100>, 0x1a>
public ResultCode GetRegisterInfo2(ServiceCtx context)
{
// TODO: Find the differencies between IUser and ISystem/IDebug.
if (_permissionLevel == NfpPermissionLevel.Debug || _permissionLevel == NfpPermissionLevel.System)
{
return GetRegisterInfo(context);
}
return ResultCode.DeviceNotFound;
}
private ResultCode CheckNfcIsEnabled()
{
// TODO: Call nn::settings::detail::GetNfcEnableFlag when it will be implemented.

2
Ryujinx.HLE/HOS/Services/Nfc/Nfp/UserManager/Types/AmiiboConstants.cs → Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/AmiiboConstants.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
{
static class AmiiboConstants
{

2
Ryujinx.HLE/HOS/Services/Nfc/Nfp/UserManager/Types/CommonInfo.cs → Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/CommonInfo.cs
View file

@ -1,7 +1,7 @@
using Ryujinx.Common.Memory;
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
{
[StructLayout(LayoutKind.Sequential, Size = 0x40)]
struct CommonInfo

7
Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/DeviceType.cs Normal file
View file

@ -0,0 +1,7 @@
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
{
enum DeviceType : uint
{
Amiibo
}
}

2
Ryujinx.HLE/HOS/Services/Nfc/Nfp/UserManager/Types/ModelInfo.cs → Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/ModelInfo.cs
View file

@ -1,7 +1,7 @@
using Ryujinx.Common.Memory;
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
{
[StructLayout(LayoutKind.Sequential, Size = 0x40)]
struct ModelInfo

2
Ryujinx.HLE/HOS/Services/Nfc/Nfp/UserManager/Types/MountTarget.cs → Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/MountTarget.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
{
enum MountTarget : uint
{

2
Ryujinx.HLE/HOS/Services/Nfc/Nfp/UserManager/Types/NfpDevice.cs → Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/NfpDevice.cs
View file

@ -1,7 +1,7 @@
using Ryujinx.HLE.HOS.Kernel.Threading;
using Ryujinx.HLE.HOS.Services.Hid;
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
{
class NfpDevice
{

2
Ryujinx.HLE/HOS/Services/Nfc/Nfp/UserManager/Types/NfpDeviceState.cs → Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/NfpDeviceState.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
{
enum NfpDeviceState
{

9
Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/NfpPermissionLevel.cs Normal file
View file

@ -0,0 +1,9 @@
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
{
enum NfpPermissionLevel
{
Debug,
User,
System
}
}

4
Ryujinx.HLE/HOS/Services/Nfc/Nfp/UserManager/Types/RegisterInfo.cs → Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/RegisterInfo.cs
View file

@ -2,7 +2,7 @@
using Ryujinx.HLE.HOS.Services.Mii.Types;
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
{
[StructLayout(LayoutKind.Sequential, Size = 0x100)]
struct RegisterInfo
@ -11,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager
public ushort FirstWriteYear;
public byte FirstWriteMonth;
public byte FirstWriteDay;
public Array11<byte> Nickname;
public Array41<byte> Nickname;
public byte FontRegion;
public Array64<byte> Reserved1;
public Array58<byte> Reserved2;

2
Ryujinx.HLE/HOS/Services/Nfc/Nfp/UserManager/Types/State.cs → Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/State.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
{
enum State
{

2
Ryujinx.HLE/HOS/Services/Nfc/Nfp/UserManager/Types/TagInfo.cs → Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/TagInfo.cs
View file

@ -1,7 +1,7 @@
using Ryujinx.Common.Memory;
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
{
[StructLayout(LayoutKind.Sequential, Size = 0x58)]
struct TagInfo

2
Ryujinx.HLE/HOS/Services/Nfc/Nfp/UserManager/Types/VirtualAmiiboFile.cs → Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/Types/VirtualAmiiboFile.cs
View file

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager
{
struct VirtualAmiiboFile
{

7
Ryujinx.HLE/HOS/Services/Nfc/Nfp/UserManager/Types/DeviceType.cs
View file

@ -1,7 +0,0 @@
namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager
{
enum DeviceType : uint
{
Amiibo
}
}

2
Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs
View file

@ -2,7 +2,7 @@
using Ryujinx.Common.Memory;
using Ryujinx.HLE.HOS.Services.Mii;
using Ryujinx.HLE.HOS.Services.Mii.Types;
using Ryujinx.HLE.HOS.Services.Nfc.Nfp.UserManager;
using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager;
using System;
using System.Collections.Generic;
using System.IO;