Some clean up and fixes

- Make sure to remove the fd of a closed channel.
- NvFileDevice now doesn't implement Disposable as it was never used.
- Rename NvHostCtrlGetConfigurationArgument to GetConfigurationArguments
to follow calling convention.
- Make sure to check every ioctls magic.

Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs

@@ -5,9 +5,9 @@ using Ryujinx.HLE.Exceptions;
 using Ryujinx.HLE.HOS.Ipc;
 using Ryujinx.HLE.HOS.Kernel.Memory;
 using Ryujinx.HLE.HOS.Kernel.Process;
-using Ryujinx.HLE.HOS.Kernel.Threading;
 using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices;
 using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostAsGpu;
+using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostChannel;
 using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl;
 using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrlGpu;
 using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap;
@@ -28,13 +28,16 @@ namespace Ryujinx.HLE.HOS.Services.Nv
         private static Dictionary<string, Type> _fileDeviceRegistry =
                    new Dictionary<string, Type>()
         {
-                       { "/dev/nvhost-as-gpu",   typeof(NvHostAsGpuFileDevice)   },
+                       { "/dev/nvmap",           typeof(NvMapFileDevice)         },
                        { "/dev/nvhost-ctrl",     typeof(NvHostCtrlFileDevice)    },
                        { "/dev/nvhost-ctrl-gpu", typeof(NvHostCtrlGpuFileDevice) },
-                       //{ "/dev/nvhost-gpu",      typeof(NvMapFileDevice) },
+                       { "/dev/nvhost-as-gpu",   typeof(NvHostAsGpuFileDevice)   },
-                       //{ "/dev/nvhost-nvdec",    typeof(NvMapFileDevice) },
+                       { "/dev/nvhost-gpu",      typeof(NvHostChannelFileDevice) },
-                       //{ "/dev/nvhost-vic",      typeof(NvMapFileDevice) },
+                       //{ "/dev/nvhost-msenc",    typeof(NvHostChannelFileDevice) },
-                       { "/dev/nvmap",           typeof(NvMapFileDevice) }
+                       { "/dev/nvhost-nvdec",    typeof(NvHostChannelFileDevice) },
+                       //{ "/dev/nvhost-nvjpg",    typeof(NvHostChannelFileDevice) },
+                       { "/dev/nvhost-vic",      typeof(NvHostChannelFileDevice) },
+                       //{ "/dev/nvhost-display",  typeof(NvHostChannelFileDevice) },
         };
 
         private static IdDictionary _fileDeviceIdRegistry = new IdDictionary();
@@ -287,6 +290,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv
                 if (errorCode == NvResult.Success)
                 {
                     fileDevice.Close();
+
+                    _fileDeviceIdRegistry.Delete(fd);
                 }
             }
 

Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvFileDevice.cs

@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices
 {
-    abstract class NvFileDevice : IDisposable
+    abstract class NvFileDevice
     {
         protected KProcess _owner;
 
@@ -62,10 +62,5 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices
         }
 
         public abstract void Close();
-
-        public void Dispose()
-        {
-            Close();
-        }
     }
 }

Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuFileDevice.cs

@@ -24,6 +24,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostAsGpu
         {
             NvInternalResult result = NvInternalResult.NotImplemented;
 
+            if (command.GetTypeValue() == NvIoctl.NvGpuAsMagic)
+            {
                 switch (command.GetNumberValue())
                 {
                     case 0x1:
@@ -51,6 +53,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostAsGpu
                         result = CallIoctlMethod<RemapArguments>(Remap, arguments);
                         break;
                 }
+            }
+
             return result;
         }
 

Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/NvHostChannelFileDevice.cs

