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

Merge pull request #3362 from frangarcj/master

Browse Source 
(VITA) Workaround for PSVita Controls vs PSTV
This commit is contained in:
Twinaphex 2016-08-08 17:14:40 +02:00 committed by GitHub
commit b1791d4c30
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
input/drivers_joypad/psp_joypad.c
View File

@ -124,11 +124,14 @@ static int16_t psp_joypad_axis(unsigned port_num, uint32_t joyaxis)
static void psp_joypad_poll(void) static void psp_joypad_poll(void)
{ {
settings_t *settings = config_get_ptr();
unsigned player; unsigned player;
unsigned players_count = PSP_MAX_PADS; unsigned players_count = PSP_MAX_PADS;
#ifdef PSP #ifdef PSP
sceCtrlSetSamplingCycle(0); sceCtrlSetSamplingCycle(0);
#endif #endif
sceCtrlSetSamplingMode(DEFAULT_SAMPLING_MODE); sceCtrlSetSamplingMode(DEFAULT_SAMPLING_MODE);
BIT64_CLEAR(lifecycle_state, RARCH_MENU_TOGGLE); BIT64_CLEAR(lifecycle_state, RARCH_MENU_TOGGLE);
@ -146,15 +149,21 @@ static void psp_joypad_poll(void)
unsigned p = (player == 1) ? 2 : player; unsigned p = (player == 1) ? 2 : player;
int32_t ret = CtrlPeekBufferPositive(p, &state_tmp, 1); int32_t ret = CtrlPeekBufferPositive(p, &state_tmp, 1);
pad_state[i] = 0;
#if defined(SN_TARGET_PSP2) || defined(VITA)
if(ret<0){
continue;
}
#endif
#ifdef HAVE_KERNEL_PRX #ifdef HAVE_KERNEL_PRX
state_tmp.Buttons = (state_tmp.Buttons & 0x0000FFFF) state_tmp.Buttons = (state_tmp.Buttons & 0x0000FFFF)
| (read_system_buttons() & 0xFFFF0000); | (read_system_buttons() & 0xFFFF0000);
#endif #endif
(void)ret;
analog_state[i][0][0] = analog_state[i][0][1] = analog_state[i][0][0] = analog_state[i][0][1] =
analog_state[i][1][0] = analog_state[i][1][1] = 0; analog_state[i][1][0] = analog_state[i][1][1] = 0;
pad_state[i] = 0;
pad_state[i] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_LEFT) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0; pad_state[i] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_LEFT) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0;
pad_state[i] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_DOWN) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_DOWN) : 0; pad_state[i] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_DOWN) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_DOWN) : 0;
pad_state[i] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_RIGHT) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0; pad_state[i] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_RIGHT) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0;