From 351b3fe3f6c1cdbf5209f5e29b6651302b0f764d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?=
 <frangarcj@gmail.com>
Date: Mon, 8 Aug 2016 12:56:30 +0200
Subject: [PATCH] (VITA) Workaround for PSVita Controls vs PSTV

---
 config.def.h                      | 4 ++++
 input/drivers_joypad/psp_joypad.c | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/config.def.h b/config.def.h
index 5d7e7184eb..365065d26d 100644
--- a/config.def.h
+++ b/config.def.h
@@ -796,7 +796,11 @@ static const bool input_descriptor_label_show = true;
 
 static const bool input_descriptor_hide_unbound = false;
 
+#if defined(PSP) || defined(VITA)
+static const unsigned input_max_users = 1;
+#else
 static const unsigned input_max_users = 5;
+#endif
 
 static const unsigned input_poll_type_behavior = 2;
 
diff --git a/input/drivers_joypad/psp_joypad.c b/input/drivers_joypad/psp_joypad.c
index 4823af486e..bfb072674e 100644
--- a/input/drivers_joypad/psp_joypad.c
+++ b/input/drivers_joypad/psp_joypad.c
@@ -124,11 +124,17 @@ static int16_t psp_joypad_axis(unsigned port_num, uint32_t joyaxis)
 
 static void psp_joypad_poll(void)
 {
+   settings_t *settings = config_get_ptr();
+
    unsigned player;
    unsigned players_count = PSP_MAX_PADS;
 #ifdef PSP
    sceCtrlSetSamplingCycle(0);
+#else
+   if(settings->input.max_users<PSP_MAX_PADS)
+      players_count = settings->input.max_users;
 #endif
+
    sceCtrlSetSamplingMode(DEFAULT_SAMPLING_MODE);
 
    BIT64_CLEAR(lifecycle_state, RARCH_MENU_TOGGLE);