aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Core/Switch.cs
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2018-03-05 02:09:52 -0300
committergdkchan <gab.dark.100@gmail.com>2018-03-05 02:09:52 -0300
commit73cc30cc8015685cdb2b8630492703e16f8b4bd9 (patch)
treece2f84b881e95c948b5ed37e3331c1e9d4224f45 /Ryujinx.Core/Switch.cs
parent344fc8a55de471121d3f600cca9e95315d0e502f (diff)
Allow multiple hid shared memory locations
Diffstat (limited to 'Ryujinx.Core/Switch.cs')
-rw-r--r--Ryujinx.Core/Switch.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/Ryujinx.Core/Switch.cs b/Ryujinx.Core/Switch.cs
index 6f41da81..3f7b1e2b 100644
--- 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();
}