@@ -0,0 +1,40 @@
+using Ryujinx.HLE.HOS.Kernel.Process;
+using System;
+
+namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostChannel
+{
+    class NvHostChannelFileDevice : NvFileDevice
+    {
+        public NvHostChannelFileDevice(KProcess owner) : base(owner)
+        {
+
+        }
+
+        public override NvInternalResult Ioctl(NvIoctl command, Span<byte> arguments)
+        {
+            NvInternalResult result = NvInternalResult.NotImplemented;
+
+            if (command.GetTypeValue() == NvIoctl.NvHostMagic)
+            {
+                switch (command.GetNumberValue())
+                {
+
+                }
+            }
+            else if (command.GetTypeValue() == NvIoctl.NvGpuMagic)
+            {
+                switch (command.GetNumberValue())
+                {
+
+                }
+            }
+
+            return result;
+        }
+
+        public override void Close()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrl/NvHostCtrlFileDevice.cs

@@ -23,11 +23,13 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl
         {
             NvInternalResult result = NvInternalResult.NotImplemented;
 
+            if (command.GetTypeValue() == NvIoctl.NvHostMagic)
+            {
                 switch (command.GetNumberValue())
                 {
                     case 0x1b:
                         // As Marshal cannot handle unaligned arrays, we do everything by hand here.
-                    NvHostCtrlGetConfigurationArgument configArgument = NvHostCtrlGetConfigurationArgument.FromSpan(arguments);
+                        GetConfigurationArguments configArgument = GetConfigurationArguments.FromSpan(arguments);
                         result = GetConfig(configArgument);
 
                         if (result == NvInternalResult.Success)
@@ -38,11 +40,12 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl
                     default:
                         break;
                 }
+            }
 
             return result;
         }
 
-        private NvInternalResult GetConfig(NvHostCtrlGetConfigurationArgument arguments)
+        private NvInternalResult GetConfig(GetConfigurationArguments arguments)
         {
             if (!_isProductionMode && NxSettings.Settings.TryGetValue($"{arguments.Domain}!{arguments.Parameter}".ToLower(), out object nvSetting))
             {

Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrl/Types/GetConfigurationArguments.cs

@@ -3,18 +3,18 @@ using System.Text;
 
 namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl.Types
 {
-    class NvHostCtrlGetConfigurationArgument
+    class GetConfigurationArguments
     {
         public string Domain;
         public string Parameter;
         public byte[] Configuration;
 
-        public static NvHostCtrlGetConfigurationArgument FromSpan(Span<byte> span)
+        public static GetConfigurationArguments FromSpan(Span<byte> span)
         {
             string domain        = Encoding.ASCII.GetString(span.Slice(0, 0x41));
             string parameter     = Encoding.ASCII.GetString(span.Slice(0x41, 0x41));
 
-            NvHostCtrlGetConfigurationArgument result = new NvHostCtrlGetConfigurationArgument
+            GetConfigurationArguments result = new GetConfigurationArguments
             {
                 Domain        = domain.Substring(0, domain.IndexOf('\0')),
                 Parameter     = parameter.Substring(0, parameter.IndexOf('\0')),

Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/NvHostCtrlGpuFileDevice.cs

@@ -24,6 +24,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrlGpu
         {
             NvInternalResult result = NvInternalResult.NotImplemented;
 
+            if (command.GetTypeValue() == NvIoctl.NvGpuMagic)
+            {
                 switch (command.GetNumberValue())
                 {
                     case 0x1:
@@ -48,6 +50,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrlGpu
                         result = CallIoctlMethod<GetGpuTimeArguments>(GetGpuTime, arguments);
                         break;
                 }
+            }
 
             return result;
         }

Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvMap/NvMapFileDevice.cs

@@ -24,6 +24,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap
         {
             NvInternalResult result = NvInternalResult.NotImplemented;
 
+            if (command.GetTypeValue() == NvIoctl.NvMapMagic)
+            {
                 switch (command.GetNumberValue())
                 {
                     case 0x1:
@@ -57,6 +59,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap
                         result = NvInternalResult.NotSupported;
                         break;
                 }
+            }
 
             return result;
         }

Ryujinx.HLE/HOS/Services/Nv/NvIoctl.cs

@@ -6,6 +6,11 @@ namespace Ryujinx.HLE.HOS.Services.Nv
     [StructLayout(LayoutKind.Sequential)]
     struct NvIoctl
     {
+        public const int NvHostMagic  = 0x00;
+        public const int NvMapMagic   = 0x01;
+        public const int NvGpuAsMagic = 0x41;
+        public const int NvGpuMagic   = 0x47;
+
         private const int NumberBits    = 8;
         private const int TypeBits      = 8;
         private const int SizeBits      = 14;