Merge pull request #12424 from libretro/pstvinput

This commit is contained in:
Autechre 2021-05-21 13:13:28 +02:00 committed by GitHub
commit 5ae4524176
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -89,10 +89,8 @@ static void *psp_joypad_init(void *data)
unsigned players_count = DEFAULT_MAX_PADS;
#if defined(VITA)
if (!sceCtrlIsMultiControllerSupported())
psp2_model = SCE_KERNEL_MODEL_VITA;
else if(sceCtrlIsMultiControllerSupported() > 0)
psp2_model = SCE_KERNEL_MODEL_VITATV;
psp2_model = sceCtrlIsMultiControllerSupported()? SCE_KERNEL_MODEL_VITATV : SCE_KERNEL_MODEL_VITA;
if (psp2_model != SCE_KERNEL_MODEL_VITATV)
players_count = 1;
if (sceKernelGetModelForCDialog() != SCE_KERNEL_MODEL_VITATV)
@ -378,7 +376,8 @@ static bool psp_joypad_rumble(unsigned pad,
#ifdef VITA
if (psp2_model != SCE_KERNEL_MODEL_VITATV)
return false;
if(pad >= DEFAULT_MAX_PADS)
return false;
switch (effect)
{
case RETRO_RUMBLE_WEAK: