Merge pull request #595 from linkmauve/new-3ds-input

Frontends, HID: Add New 3DS specific pad buttons, and stub the touch one.

1 files changed, 19 insertions, 0 deletions

diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h
index 2116d2ca3..fc628f36a 100644
--- a/src/core/hle/service/hid/hid.h
+++ b/src/core/hle/service/hid/hid.h
@@ -47,6 +47,15 @@ struct PadState {
         BitField<10, 1, u32> x;
         BitField<11, 1, u32> y;
 
+        BitField<14, 1, u32> zl;
+        BitField<15, 1, u32> zr;
+
+        BitField<20, 1, u32> touch;
+
+        BitField<24, 1, u32> c_right;
+        BitField<25, 1, u32> c_left;
+        BitField<26, 1, u32> c_up;
+        BitField<27, 1, u32> c_down;
         BitField<28, 1, u32> circle_right;
         BitField<29, 1, u32> circle_left;
         BitField<30, 1, u32> circle_up;
@@ -99,6 +108,16 @@ const PadState PAD_R            = {{1u << 8}};
 const PadState PAD_L            = {{1u << 9}};
 const PadState PAD_X            = {{1u << 10}};
 const PadState PAD_Y            = {{1u << 11}};
+
+const PadState PAD_ZL           = {{1u << 14}};
+const PadState PAD_ZR           = {{1u << 15}};
+
+const PadState PAD_TOUCH        = {{1u << 20}};
+
+const PadState PAD_C_RIGHT      = {{1u << 24}};
+const PadState PAD_C_LEFT       = {{1u << 25}};
+const PadState PAD_C_UP         = {{1u << 26}};
+const PadState PAD_C_DOWN       = {{1u << 27}};
 const PadState PAD_CIRCLE_RIGHT = {{1u << 28}};
 const PadState PAD_CIRCLE_LEFT  = {{1u << 29}};
 const PadState PAD_CIRCLE_UP    = {{1u << 30}};