mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-02 05:54:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Vita) Implement proper gamepad menu toggle combo for Vita, and remove

Browse Source 
old hack
This commit is contained in:
twinaphex 2016-08-02 16:48:54 +02:00
parent d77dd4f0d3
commit 64d6e0facf
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -574,6 +574,8 @@ static unsigned default_menu_btn_scroll_up = RETRO_DEVICE_ID_JOYPAD_L;
#if defined(__CELLOS_LV2__) || defined(_XBOX1) || defined(_XBOX360) #if defined(__CELLOS_LV2__) || defined(_XBOX1) || defined(_XBOX360)
static unsigned menu_toggle_gamepad_combo = INPUT_TOGGLE_L3_R3; static unsigned menu_toggle_gamepad_combo = INPUT_TOGGLE_L3_R3;
#elif defined(VITA)
static unsigned menu_toggle_gamepad_combo = INPUT_TOGGLE_L1_R1_START_SELECT;
#else #else
static unsigned menu_toggle_gamepad_combo = INPUT_TOGGLE_NONE; static unsigned menu_toggle_gamepad_combo = INPUT_TOGGLE_NONE;
#endif #endif

9
input/drivers_joypad/psp_joypad.c
View File

@ -161,15 +161,8 @@ static void psp_joypad_poll(void)
#ifdef HAVE_KERNEL_PRX #ifdef HAVE_KERNEL_PRX
if (STATE_BUTTON(state_tmp) & PSP_CTRL_NOTE) if (STATE_BUTTON(state_tmp) & PSP_CTRL_NOTE)
#else
if (
(pad_state & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L))
&& (pad_state & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R))
&& (pad_state & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_SELECT))
&& (pad_state & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_START))
)
#endif
BIT64_SET(lifecycle_state, RARCH_MENU_TOGGLE); BIT64_SET(lifecycle_state, RARCH_MENU_TOGGLE);
#endif
} }
static bool psp_joypad_query_pad(unsigned pad) static bool psp_joypad_query_pad(unsigned pad)

1
input/input_driver.h
View File

@ -54,6 +54,7 @@ enum input_toggle_type
INPUT_TOGGLE_NONE = 0, INPUT_TOGGLE_NONE = 0,
INPUT_TOGGLE_DOWN_Y_L_R, INPUT_TOGGLE_DOWN_Y_L_R,
INPUT_TOGGLE_L3_R3, INPUT_TOGGLE_L3_R3,
INPUT_TOGGLE_L1_R1_START_SELECT,
INPUT_TOGGLE_START_SELECT, INPUT_TOGGLE_START_SELECT,
INPUT_TOGGLE_LAST INPUT_TOGGLE_LAST
}; };

10
runloop.c
View File

@ -338,6 +338,16 @@ static bool runloop_cmd_get_state_menu_toggle_button_combo(
if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_R3)) if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_R3))
return false; return false;
break; break;
case INPUT_TOGGLE_L1_R1_START_SELECT:
if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_START))
return false;
if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_SELECT))
return false;
if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_L))
return false;
if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_R))
return false;
break;
case INPUT_TOGGLE_START_SELECT: case INPUT_TOGGLE_START_SELECT:
if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_START)) if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_START))
return false; return false;