diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2018-09-23 15:11:46 -0300 |
|---|---|---|
| committer | Thomas Guillemard <thog@protonmail.com> | 2018-09-23 20:11:46 +0200 |
| commit | 7de7b559adc1924d3ff31cc58b281f70e468155f (patch) | |
| tree | 3701e1687f7fc4c4bafdffd5abda1966e6ce320f /Ryujinx.HLE/HOS/Services/Nfp | |
| parent | 54ed9096bd4add5cf2ca320123f551f60c06a57f (diff) | |
Improve kernel events implementation (#430)
* Improve kernel events implementation
* Some cleanup
* Address PR feedback
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Nfp')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Nfp/IUser.cs | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Nfp/IUser.cs b/Ryujinx.HLE/HOS/Services/Nfp/IUser.cs index 33f73967..72a385d2 100644 --- a/Ryujinx.HLE/HOS/Services/Nfp/IUser.cs +++ b/Ryujinx.HLE/HOS/Services/Nfp/IUser.cs @@ -2,6 +2,7 @@ using Ryujinx.HLE.HOS.Kernel; using Ryujinx.HLE.Input; using Ryujinx.HLE.Logging; +using System; using System.Collections.Generic; namespace Ryujinx.HLE.HOS.Services.Nfp @@ -55,7 +56,10 @@ namespace Ryujinx.HLE.HOS.Services.Nfp { Context.Device.Log.PrintStub(LogClass.ServiceNfp, "Stubbed."); - int Handle = Context.Process.HandleTable.OpenHandle(ActivateEvent); + if (Context.Process.HandleTable.GenerateHandle(ActivateEvent.ReadableEvent, out int Handle) != KernelResult.Success) + { + throw new InvalidOperationException("Out of handles!"); + } Context.Response.HandleDesc = IpcHandleDesc.MakeCopy(Handle);; @@ -66,7 +70,10 @@ namespace Ryujinx.HLE.HOS.Services.Nfp { Context.Device.Log.PrintStub(LogClass.ServiceNfp, "Stubbed."); - int Handle = Context.Process.HandleTable.OpenHandle(DeactivateEvent); + if (Context.Process.HandleTable.GenerateHandle(DeactivateEvent.ReadableEvent, out int Handle) != KernelResult.Success) + { + throw new InvalidOperationException("Out of handles!"); + } Context.Response.HandleDesc = IpcHandleDesc.MakeCopy(Handle); @@ -104,7 +111,10 @@ namespace Ryujinx.HLE.HOS.Services.Nfp { Context.Device.Log.PrintStub(LogClass.ServiceNfp, "Stubbed."); - int Handle = Context.Process.HandleTable.OpenHandle(AvailabilityChangeEvent); + if (Context.Process.HandleTable.GenerateHandle(AvailabilityChangeEvent.ReadableEvent, out int Handle) != KernelResult.Success) + { + throw new InvalidOperationException("Out of handles!"); + } Context.Response.HandleDesc = IpcHandleDesc.MakeCopy(Handle); |