N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hid: remove the touch field from PadState (#2557)

Browse source
This commit is contained in:
Weiyi Wang 2017-02-11 11:11:42 +02:00 committed by Yuri Kunde Schlesner
parent e2fa1ca5e1
commit 0dd007e9ba
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/frontend/emu_window.cpp
View file

@ -70,14 +70,12 @@ void EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) {
(framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top); (framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top);
touch_pressed = true; touch_pressed = true;
pad_state.touch.Assign(1);
} }
void EmuWindow::TouchReleased() { void EmuWindow::TouchReleased() {
touch_pressed = false; touch_pressed = false;
touch_x = 0; touch_x = 0;
touch_y = 0; touch_y = 0;
pad_state.touch.Assign(0);
} }
void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) { void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) {

4
src/core/hle/service/hid/hid.h
View file

@ -42,8 +42,6 @@ struct PadState {
BitField<14, 1, u32> zl; BitField<14, 1, u32> zl;
BitField<15, 1, u32> zr; BitField<15, 1, u32> zr;
BitField<20, 1, u32> touch;
BitField<24, 1, u32> c_right; BitField<24, 1, u32> c_right;
BitField<25, 1, u32> c_left; BitField<25, 1, u32> c_left;
BitField<26, 1, u32> c_up; BitField<26, 1, u32> c_up;
@ -203,8 +201,6 @@ const PadState PAD_Y = {{1u << 11}};
const PadState PAD_ZL = {{1u << 14}}; const PadState PAD_ZL = {{1u << 14}};
const PadState PAD_ZR = {{1u << 15}}; const PadState PAD_ZR = {{1u << 15}};
const PadState PAD_TOUCH = {{1u << 20}};
const PadState PAD_C_RIGHT = {{1u << 24}}; const PadState PAD_C_RIGHT = {{1u << 24}};
const PadState PAD_C_LEFT = {{1u << 25}}; const PadState PAD_C_LEFT = {{1u << 25}};
const PadState PAD_C_UP = {{1u << 26}}; const PadState PAD_C_UP = {{1u << 26}};