Allow multiple hid shared memory locations

2018-03-05 02:09:52 -03:00
parent 344fc8a55d
commit 73cc30cc80
4 changed files with 132 additions and 125 deletions
--- a/Ryujinx.Core/Switch.cs
+++ b/Ryujinx.Core/Switch.cs
@ -27,10 +27,16 @@ namespace Ryujinx.Core
            Ram = Marshal.AllocHGlobal((IntPtr)AMemoryMgr.RamSize);

            Gpu = new NsGpu(Renderer);
+
            VFs = new VirtualFs();

-            Hid      = new Hid(this);
-            Os       = new Horizon(this);
+            Hid = new Hid(Ram);
+
+            Os = new Horizon(this);
+
+            Os.HidSharedMem.MemoryMapped   += Hid.ShMemMap;
+            Os.HidSharedMem.MemoryUnmapped += Hid.ShMemUnmap;
+
            Settings = new SetSys();
        }