summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/hid/hid.h19
-rw-r--r--src/core/settings.h6
2 files changed, 25 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 {
47 BitField<10, 1, u32> x; 47 BitField<10, 1, u32> x;
48 BitField<11, 1, u32> y; 48 BitField<11, 1, u32> y;
49 49
50 BitField<14, 1, u32> zl;
51 BitField<15, 1, u32> zr;
52
53 BitField<20, 1, u32> touch;
54
55 BitField<24, 1, u32> c_right;
56 BitField<25, 1, u32> c_left;
57 BitField<26, 1, u32> c_up;
58 BitField<27, 1, u32> c_down;
50 BitField<28, 1, u32> circle_right; 59 BitField<28, 1, u32> circle_right;
51 BitField<29, 1, u32> circle_left; 60 BitField<29, 1, u32> circle_left;
52 BitField<30, 1, u32> circle_up; 61 BitField<30, 1, u32> circle_up;
@@ -99,6 +108,16 @@ const PadState PAD_R = {{1u << 8}};
99const PadState PAD_L = {{1u << 9}}; 108const PadState PAD_L = {{1u << 9}};
100const PadState PAD_X = {{1u << 10}}; 109const PadState PAD_X = {{1u << 10}};
101const PadState PAD_Y = {{1u << 11}}; 110const PadState PAD_Y = {{1u << 11}};
111
112const PadState PAD_ZL = {{1u << 14}};
113const PadState PAD_ZR = {{1u << 15}};
114
115const PadState PAD_TOUCH = {{1u << 20}};
116
117const PadState PAD_C_RIGHT = {{1u << 24}};
118const PadState PAD_C_LEFT = {{1u << 25}};
119const PadState PAD_C_UP = {{1u << 26}};
120const PadState PAD_C_DOWN = {{1u << 27}};
102const PadState PAD_CIRCLE_RIGHT = {{1u << 28}}; 121const PadState PAD_CIRCLE_RIGHT = {{1u << 28}};
103const PadState PAD_CIRCLE_LEFT = {{1u << 29}}; 122const PadState PAD_CIRCLE_LEFT = {{1u << 29}};
104const PadState PAD_CIRCLE_UP = {{1u << 30}}; 123const PadState PAD_CIRCLE_UP = {{1u << 30}};
diff --git a/src/core/settings.h b/src/core/settings.h
index e62dd4358..870eea958 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -16,6 +16,8 @@ struct Values {
16 int pad_y_key; 16 int pad_y_key;
17 int pad_l_key; 17 int pad_l_key;
18 int pad_r_key; 18 int pad_r_key;
19 int pad_zl_key;
20 int pad_zr_key;
19 int pad_start_key; 21 int pad_start_key;
20 int pad_select_key; 22 int pad_select_key;
21 int pad_home_key; 23 int pad_home_key;
@@ -27,6 +29,10 @@ struct Values {
27 int pad_sdown_key; 29 int pad_sdown_key;
28 int pad_sleft_key; 30 int pad_sleft_key;
29 int pad_sright_key; 31 int pad_sright_key;
32 int pad_cup_key;
33 int pad_cdown_key;
34 int pad_cleft_key;
35 int pad_cright_key;
30 36
31 // Core 37 // Core
32 int gpu_refresh_rate; 38 int gpu_refresh_rate;