From e96efc2d1c09cb66e887c32bc609120cc1859489 Mon Sep 17 00:00:00 2001 From: jduncanator Date: Sat, 20 Apr 2019 11:24:48 +1000 Subject: [PATCH] Revise for changes in later firmware Based on RE work from 6.1.0 --- Ryujinx.HLE/HOS/Services/Irs/IIrSensorServer.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Ryujinx.HLE/HOS/Services/Irs/IIrSensorServer.cs b/Ryujinx.HLE/HOS/Services/Irs/IIrSensorServer.cs index 7b32366ba8..f29697f6ef 100644 --- a/Ryujinx.HLE/HOS/Services/Irs/IIrSensorServer.cs +++ b/Ryujinx.HLE/HOS/Services/Irs/IIrSensorServer.cs @@ -47,7 +47,12 @@ namespace Ryujinx.HLE.HOS.Services.Irs { uint npadId = context.RequestData.ReadUInt32(); - if(npadId > 0x20 || ((1 << (int)npadId) & 0x1000100FF) == 0) + if (npadId >= 8 && npadId != 16 && npadId != 32) + { + return ErrorCode.MakeError(ErrorModule.Hid, 0x2c5); + } + + if (((1 << (int)npadId) & 0x1000100FF) == 0) { return ErrorCode.MakeError(ErrorModule.Hid, 0x2c5); } @@ -73,7 +78,7 @@ namespace Ryujinx.HLE.HOS.Services.Irs case 7: return 7; case 32: return 8; case 16: return 9; - default: throw new ArgumentOutOfRangeException("npadId", "NpadId out of range"); + default: throw new ArgumentOutOfRangeException("npadId"); } } }