From 15d1cc806b1b978bab83d8bb426a124d9f0f788c Mon Sep 17 00:00:00 2001 From: gdkchan Date: Mon, 4 May 2020 00:41:29 -0300 Subject: Move kernel state out of the Horizon class (#1107) * Move kernel state from Horizon to KernelContext * Merge syscalls partial classes, split 32 and 64-bit variants * Sort usings --- Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs') diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs index a5109e96..b99dd1cb 100644 --- a/Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs +++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs @@ -17,31 +17,31 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc // services implementation to work with the new IPC system. public IpcService Service { get; set; } - public KClientSession(Horizon system, KSession parent) : base(system) + public KClientSession(KernelContext context, KSession parent) : base(context) { _parent = parent; State = ChannelState.Open; - CreatorProcess = system.Scheduler.GetCurrentProcess(); + CreatorProcess = context.Scheduler.GetCurrentProcess(); CreatorProcess.IncrementReferenceCount(); } public KernelResult SendSyncRequest(ulong customCmdBuffAddr = 0, ulong customCmdBuffSize = 0) { - KThread currentThread = System.Scheduler.GetCurrentThread(); + KThread currentThread = KernelContext.Scheduler.GetCurrentThread(); KSessionRequest request = new KSessionRequest(currentThread, customCmdBuffAddr, customCmdBuffSize); - System.CriticalSection.Enter(); + KernelContext.CriticalSection.Enter(); currentThread.SignaledObj = null; currentThread.ObjSyncResult = KernelResult.Success; KernelResult result = _parent.ServerSession.EnqueueRequest(request); - System.CriticalSection.Leave(); + KernelContext.CriticalSection.Leave(); if (result == KernelResult.Success) { -- cgit v1.2.3