From 2365ddfc363e76ac1ac9d2e32ef9b36b85463431 Mon Sep 17 00:00:00 2001 From: mageven <62494521+mageven@users.noreply.github.com> Date: Fri, 3 Apr 2020 05:40:02 +0530 Subject: HID SharedMem Rework (#1003) * Delete old HLE.Input * Add new HLE Input. git shows Hid.cs as modified because of the same name. It is new. * Change HID Service * Change Ryujinx UI to reflect new Input * Add basic ControllerApplet * Add DebugPad Should fix Kirby Star Allies * Address Ac_K's comments * Moved all of HLE.Input to Services.Hid * Separated all structs and enums each to a file * Removed vars * Made some naming changes to align with switchbrew * Added official joycon colors As an aside, fixed a mistake in touchscreen headers and added checks to important SharedMem structs at init time. * Further address Ac_K's comments * Addressed gdkchan's and some more Ac_K's comments * Address AcK's review comments * Address AcK's second review comments * Replace missed Marshal.SizeOf and address gdkchan's comments --- Ryujinx.HLE/Input/Touch/TouchData.cs | 18 ------------------ Ryujinx.HLE/Input/Touch/TouchEntry.cs | 11 ----------- Ryujinx.HLE/Input/Touch/TouchHeader.cs | 14 -------------- Ryujinx.HLE/Input/Touch/TouchPoint.cs | 11 ----------- 4 files changed, 54 deletions(-) delete mode 100644 Ryujinx.HLE/Input/Touch/TouchData.cs delete mode 100644 Ryujinx.HLE/Input/Touch/TouchEntry.cs delete mode 100644 Ryujinx.HLE/Input/Touch/TouchHeader.cs delete mode 100644 Ryujinx.HLE/Input/Touch/TouchPoint.cs (limited to 'Ryujinx.HLE/Input/Touch') diff --git a/Ryujinx.HLE/Input/Touch/TouchData.cs b/Ryujinx.HLE/Input/Touch/TouchData.cs deleted file mode 100644 index 8489ef70..00000000 --- a/Ryujinx.HLE/Input/Touch/TouchData.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Runtime.InteropServices; - -namespace Ryujinx.HLE.Input -{ - [StructLayout(LayoutKind.Sequential)] - public struct TouchData - { - public long SampleTimestamp; - public int Padding; - public int Index; - public int X; - public int Y; - public int DiameterX; - public int DiameterY; - public int Angle; - public int Padding2; - } -} diff --git a/Ryujinx.HLE/Input/Touch/TouchEntry.cs b/Ryujinx.HLE/Input/Touch/TouchEntry.cs deleted file mode 100644 index 2ef09d75..00000000 --- a/Ryujinx.HLE/Input/Touch/TouchEntry.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Runtime.InteropServices; - -namespace Ryujinx.HLE.Input -{ - [StructLayout(LayoutKind.Sequential)] - public unsafe struct TouchEntry - { - public long SamplesTimestamp; - public long TouchCount; - } -} diff --git a/Ryujinx.HLE/Input/Touch/TouchHeader.cs b/Ryujinx.HLE/Input/Touch/TouchHeader.cs deleted file mode 100644 index dd93137c..00000000 --- a/Ryujinx.HLE/Input/Touch/TouchHeader.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Runtime.InteropServices; - -namespace Ryujinx.HLE.Input -{ - [StructLayout(LayoutKind.Sequential)] - public struct TouchHeader - { - public long Timestamp; - public long EntryCount; - public long CurrentEntryIndex; - public long MaxEntries; - public long SamplesTimestamp; - } -} diff --git a/Ryujinx.HLE/Input/Touch/TouchPoint.cs b/Ryujinx.HLE/Input/Touch/TouchPoint.cs deleted file mode 100644 index a9b095de..00000000 --- a/Ryujinx.HLE/Input/Touch/TouchPoint.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Ryujinx.HLE.Input -{ - public struct TouchPoint - { - public int X; - public int Y; - public int DiameterX; - public int DiameterY; - public int Angle; - } -} \ No newline at end of file -- cgit v1.2.3