From 550747eac6c0f6da14070c8b6d208bde6f1d1eb9 Mon Sep 17 00:00:00 2001 From: Ac_K Date: Sun, 8 Jan 2023 13:13:39 +0100 Subject: Horizon: Impl Prepo, Fixes bugs, Clean things (#4220) * Horizon: Impl Prepo, Fixes bugs, Clean things * remove ToArray() * resultCode > status * Remove old services * Addresses gdkchan's comments and more cleanup * Addresses Gdkchan's feedback 2 * Reorganize services, make sure service are loaded before guest Co-Authored-By: gdkchan <5624669+gdkchan@users.noreply.github.com> * Create interfaces for lm and sm Co-authored-by: gdkchan <5624669+gdkchan@users.noreply.github.com> --- Ryujinx.Horizon/ServiceEntry.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'Ryujinx.Horizon/ServiceEntry.cs') diff --git a/Ryujinx.Horizon/ServiceEntry.cs b/Ryujinx.Horizon/ServiceEntry.cs index 3fea46c1..06152d9f 100644 --- a/Ryujinx.Horizon/ServiceEntry.cs +++ b/Ryujinx.Horizon/ServiceEntry.cs @@ -6,20 +6,22 @@ namespace Ryujinx.Horizon { public struct ServiceEntry { - private readonly Action _entrypoint; - private readonly HorizonOptions _options; + private readonly Action _entrypoint; + private readonly ServiceTable _serviceTable; + private readonly HorizonOptions _options; - internal ServiceEntry(Action entrypoint, HorizonOptions options) + internal ServiceEntry(Action entrypoint, ServiceTable serviceTable, HorizonOptions options) { - _entrypoint = entrypoint; - _options = options; + _entrypoint = entrypoint; + _serviceTable = serviceTable; + _options = options; } public void Start(ISyscallApi syscallApi, IVirtualMemoryManager addressSpace, IThreadContext threadContext) { HorizonStatic.Register(_options, syscallApi, addressSpace, threadContext, (int)threadContext.GetX(1)); - _entrypoint(); + _entrypoint(_serviceTable); } } -} +} \ No newline at end of file -- cgit v1.2.3