diff options
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Hid')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs | 24 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs | 6 |
2 files changed, 7 insertions, 23 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs b/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs index 55f8070a..ff93204c 100644 --- a/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs +++ b/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs @@ -328,17 +328,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid private void UpdateUnusedInputIfNotEqual(ref RingLifo<NpadCommonState> currentlyUsed, ref RingLifo<NpadCommonState> possiblyUnused) { - bool isEquals; - - unsafe - { - var aPointer = Unsafe.AsPointer(ref currentlyUsed); - var bPointer = Unsafe.AsPointer(ref possiblyUnused); - - isEquals = aPointer == bPointer; - } - - if (!isEquals) + if (!Unsafe.AreSame(ref currentlyUsed, ref possiblyUnused)) { NpadCommonState newState = new NpadCommonState(); @@ -357,17 +347,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid private void UpdateUnusedSixInputIfNotEqual(ref RingLifo<SixAxisSensorState> currentlyUsed, ref RingLifo<SixAxisSensorState> possiblyUnused) { - bool isEquals; - - unsafe - { - var aPointer = Unsafe.AsPointer(ref currentlyUsed); - var bPointer = Unsafe.AsPointer(ref possiblyUnused); - - isEquals = aPointer == bPointer; - } - - if (!isEquals) + if (!Unsafe.AreSame(ref currentlyUsed, ref possiblyUnused)) { SixAxisSensorState newState = new SixAxisSensorState(); diff --git a/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs b/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs index 5ef5f48d..b009f95e 100644 --- a/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs +++ b/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs @@ -1,4 +1,5 @@ using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Common; +using System.Runtime.InteropServices; namespace Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Npad { @@ -30,13 +31,16 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Npad public NpadBatteryLevel BatteryLevelJoyRight; public uint AppletFooterUiAttributes; public AppletFooterUiType AppletFooterUiType; - private unsafe fixed byte _reserved2[0x7B]; + private Reserved2Struct _reserved2; public RingLifo<NpadGcTriggerState> GcTrigger; public NpadLarkType LarkTypeLeftAndMain; public NpadLarkType LarkTypeRight; public NpadLuciaType LuciaType; public uint Unknown43EC; + [StructLayout(LayoutKind.Sequential, Size = 123, Pack = 1)] + private struct Reserved2Struct {} + public static NpadInternalState Create() { return new NpadInternalState |