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>

1 files changed, 9 insertions, 7 deletions

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<ServiceTable> _entrypoint;
+        private readonly ServiceTable         _serviceTable;
+        private readonly HorizonOptions       _options;
 
-        internal ServiceEntry(Action entrypoint, HorizonOptions options)
+        internal ServiceEntry(Action<ServiceTable> 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