Another cleanup

This commit is contained in:
twinaphex 2016-08-08 01:23:48 +02:00
parent 10e35d4d75
commit 8d47b30a67

View File

@ -137,20 +137,14 @@ static void psp_joypad_poll(void)
{ {
unsigned j, k; unsigned j, k;
SceCtrlData state_tmp; SceCtrlData state_tmp;
int32_t ret; unsigned i = player;
unsigned p;
unsigned i = p = player;
#if defined(SN_TARGET_PSP2) || defined(VITA)
/* Dumb hack, but here's the explanation - /* Dumb hack, but here's the explanation -
* sceCtrlPeekBufferPositive's port parameter * sceCtrlPeekBufferPositive's port parameter
* can be 0 or 1 to read the first controller on * can be 0 or 1 to read the first controller on
* a PSTV, but HAS to be 0 for a real VITA and 2 * a PSTV, but HAS to be 0 for a real VITA and 2
* for the 2nd controller on a PSTV */ * for the 2nd controller on a PSTV */
if (p == 1) unsigned p = (p == 1) ? 2 : i;
p = 2; int32_t ret = CtrlPeekBufferPositive(p, &state_tmp, 1);
#endif
ret = CtrlPeekBufferPositive(p, &state_tmp, 1);
#ifdef HAVE_KERNEL_PRX #ifdef HAVE_KERNEL_PRX
state_tmp.Buttons = (state_tmp.Buttons & 0x0000FFFF) state_tmp.Buttons = (state_tmp.Buttons & 0x0000FFFF)