summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Weiyi Wang2017-02-11 11:11:42 +0200
committerGravatar Yuri Kunde Schlesner2017-02-11 01:11:42 -0800
commit0dd007e9ba935940964c53d7467ae9d4135717de (patch)
tree12d4983a9f0f1b9a8ff642324711b4ea29fbcb2d /src
parentvideo_core: Fix benign out-of-bounds indexing of array (#2553) (diff)
downloadyuzu-0dd007e9ba935940964c53d7467ae9d4135717de.tar.gz
yuzu-0dd007e9ba935940964c53d7467ae9d4135717de.tar.xz
yuzu-0dd007e9ba935940964c53d7467ae9d4135717de.zip
hid: remove the touch field from PadState (#2557)
Diffstat (limited to 'src')
-rw-r--r--src/core/frontend/emu_window.cpp2
-rw-r--r--src/core/hle/service/hid/hid.h4
2 files changed, 0 insertions, 6 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp
index 4f0f786ce..6b4637741 100644
--- a/src/core/frontend/emu_window.cpp
+++ b/src/core/frontend/emu_window.cpp
@@ -70,14 +70,12 @@ void EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) {
70 (framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top); 70 (framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top);
71 71
72 touch_pressed = true; 72 touch_pressed = true;
73 pad_state.touch.Assign(1);
74} 73}
75 74
76void EmuWindow::TouchReleased() { 75void EmuWindow::TouchReleased() {
77 touch_pressed = false; 76 touch_pressed = false;
78 touch_x = 0; 77 touch_x = 0;
79 touch_y = 0; 78 touch_y = 0;
80 pad_state.touch.Assign(0);
81} 79}
82 80
83void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) { 81void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) {
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h
index 21e66dfe0..c7f4ee138 100644
--- a/src/core/hle/service/hid/hid.h
+++ b/src/core/hle/service/hid/hid.h
@@ -42,8 +42,6 @@ struct PadState {
42 BitField<14, 1, u32> zl; 42 BitField<14, 1, u32> zl;
43 BitField<15, 1, u32> zr; 43 BitField<15, 1, u32> zr;
44 44
45 BitField<20, 1, u32> touch;
46
47 BitField<24, 1, u32> c_right; 45 BitField<24, 1, u32> c_right;
48 BitField<25, 1, u32> c_left; 46 BitField<25, 1, u32> c_left;
49 BitField<26, 1, u32> c_up; 47 BitField<26, 1, u32> c_up;
@@ -203,8 +201,6 @@ const PadState PAD_Y = {{1u << 11}};
203const PadState PAD_ZL = {{1u << 14}}; 201const PadState PAD_ZL = {{1u << 14}};
204const PadState PAD_ZR = {{1u << 15}}; 202const PadState PAD_ZR = {{1u << 15}};
205 203
206const PadState PAD_TOUCH = {{1u << 20}};
207
208const PadState PAD_C_RIGHT = {{1u << 24}}; 204const PadState PAD_C_RIGHT = {{1u << 24}};
209const PadState PAD_C_LEFT = {{1u << 25}}; 205const PadState PAD_C_LEFT = {{1u << 25}};
210const PadState PAD_C_UP = {{1u << 26}}; 206const PadState PAD_C_UP = {{1u << 26}};