diff options
| author | Ac_K <Acoustik666@gmail.com> | 2019-07-12 03:13:43 +0200 |
|---|---|---|
| committer | gdkchan <gab.dark.100@gmail.com> | 2019-07-11 22:13:43 -0300 |
| commit | 560ccbeb2d55a4426ad2827bf7534d4a695431c2 (patch) | |
| tree | 7e224acbd6c023ea56ff80c6207aa0966aa06ee5 /Ryujinx.HLE/HOS/Services/Nv | |
| parent | f723f6f39aaf7b1cebc0224a055058d62e3b689c (diff) | |
Refactoring commands handling (#728)
* Refactoring commands handling
- Use Reflection to handle commands ID.
- Add all symbols (from SwIPC so not all time accurate).
- Re-sort some services commands methods.
- Some cleanup.
- Keep some empty constructor for consistency.
* Fix order in IProfile
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Nv')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs b/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs index bfd91c44..32cdee74 100644 --- a/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs +++ b/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs @@ -20,10 +20,6 @@ namespace Ryujinx.HLE.HOS.Services.Nv { private delegate int IoctlProcessor(ServiceCtx context, int cmd); - private Dictionary<int, ServiceProcessRequest> _commands; - - public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands; - private static Dictionary<string, IoctlProcessor> _ioctlProcessors = new Dictionary<string, IoctlProcessor>() { @@ -42,19 +38,6 @@ namespace Ryujinx.HLE.HOS.Services.Nv public INvDrvServices(ServiceCtx context) { - _commands = new Dictionary<int, ServiceProcessRequest>() - { - { 0, Open }, - { 1, Ioctl }, - { 2, Close }, - { 3, Initialize }, - { 4, QueryEvent }, - { 8, SetClientPid }, - { 9, DumpGraphicsMemoryInfo }, - { 11, Ioctl }, - { 13, FinishInitialize } - }; - _event = new KEvent(context.Device.System); } @@ -63,6 +46,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv Fds = new GlobalStateTable(); } + [Command(0)] + // Open(buffer<bytes, 5> path) -> (u32 fd, u32 error_code) public long Open(ServiceCtx context) { long namePtr = context.Request.SendBuff[0].Position; @@ -77,6 +62,10 @@ namespace Ryujinx.HLE.HOS.Services.Nv return 0; } + [Command(1)] + // Ioctl(u32 fd, u32 rq_id, buffer<bytes, 0x21>) -> (u32 error_code, buffer<bytes, 0x22>) + [Command(11)] // 3.0.0+ + // Ioctl2(u32, u32, buffer<bytes, 0x21>, buffer<bytes, 0x21>) -> (u32, buffer<bytes, 0x22>) public long Ioctl(ServiceCtx context) { int fd = context.RequestData.ReadInt32(); @@ -101,6 +90,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv return 0; } + [Command(2)] + // Close(u32 fd) -> u32 error_code public long Close(ServiceCtx context) { int fd = context.RequestData.ReadInt32(); @@ -112,6 +103,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv return 0; } + [Command(3)] + // Initialize(u32 transfer_memory_size, handle<copy, process> current_process, handle<copy, transfer_memory> transfer_memory) -> u32 error_code public long Initialize(ServiceCtx context) { long transferMemSize = context.RequestData.ReadInt64(); @@ -124,6 +117,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv return 0; } + [Command(4)] + // QueryEvent(u32 fd, u32 event_id) -> (u32, handle<copy, event>) public long QueryEvent(ServiceCtx context) { int fd = context.RequestData.ReadInt32(); @@ -142,6 +137,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv return 0; } + [Command(8)] + // SetClientPID(u64, pid) -> u32 error_code public long SetClientPid(ServiceCtx context) { long pid = context.RequestData.ReadInt64(); @@ -151,6 +148,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv return 0; } + [Command(9)] + // DumpGraphicsMemoryInfo() public long DumpGraphicsMemoryInfo(ServiceCtx context) { Logger.PrintStub(LogClass.ServiceNv); @@ -158,6 +157,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv return 0; } + [Command(13)] + // FinishInitialize(unknown<8>) public long FinishInitialize(ServiceCtx context) { Logger.PrintStub(LogClass.ServiceNv); @@ -232,4 +233,4 @@ namespace Ryujinx.HLE.HOS.Services.Nv NvMapIoctl.UnloadProcess(process); } } -} +}
\ No newline at end of file |
