From 7a27990faa557c5c93f52e5cb082d551ad119ed0 Mon Sep 17 00:00:00 2001
From: gdkchan <gab.dark.100@gmail.com>
Date: Mon, 12 Mar 2018 01:04:52 -0300
Subject: Allow more than one process, free resources on process dispose,
 implement SvcExitThread

---
 Ryujinx.Core/Switch.cs | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'Ryujinx.Core/Switch.cs')

diff --git a/Ryujinx.Core/Switch.cs b/Ryujinx.Core/Switch.cs
index f7ce109f..487f3bdb 100644
--- a/Ryujinx.Core/Switch.cs
+++ b/Ryujinx.Core/Switch.cs
@@ -1,4 +1,3 @@
-using ChocolArm64.Memory;
 using Ryujinx.Core.Input;
 using Ryujinx.Core.OsHle;
 using Ryujinx.Core.Settings;
@@ -10,8 +9,6 @@ namespace Ryujinx.Core
 {
     public class Switch : IDisposable
     {
-        internal AMemory Memory { get; private set; }
-
         internal NsGpu     Gpu { get; private set; }
         internal Horizon   Os  { get; private set; }
         internal VirtualFs VFs { get; private set; }
@@ -24,13 +21,11 @@ namespace Ryujinx.Core
 
         public Switch(IGalRenderer Renderer)
         {
-            Memory = new AMemory();
-
             Gpu = new NsGpu(Renderer);
 
             VFs = new VirtualFs();
 
-            Hid = new Hid(Memory);
+            Hid = new Hid();
 
             Statistics = new PerformanceStatistics();
 
@@ -42,11 +37,6 @@ namespace Ryujinx.Core
             Settings = new SetSys();
         }
 
-        public void FinalizeAllProcesses()
-        {
-            Os.FinalizeAllProcesses();
-        }
-
         public void LoadCart(string ExeFsDir, string RomFsFile = null)
         {
             Os.LoadCart(ExeFsDir, RomFsFile);
@@ -67,12 +57,11 @@ namespace Ryujinx.Core
             Dispose(true);
         }
 
-        protected virtual void Dispose(bool disposing)
+        protected virtual void Dispose(bool Disposing)
         {
-            if (disposing)
+            if (Disposing)
             {
-                Memory.Dispose();
-
+                Os.Dispose();
                 VFs.Dispose();
             }
         }
-- 
cgit v1.2.3