diff options
| author |  Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-02-21 23:50:16 +0000 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-02-22 21:09:08 +0100 |
| commit | aa64f69af019d6a30e812593eaa70ba9c90dd865 (patch) | |
| tree | f6de223fb79ddf3563d4c7f5a5e126f59f61835c /src/core | |
| parent | 3c5aaafb402dec431517faeb49a4b30c5ac42495 (diff) | |
Frontends, HID: Add New 3DS specific pad buttons, and stub the touch one.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/hid/hid.h | 19 | ||||
| -rw-r--r-- | src/core/settings.h | 6 |
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 2116d2ca..fc628f36 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}}; diff --git a/src/core/settings.h b/src/core/settings.h index e62dd435..870eea95 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -16,6 +16,8 @@ struct Values { int pad_y_key; int pad_l_key; int pad_r_key; + int pad_zl_key; + int pad_zr_key; int pad_start_key; int pad_select_key; int pad_home_key; @@ -27,6 +29,10 @@ struct Values { int pad_sdown_key; int pad_sleft_key; int pad_sright_key; + int pad_cup_key; + int pad_cdown_key; + int pad_cleft_key; + int pad_cright_key; // Core int gpu_refresh_rate; |