irs: Little service cleanup (#712)

* irs: Little service cleanup * more cleanup * Fix nit * Fix condition
2019-06-27 18:02:41 +02:00 · 2019-06-27 18:02:41 +02:00 · a8965aad97
commit a8965aad97
parent 36f62cbe72
5 changed files with 87 additions and 43 deletions
--- a/Ryujinx.HLE/HOS/Services/Hid/Irs/IIrSensorServer.cs
+++ b/Ryujinx.HLE/HOS/Services/Hid/Irs/IIrSensorServer.cs
@ -0,0 +1,112 @@
+using Ryujinx.Common.Logging;
+using Ryujinx.HLE.HOS.Ipc;
+using Ryujinx.HLE.HOS.Kernel.Common;
+using Ryujinx.HLE.Input;
+using System;
+using System.Collections.Generic;
+
+namespace Ryujinx.HLE.HOS.Services.Hid.Irs
+{
+    class IIrSensorServer : IpcService
+    {
+        private int _irsensorSharedMemoryHandle = 0;
+
+        private Dictionary<int, ServiceProcessRequest> _commands;
+
+        public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands;
+
+        public IIrSensorServer()
+        {
+            _commands = new Dictionary<int, ServiceProcessRequest>
+            {
+                { 302, ActivateIrsensor                  },
+                { 303, DeactivateIrsensor                },
+                { 304, GetIrsensorSharedMemoryHandle     },
+              //{ 305, StopImageProcessor                },
+              //{ 306, RunMomentProcessor                },
+              //{ 307, RunClusteringProcessor            },
+              //{ 308, RunImageTransferProcessor         },
+              //{ 309, GetImageTransferProcessorState    },
+              //{ 310, RunTeraPluginProcessor            },
+                { 311, GetNpadIrCameraHandle             },
+              //{ 312, RunPointingProcessor              },
+              //{ 313, SuspendImageProcessor             },
+              //{ 314, CheckFirmwareVersion              }, // 3.0.0+
+              //{ 315, SetFunctionLevel                  }, // 4.0.0+
+              //{ 316, RunImageTransferExProcessor       }, // 4.0.0+
+              //{ 317, RunIrLedProcessor                 }, // 4.0.0+
+              //{ 318, StopImageProcessorAsync           }, // 4.0.0+
+                { 319, ActivateIrsensorWithFunctionLevel }, // 4.0.0+
+            };
+        }
+
+        // ActivateIrsensor(nn::applet::AppletResourceUserId, pid)
+        public long ActivateIrsensor(ServiceCtx context)
+        {
+            long appletResourceUserId = context.RequestData.ReadInt64();
+
+            Logger.PrintStub(LogClass.ServiceIrs, new { appletResourceUserId });
+
+            return 0;
+        }
+
+        // DeactivateIrsensor(nn::applet::AppletResourceUserId, pid)
+        public long DeactivateIrsensor(ServiceCtx context)
+        {
+            long appletResourceUserId = context.RequestData.ReadInt64();
+
+            Logger.PrintStub(LogClass.ServiceIrs, new { appletResourceUserId });
+
+            return 0;
+        }
+
+        // GetIrsensorSharedMemoryHandle(nn::applet::AppletResourceUserId, pid) -> handle<copy>
+        public long GetIrsensorSharedMemoryHandle(ServiceCtx context)
+        {
+            if (_irsensorSharedMemoryHandle == 0)
+            {
+                if (context.Process.HandleTable.GenerateHandle(context.Device.System.IirsSharedMem, out _irsensorSharedMemoryHandle) != KernelResult.Success)
+                {
+                    throw new InvalidOperationException("Out of handles!");
+                }
+            }
+
+            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_irsensorSharedMemoryHandle);
+
+            return 0;
+        }
+
+        // GetNpadIrCameraHandle(u32) -> nn::irsensor::IrCameraHandle
+        public long GetNpadIrCameraHandle(ServiceCtx context)
+        {
+            NpadIdType npadIdType = (NpadIdType)context.RequestData.ReadUInt32();
+
+            if (npadIdType >  NpadIdType.Player8 && 
+                npadIdType != NpadIdType.Unknown && 
+                npadIdType != NpadIdType.Handheld)
+            {
+                return ErrorCode.MakeError(ErrorModule.Irsensor, IrsError.NpadIdOutOfRange);
+            }
+
+            HidControllerId irCameraHandle = HidUtils.GetIndexFromNpadIdType(npadIdType);
+
+            context.ResponseData.Write((int)irCameraHandle);
+
+            // NOTE: If the irCameraHandle pointer is null this error is returned, Doesn't occur in our case. 
+            //       return ErrorCode.MakeError(ErrorModule.Irsensor, IrsError.HandlePointerIsNull);
+
+            return 0;
+        }
+
+        // ActivateIrsensorWithFunctionLevel(nn::applet::AppletResourceUserId, nn::irsensor::PackedFunctionLevel, pid)
+        public long ActivateIrsensorWithFunctionLevel(ServiceCtx context)
+        {
+            long appletResourceUserId = context.RequestData.ReadInt64();
+            long packedFunctionLevel  = context.RequestData.ReadInt64();
+
+            Logger.PrintStub(LogClass.ServiceIrs, new { appletResourceUserId, packedFunctionLevel });
+
+            return 0;
+        }
+    }
+}