From 61c4962abc49e430aabea5e565d93436a57cfa0a Mon Sep 17 00:00:00 2001
From: alexis-puska
Date: Mon, 9 May 2016 10:33:05 +0100
Subject: Initial multitap support

---
 frontend/libretro.c   | 229 ++++++++++++++++++++++++++++++--------------------
 frontend/main.c       |   9 +-
 frontend/plugin.c     |  37 ++++----
 frontend/plugin_lib.c |  14 +--
 frontend/plugin_lib.h |  10 ++-
 5 files changed, 181 insertions(+), 118 deletions(-)

(limited to 'frontend')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index ec06527..d6922cb 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -25,7 +25,6 @@
 #include "main.h"
 #include "plugin.h"
 #include "plugin_lib.h"
-#include "arm_features.h"
 #include "revision.h"
 #include "libretro.h"
 
@@ -54,10 +53,19 @@ extern char Mcd1Data[MCD_SIZE];
 extern char McdDisable[2];
 
 /* PCSX ReARMed core calls and stuff */
-int in_type1, in_type2;
-int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
-int in_a3[2] = { 127, 127 }, in_a4[2] = { 127, 127 };
-int in_keystate;
+//int in_type1, in_type2;
+//int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
+//int in_a3[2] = { 127, 127 }, in_a4[2] = { 127, 127 };
+//int in_keystate;
+
+int in_type[8];
+int in_analog_left[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
+int in_analog_right[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
+unsigned short in_keystate[8];
+
+
+
+
 int in_enable_vibration = 1;
 
 /* PSX max resolution is 640x512, but with enhancement it's 1024x512 */
@@ -329,7 +337,13 @@ void retro_set_environment(retro_environment_t cb)
       { "pcsx_rearmed_frameskip", "Frameskip; 0|1|2|3" },
       { "pcsx_rearmed_region", "Region; Auto|NTSC|PAL" },
       { "pcsx_rearmed_pad1type", "Pad 1 Type; standard|analog|negcon" },
-      { "pcsx_rearmed_pad2type", "Pad 2 Type; standard|analog|negcon" },
+	  { "pcsx_rearmed_pad2type", "Pad 2 Type; standard|analog|negcon" },
+	  { "pcsx_rearmed_pad3type", "Pad 3 Type; standard|analog|negcon" },
+	  { "pcsx_rearmed_pad4type", "Pad 4 Type; standard|analog|negcon" },
+	  { "pcsx_rearmed_pad5type", "Pad 5 Type; standard|analog|negcon" },
+	  { "pcsx_rearmed_pad6type", "Pad 6 Type; standard|analog|negcon" },
+	  { "pcsx_rearmed_pad7type", "Pad 7 Type; standard|analog|negcon" },
+	  { "pcsx_rearmed_pad8type", "Pad 8 Type; standard|analog|negcon" },
 #ifndef DRC_DISABLE
       { "pcsx_rearmed_drc", "Dynamic recompiler; enabled|disabled" },
 #endif
@@ -364,6 +378,7 @@ unsigned retro_api_version(void)
 
 void retro_set_controller_port_device(unsigned port, unsigned device)
 {
+	printf("port %u  device %u",port,device);
 }
 
 void retro_get_system_info(struct retro_system_info *info)
@@ -1046,7 +1061,6 @@ static void update_variables(bool in_flight)
 
    var.value = NULL;
    var.key = "pcsx_rearmed_region";
-
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
    {
       Config.PsxAuto = 0;
@@ -1060,29 +1074,100 @@ static void update_variables(bool in_flight)
 
    var.value = NULL;
    var.key = "pcsx_rearmed_pad1type";
-
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
    {
-      in_type1 = PSE_PAD_TYPE_STANDARD;
+      in_type[0] = PSE_PAD_TYPE_STANDARD;
       if (strcmp(var.value, "analog") == 0)
-         in_type1 = PSE_PAD_TYPE_ANALOGPAD;
+         in_type[0] = PSE_PAD_TYPE_ANALOGPAD;
       if (strcmp(var.value, "negcon") == 0)
-         in_type1 = PSE_PAD_TYPE_NEGCON;
+         in_type[0] = PSE_PAD_TYPE_NEGCON;
    }
 
    var.value = NULL;
    var.key = "pcsx_rearmed_pad2type";
-
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
    {
-      in_type2 = PSE_PAD_TYPE_STANDARD;
+      in_type[1] = PSE_PAD_TYPE_STANDARD;
       if (strcmp(var.value, "analog") == 0)
-         in_type2 = PSE_PAD_TYPE_ANALOGPAD;
+         in_type[1] = PSE_PAD_TYPE_ANALOGPAD;
       if (strcmp(var.value, "negcon") == 0)
-         in_type2 = PSE_PAD_TYPE_NEGCON;
-
+         in_type[1] = PSE_PAD_TYPE_NEGCON;
    }
 
+	var.value = NULL;
+	var.key = "pcsx_rearmed_pad3type";
+	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+	{
+		in_type[2] = PSE_PAD_TYPE_STANDARD;
+		if (strcmp(var.value, "analog") == 0)
+			in_type[2] = PSE_PAD_TYPE_ANALOGPAD;
+		if (strcmp(var.value, "negcon") == 0)
+			in_type[2] = PSE_PAD_TYPE_NEGCON;
+	}
+
+   	var.value = NULL;
+	var.key = "pcsx_rearmed_pad4type";
+	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value){
+		in_type[3] = PSE_PAD_TYPE_STANDARD;
+		if (var.value != NULL){
+			if (strcmp(var.value, "analog") == 0)
+				in_type[3] = PSE_PAD_TYPE_ANALOGPAD;
+			if (strcmp(var.value, "negcon") == 0)
+				in_type[3] = PSE_PAD_TYPE_NEGCON;
+		}
+	}
+
+	var.value = NULL;
+	var.key = "pcsx_rearmed_pad5type";
+	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+	{
+		in_type[4] = PSE_PAD_TYPE_STANDARD;
+		if (var.value != NULL){
+			if (strcmp(var.value, "analog") == 0)
+				in_type[4] = PSE_PAD_TYPE_ANALOGPAD;
+			if (strcmp(var.value, "negcon") == 0)
+				in_type[4] = PSE_PAD_TYPE_NEGCON;
+		}
+	}
+
+	var.value = NULL;
+	var.key = "pcsx_rearmed_pad6type";
+	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value){
+		in_type[5] = PSE_PAD_TYPE_STANDARD;
+		if (var.value != NULL){
+			if (strcmp(var.value, "analog") == 0)
+				in_type[5] = PSE_PAD_TYPE_ANALOGPAD;
+			if (strcmp(var.value, "negcon") == 0)
+				in_type[5] = PSE_PAD_TYPE_NEGCON;
+		}
+	}
+
+	var.value = NULL;
+	var.key = "pcsx_rearmed_pad7type";
+	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value){
+		in_type[6] = PSE_PAD_TYPE_STANDARD;
+		if (var.value != NULL){
+			if (strcmp(var.value, "analog") == 0)
+				in_type[6] = PSE_PAD_TYPE_ANALOGPAD;
+			if (strcmp(var.value, "negcon") == 0)
+				in_type[6] = PSE_PAD_TYPE_NEGCON;
+		}
+	}
+
+	var.value = NULL;
+	var.key = "pcsx_rearmed_pad8type";
+	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value){
+		in_type[7] = PSE_PAD_TYPE_STANDARD;
+		if (var.value != NULL){
+			if (strcmp(var.value, "analog") == 0)
+				in_type[7] = PSE_PAD_TYPE_ANALOGPAD;
+			if (strcmp(var.value, "negcon") == 0)
+				in_type[7] = PSE_PAD_TYPE_NEGCON;
+		}
+	}
+
+
+
 #ifdef __ARM_NEON__
    var.value = "NULL";
    var.key = "pcsx_rearmed_neon_interlace_enable";
@@ -1219,7 +1304,8 @@ static void update_variables(bool in_flight)
 
 void retro_run(void) 
 {
-	int i, val;
+
+	int i;
 
 	input_poll_cb();
 
@@ -1227,85 +1313,47 @@ void retro_run(void)
 	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
 		update_variables(true);
 
-	in_keystate = 0;
-	for (i = 0; i < RETRO_PSX_MAP_LEN; i++)
-		if (input_state_cb(1, RETRO_DEVICE_JOYPAD, 0, i))
-			in_keystate |= retro_psx_map[i];
-	in_keystate <<= 16;
-	for (i = 0; i < RETRO_PSX_MAP_LEN; i++)
-		if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, i))
-			in_keystate |= retro_psx_map[i];
 
 
-	if (in_type1 == PSE_PAD_TYPE_ANALOGPAD)
-	{
-		in_a1[0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-		in_a1[1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
-		in_a2[0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-		in_a2[1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+	// récupération de l'état des boutons par libretro
+
+//	in_keystate = 0;
+//	for (i = 0; i < RETRO_PSX_MAP_LEN; i++){
+//		if (input_state_cb(1, RETRO_DEVICE_JOYPAD, 0, i))
+//			in_keystate |= retro_psx_map[i];
+//
+//	}
+//	in_keystate <<= 16;
+//	for (i = 0; i < RETRO_PSX_MAP_LEN; i++)
+//		if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, i))
+//			in_keystate |= retro_psx_map[i];
+
+	//reset all keystate, query from libretro for keystate
+	int j;
+	for(i=0;i<8;i++){
+		in_keystate[i] = 0;
+		//query from libretro for keystate
+		for (j = 0; j < RETRO_PSX_MAP_LEN; j++){
+			if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, j))
+				in_keystate[i] |= retro_psx_map[j];
+		}
 	}
 
-	if (in_type2 == PSE_PAD_TYPE_ANALOGPAD)
+	if (in_type[0] == PSE_PAD_TYPE_ANALOGPAD)
 	{
-		in_a3[0] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-		in_a3[1] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
-		in_a4[0] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-		in_a4[1] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+		in_analog_left[0][0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
+		in_analog_left[0][1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+		in_analog_right[0][0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
+		in_analog_right[0][1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
 	}
 
-
-        if (in_type1 == PSE_PAD_TYPE_NEGCON)
-        {
-		/* left brake */
-		if(input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, 12))
-			in_a1[1] = 255;
-              	else
-			in_a1[1] =  0;
-
-		/* steer */
-                in_a2[0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-
-		/* thrust and fire */
-                val = ((input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 127));
-                if(val < -2) {
-                        in_a1[0] = 256 - val;
-                } 
-                 if (val > 2) {
-                        in_a2[1] = val;
-                } 
-                if(val >= -2 && val <= 2)
-                {
-                        in_a2[1] = 0;
-                        in_a1[0] = 0;
-                }
-        }
-
-        if (in_type2 == PSE_PAD_TYPE_NEGCON)
-        {
-		/* left brake */
-		if(input_state_cb(1, RETRO_DEVICE_JOYPAD, 0, 12))
-			in_a3[1] = 255;
-              	else
-			in_a3[1] =  0;
-
-		/* steer */
-                in_a4[0] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-
-		/* thrust and fire */
-                val = ((input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 127));
-                if(val < -2) {
-                        in_a3[0] = 256 - val;
-                } 
-                 if (val > 2) {
-                        in_a4[1] = val;
-                } 
-                if(val >= -2 && val <= 2)
-                {
-                        in_a4[1] = 0;
-                        in_a3[0] = 0;
-                }
-        }
-
+	if (in_type[1] == PSE_PAD_TYPE_ANALOGPAD)
+	{
+		in_analog_left[1][0] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
+		in_analog_left[1][1] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+		in_analog_right[1][0] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
+		in_analog_right[1][1] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+	}
 
 	stop = 0;
 	psxCpu->Execute();
@@ -1442,8 +1490,9 @@ void retro_init(void)
 	/* Set how much slower PSX CPU runs * 100 (so that 200 is 2 times)
 	 * we have to do this because cache misses and some IO penalties
 	 * are not emulated. Warning: changing this may break compatibility. */
+#if !defined(__arm__) || defined(__ARM_ARCH_7A__)
 	cycle_multiplier = 175;
-#ifdef HAVE_PRE_ARMV7
+#else
 	cycle_multiplier = 200;
 #endif
 	pl_rearmed_cbs.gpu_peops.iUseDither = 1;
diff --git a/frontend/main.c b/frontend/main.c
index f048584..4d43549 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -26,7 +26,6 @@
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
 #include "../plugins/dfsound/spu_config.h"
-#include "arm_features.h"
 #include "revision.h"
 
 #ifndef NO_FRONTEND
@@ -143,7 +142,7 @@ void emu_set_default_config(void)
 	spu_config.iVolume = 768;
 	spu_config.iTempo = 0;
 	spu_config.iUseThread = 1; // no effect if only 1 core is detected
-#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
+#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX GPH hack */
 	spu_config.iUseReverb = 0;
 	spu_config.iUseInterpolation = 0;
 	spu_config.iTempo = 1;
@@ -151,8 +150,8 @@ void emu_set_default_config(void)
 	new_dynarec_hacks = 0;
 	cycle_multiplier = 200;
 
-	in_type1 = PSE_PAD_TYPE_STANDARD;
-	in_type2 = PSE_PAD_TYPE_STANDARD;
+	in_type[0] = PSE_PAD_TYPE_STANDARD;
+	in_type[1] = PSE_PAD_TYPE_STANDARD;
 }
 
 void do_emu_action(void)
@@ -772,7 +771,7 @@ int emu_save_state(int slot)
 		return ret;
 
 	ret = SaveState(fname);
-#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
+#if defined(__arm__) && !defined(__ARM_ARCH_7A__) && !defined(_3DS) /* XXX GPH hack */
 	sync();
 #endif
 	SysPrintf("* %s \"%s\" [%d]\n",
diff --git a/frontend/plugin.c b/frontend/plugin.c
index 03fd47b..acc5601 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -49,28 +49,35 @@ extern void CALLBACK SPUasync(unsigned int, unsigned int);
 extern int  CALLBACK SPUplayCDDAchannel(short *, int);
 
 /* PAD */
-static long PADreadPort1(PadDataS *pad)
+
+
+// Lecture du port de la playstation, etat des boutons lu à cette endroit !
+// Distribution des  manettes en fonction du port. Si 2, une sur chacun des ports.
+// Si supérieur a deux on en connecte 4 sur port 1 et le reste sur port 2
+static long PADreadPort1(PadDataS *pad, int pad_index)
 {
-	pad->controllerType = in_type1;
-	pad->buttonStatus = ~in_keystate;
-	if (in_type1 == PSE_PAD_TYPE_ANALOGPAD || in_type1 == PSE_PAD_TYPE_NEGCON) {
-                pad->leftJoyX = in_a1[0];
-                pad->leftJoyY = in_a1[1];
-                pad->rightJoyX = in_a2[0];
-                pad->rightJoyY = in_a2[1];
+	pad->controllerType = in_type[pad_index];
+	pad->buttonStatus = ~in_keystate[pad_index];
+	//pad->buttonStatus = ~in_keystate;
+	if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) {
+                pad->leftJoyX = in_analog_left[pad_index][0];
+                pad->leftJoyY = in_analog_left[pad_index][1];
+                pad->rightJoyX = in_analog_right[pad_index][0];
+                pad->rightJoyY = in_analog_right[pad_index][1];
         }
 	return 0;
 }
 
 static long PADreadPort2(PadDataS *pad)
 {
-	pad->controllerType = in_type2;
-	pad->buttonStatus = ~in_keystate >> 16;
-	if (in_type2 == PSE_PAD_TYPE_ANALOGPAD || in_type2 == PSE_PAD_TYPE_NEGCON) {
-		pad->leftJoyX = in_a3[0];
-		pad->leftJoyY = in_a3[1];
-		pad->rightJoyX = in_a4[0];
-		pad->rightJoyY = in_a4[1];
+	pad->controllerType = in_type[4];
+	pad->buttonStatus = ~in_keystate[4];
+	//pad->buttonStatus = ~in_keystate >> 16;
+	if (in_type[4] == PSE_PAD_TYPE_ANALOGPAD || in_type[4] == PSE_PAD_TYPE_NEGCON) {
+		pad->leftJoyX = in_analog_left[4][0];
+		pad->leftJoyY = in_analog_left[4][1];
+		pad->rightJoyX = in_analog_right[4][0];
+		pad->rightJoyY = in_analog_right[4][1];
 	}
 	return 0;
 }
diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 237a5eb..89803ce 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -36,9 +36,10 @@
 
 #define HUD_HEIGHT 10
 
-int in_type1, in_type2;
-int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
-int in_a3[2] = { 127, 127 }, in_a4[2] = { 127, 127 };
+int in_type[8];
+int in_analog_left[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
+int in_analog_right[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
+//int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
 int in_adev[2] = { -1, -1 }, in_adev_axis[2][2] = {{ 0, 1 }, { 0, 1 }};
 int in_adev_is_nublike[2];
 int in_keystate, in_state_gun;
@@ -561,7 +562,7 @@ static void update_analog_nub_adjust(int *x_, int *y_)
 
 static void update_analogs(void)
 {
-	int *nubp[2] = { in_a1, in_a2 };
+	int *nubp[2] = { in_analog_left[0], in_analog_right[0] };
 	int vals[2];
 	int i, a, v, ret;
 
@@ -598,7 +599,7 @@ static void update_input(void)
 	unsigned int emu_act;
 
 	in_update(actions);
-	if (in_type1 == PSE_PAD_TYPE_ANALOGPAD)
+	if (in_type[0] == PSE_PAD_TYPE_ANALOGPAD)
 		update_analogs();
 	emu_act = actions[IN_BINDTYPE_EMU];
 	in_state_gun = (emu_act & SACTION_GUN_MASK) >> SACTION_GUN_TRIGGER;
@@ -612,7 +613,8 @@ static void update_input(void)
 	}
 	emu_set_action(emu_act);
 
-	in_keystate = actions[IN_BINDTYPE_PLAYER12];
+	in_keystate[0] = actions[IN_BINDTYPE_PLAYER12];
+
 }
 #else /* MAEMO */
 extern void update_input(void);
diff --git a/frontend/plugin_lib.h b/frontend/plugin_lib.h
index 00547fc..eb8d00f 100644
--- a/frontend/plugin_lib.h
+++ b/frontend/plugin_lib.h
@@ -17,8 +17,14 @@ enum {
 	DKEY_CROSS,
 	DKEY_SQUARE,
 };
-extern int in_type1, in_type2;
-extern int in_keystate, in_state_gun, in_a1[2], in_a2[2], in_a3[2], in_a4[2];
+//extern int in_type1, in_type2;
+//extern int in_keystate, in_state_gun, in_a1[2], in_a2[2], in_a3[2], in_a4[2];
+extern int  in_state_gun;
+extern int in_type[8];
+extern int in_analog_left[8][2];
+extern int in_analog_right[8][2];
+unsigned short in_keystate[8];
+
 extern int in_adev[2], in_adev_axis[2][2];
 extern int in_adev_is_nublike[2];
 extern int in_enable_vibration;
-- 
cgit v1.2.3


From ace14ab3172ad90809a3cc5e8fe67d5cac9e294b Mon Sep 17 00:00:00 2001
From: cbransden
Date: Mon, 9 May 2016 10:39:45 +0100
Subject: Added multitap core option & style nits

---
 frontend/libretro.c   | 227 ++++++++++++++++++++++++--------------------------
 frontend/main.c       |   6 +-
 frontend/plugin.c     |  43 ++++------
 frontend/plugin_lib.c |   2 -
 frontend/plugin_lib.h |   2 -
 5 files changed, 129 insertions(+), 151 deletions(-)

(limited to 'frontend')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index d6922cb..4486b95 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -25,6 +25,7 @@
 #include "main.h"
 #include "plugin.h"
 #include "plugin_lib.h"
+#include "arm_features.h"
 #include "revision.h"
 #include "libretro.h"
 
@@ -53,19 +54,12 @@ extern char Mcd1Data[MCD_SIZE];
 extern char McdDisable[2];
 
 /* PCSX ReARMed core calls and stuff */
-//int in_type1, in_type2;
-//int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
-//int in_a3[2] = { 127, 127 }, in_a4[2] = { 127, 127 };
-//int in_keystate;
-
 int in_type[8];
 int in_analog_left[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
 int in_analog_right[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
 unsigned short in_keystate[8];
-
-
-
-
+int multitap1;
+int multitap2;
 int in_enable_vibration = 1;
 
 /* PSX max resolution is 640x512, but with enhancement it's 1024x512 */
@@ -258,7 +252,7 @@ void pl_3ds_munmap(void *ptr, size_t size, enum psxMapTag tag)
 #endif
 
 static void *pl_mmap(unsigned int size)
-{   
+{
 	return psxMap(0, size, 0, MAP_TAG_VRAM);
 }
 
@@ -337,13 +331,15 @@ void retro_set_environment(retro_environment_t cb)
       { "pcsx_rearmed_frameskip", "Frameskip; 0|1|2|3" },
       { "pcsx_rearmed_region", "Region; Auto|NTSC|PAL" },
       { "pcsx_rearmed_pad1type", "Pad 1 Type; standard|analog|negcon" },
-	  { "pcsx_rearmed_pad2type", "Pad 2 Type; standard|analog|negcon" },
-	  { "pcsx_rearmed_pad3type", "Pad 3 Type; standard|analog|negcon" },
-	  { "pcsx_rearmed_pad4type", "Pad 4 Type; standard|analog|negcon" },
-	  { "pcsx_rearmed_pad5type", "Pad 5 Type; standard|analog|negcon" },
-	  { "pcsx_rearmed_pad6type", "Pad 6 Type; standard|analog|negcon" },
-	  { "pcsx_rearmed_pad7type", "Pad 7 Type; standard|analog|negcon" },
-	  { "pcsx_rearmed_pad8type", "Pad 8 Type; standard|analog|negcon" },
+      { "pcsx_rearmed_pad2type", "Pad 2 Type; standard|analog|negcon" },
+      { "pcsx_rearmed_pad3type", "Pad 3 Type; standard|analog|negcon" },
+      { "pcsx_rearmed_pad4type", "Pad 4 Type; standard|analog|negcon" },
+      { "pcsx_rearmed_pad5type", "Pad 5 Type; standard|analog|negcon" },
+      { "pcsx_rearmed_pad6type", "Pad 6 Type; standard|analog|negcon" },
+      { "pcsx_rearmed_pad7type", "Pad 7 Type; standard|analog|negcon" },
+      { "pcsx_rearmed_pad8type", "Pad 8 Type; standard|analog|negcon" },
+      { "pcsx_rearmed_multitap1", "Multitap 1; disabled|enabled" },
+      { "pcsx_rearmed_multitap2", "Multitap 2; disabled|enabled" },
 #ifndef DRC_DISABLE
       { "pcsx_rearmed_drc", "Dynamic recompiler; enabled|disabled" },
 #endif
@@ -378,7 +374,7 @@ unsigned retro_api_version(void)
 
 void retro_set_controller_port_device(unsigned port, unsigned device)
 {
-	printf("port %u  device %u",port,device);
+	SysPrintf("port %u  device %u",port,device);
 }
 
 void retro_get_system_info(struct retro_system_info *info)
@@ -403,8 +399,8 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
 }
 
 /* savestates */
-size_t retro_serialize_size(void) 
-{ 
+size_t retro_serialize_size(void)
+{
 	// it's currently 4380651-4397047 bytes,
 	// but have some reserved for future
 	return 0x440000;
@@ -490,7 +486,7 @@ static void save_close(void *file)
 }
 
 bool retro_serialize(void *data, size_t size)
-{ 
+{
 	int ret = SaveState(data);
 	return ret == 0 ? true : false;
 }
@@ -858,7 +854,7 @@ bool retro_load_game(const struct retro_game_info *info)
       { 5, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2,    "R2" },
       { 5, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3,    "R3" },
       { 5, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT,    "Select" },
-      { 5, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,    "Start" }, 
+      { 5, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,    "Start" },
       { 5, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Left Analog X" },
       { 5, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Left Analog Y" },
       { 5, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X, "Right Analog X" },
@@ -879,7 +875,7 @@ bool retro_load_game(const struct retro_game_info *info)
       { 6, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2,    "R2" },
       { 6, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3,    "R3" },
       { 6, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT,    "Select" },
-      { 6, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,    "Start" }, 
+      { 6, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,    "Start" },
       { 6, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Left Analog X" },
       { 6, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Left Analog Y" },
       { 6, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X, "Right Analog X" },
@@ -900,7 +896,7 @@ bool retro_load_game(const struct retro_game_info *info)
       { 7, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2,    "R2" },
       { 7, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3,    "R3" },
       { 7, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT,    "Select" },
-      { 7, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,    "Start" }, 
+      { 7, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START,    "Start" },
       { 7, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Left Analog X" },
       { 7, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Left Analog Y" },
       { 7, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X, "Right Analog X" },
@@ -999,7 +995,7 @@ bool retro_load_game_special(unsigned game_type, const struct retro_game_info *i
 	return false;
 }
 
-void retro_unload_game(void) 
+void retro_unload_game(void)
 {
 }
 
@@ -1052,10 +1048,9 @@ static const unsigned short retro_psx_map[] = {
 static void update_variables(bool in_flight)
 {
    struct retro_variable var;
-   
+
    var.value = NULL;
    var.key = "pcsx_rearmed_frameskip";
-
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
       pl_rearmed_cbs.frameskip = atoi(var.value);
 
@@ -1079,7 +1074,7 @@ static void update_variables(bool in_flight)
       in_type[0] = PSE_PAD_TYPE_STANDARD;
       if (strcmp(var.value, "analog") == 0)
          in_type[0] = PSE_PAD_TYPE_ANALOGPAD;
-      if (strcmp(var.value, "negcon") == 0)
+      else if (strcmp(var.value, "negcon") == 0)
          in_type[0] = PSE_PAD_TYPE_NEGCON;
    }
 
@@ -1090,83 +1085,93 @@ static void update_variables(bool in_flight)
       in_type[1] = PSE_PAD_TYPE_STANDARD;
       if (strcmp(var.value, "analog") == 0)
          in_type[1] = PSE_PAD_TYPE_ANALOGPAD;
-      if (strcmp(var.value, "negcon") == 0)
+      else if (strcmp(var.value, "negcon") == 0)
          in_type[1] = PSE_PAD_TYPE_NEGCON;
    }
 
-	var.value = NULL;
-	var.key = "pcsx_rearmed_pad3type";
-	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
-	{
-		in_type[2] = PSE_PAD_TYPE_STANDARD;
-		if (strcmp(var.value, "analog") == 0)
-			in_type[2] = PSE_PAD_TYPE_ANALOGPAD;
-		if (strcmp(var.value, "negcon") == 0)
-			in_type[2] = PSE_PAD_TYPE_NEGCON;
-	}
-
-   	var.value = NULL;
-	var.key = "pcsx_rearmed_pad4type";
-	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value){
-		in_type[3] = PSE_PAD_TYPE_STANDARD;
-		if (var.value != NULL){
-			if (strcmp(var.value, "analog") == 0)
-				in_type[3] = PSE_PAD_TYPE_ANALOGPAD;
-			if (strcmp(var.value, "negcon") == 0)
-				in_type[3] = PSE_PAD_TYPE_NEGCON;
-		}
-	}
+   var.value = NULL;
+   var.key = "pcsx_rearmed_pad3type";
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+   {
+      in_type[2] = PSE_PAD_TYPE_STANDARD;
+      if (strcmp(var.value, "analog") == 0)
+         in_type[2] = PSE_PAD_TYPE_ANALOGPAD;
+      else if (strcmp(var.value, "negcon") == 0)
+         in_type[2] = PSE_PAD_TYPE_NEGCON;
+   }
 
-	var.value = NULL;
-	var.key = "pcsx_rearmed_pad5type";
-	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
-	{
-		in_type[4] = PSE_PAD_TYPE_STANDARD;
-		if (var.value != NULL){
-			if (strcmp(var.value, "analog") == 0)
-				in_type[4] = PSE_PAD_TYPE_ANALOGPAD;
-			if (strcmp(var.value, "negcon") == 0)
-				in_type[4] = PSE_PAD_TYPE_NEGCON;
-		}
-	}
+   var.value = NULL;
+   var.key = "pcsx_rearmed_pad4type";
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+   {
+      in_type[3] = PSE_PAD_TYPE_STANDARD;
+      if (strcmp(var.value, "analog") == 0)
+         in_type[3] = PSE_PAD_TYPE_ANALOGPAD;
+      else if (strcmp(var.value, "negcon") == 0)
+         in_type[3] = PSE_PAD_TYPE_NEGCON;
+   }
 
-	var.value = NULL;
-	var.key = "pcsx_rearmed_pad6type";
-	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value){
-		in_type[5] = PSE_PAD_TYPE_STANDARD;
-		if (var.value != NULL){
-			if (strcmp(var.value, "analog") == 0)
-				in_type[5] = PSE_PAD_TYPE_ANALOGPAD;
-			if (strcmp(var.value, "negcon") == 0)
-				in_type[5] = PSE_PAD_TYPE_NEGCON;
-		}
-	}
+   var.value = NULL;
+   var.key = "pcsx_rearmed_pad5type";
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+   {
+      in_type[4] = PSE_PAD_TYPE_STANDARD;
+      if (strcmp(var.value, "analog") == 0)
+         in_type[4] = PSE_PAD_TYPE_ANALOGPAD;
+      else if (strcmp(var.value, "negcon") == 0)
+         in_type[4] = PSE_PAD_TYPE_NEGCON;
+   }
 
-	var.value = NULL;
-	var.key = "pcsx_rearmed_pad7type";
-	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value){
-		in_type[6] = PSE_PAD_TYPE_STANDARD;
-		if (var.value != NULL){
-			if (strcmp(var.value, "analog") == 0)
-				in_type[6] = PSE_PAD_TYPE_ANALOGPAD;
-			if (strcmp(var.value, "negcon") == 0)
-				in_type[6] = PSE_PAD_TYPE_NEGCON;
-		}
-	}
+   var.value = NULL;
+   var.key = "pcsx_rearmed_pad6type";
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+   {
+      in_type[5] = PSE_PAD_TYPE_STANDARD;
+      if (strcmp(var.value, "analog") == 0)
+         in_type[5] = PSE_PAD_TYPE_ANALOGPAD;
+      else if (strcmp(var.value, "negcon") == 0)
+         in_type[5] = PSE_PAD_TYPE_NEGCON;
+   }
 
-	var.value = NULL;
-	var.key = "pcsx_rearmed_pad8type";
-	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value){
-		in_type[7] = PSE_PAD_TYPE_STANDARD;
-		if (var.value != NULL){
-			if (strcmp(var.value, "analog") == 0)
-				in_type[7] = PSE_PAD_TYPE_ANALOGPAD;
-			if (strcmp(var.value, "negcon") == 0)
-				in_type[7] = PSE_PAD_TYPE_NEGCON;
-		}
-	}
+   var.value = NULL;
+   var.key = "pcsx_rearmed_pad7type";
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+   {
+      in_type[6] = PSE_PAD_TYPE_STANDARD;
+      if (strcmp(var.value, "analog") == 0)
+         in_type[6] = PSE_PAD_TYPE_ANALOGPAD;
+      else if (strcmp(var.value, "negcon") == 0)
+         in_type[6] = PSE_PAD_TYPE_NEGCON;
+   }
 
+   var.value = NULL;
+   var.key = "pcsx_rearmed_pad8type";
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+   {
+      in_type[7] = PSE_PAD_TYPE_STANDARD;
+      if (strcmp(var.value, "analog") == 0)
+         in_type[7] = PSE_PAD_TYPE_ANALOGPAD;
+      else if (strcmp(var.value, "negcon") == 0)
+         in_type[7] = PSE_PAD_TYPE_NEGCON;
+   }
 
+   var.value = NULL;
+   var.key = "pcsx_rearmed_multitap1";
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+   {
+      if (strcmp(var.value, "enabled") == 0)
+         multitap1 = 1;
+      else multitap1 = 0;
+   }
+    
+   var.value = NULL;
+   var.key = "pcsx_rearmed_multitap2";
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+   {
+      if (strcmp(var.value, "enabled") == 0)
+         multitap2 = 1;
+      else multitap2 = 0;
+   }
 
 #ifdef __ARM_NEON__
    var.value = "NULL";
@@ -1277,7 +1282,7 @@ static void update_variables(bool in_flight)
       else if (strcmp(var.value, "enabled") == 0)
          Config.RCntFix = 1;
    }
-   
+
    var.value = "NULL";
    var.key = "pcsx_rearmed_inuyasha_fix";
 
@@ -1302,10 +1307,10 @@ static void update_variables(bool in_flight)
    }
 }
 
-void retro_run(void) 
+void retro_run(void)
 {
 
-	int i;
+   int i;
 
 	input_poll_cb();
 
@@ -1313,26 +1318,11 @@ void retro_run(void)
 	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
 		update_variables(true);
 
-
-
-	// récupération de l'état des boutons par libretro
-
-//	in_keystate = 0;
-//	for (i = 0; i < RETRO_PSX_MAP_LEN; i++){
-//		if (input_state_cb(1, RETRO_DEVICE_JOYPAD, 0, i))
-//			in_keystate |= retro_psx_map[i];
-//
-//	}
-//	in_keystate <<= 16;
-//	for (i = 0; i < RETRO_PSX_MAP_LEN; i++)
-//		if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, i))
-//			in_keystate |= retro_psx_map[i];
-
-	//reset all keystate, query from libretro for keystate
+	// reset all keystate, query from libretro for keystate
 	int j;
 	for(i=0;i<8;i++){
 		in_keystate[i] = 0;
-		//query from libretro for keystate
+		// query from libretro for keystate
 		for (j = 0; j < RETRO_PSX_MAP_LEN; j++){
 			if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, j))
 				in_keystate[i] |= retro_psx_map[j];
@@ -1475,7 +1465,7 @@ void retro_init(void)
 	else
 	{
 		SysPrintf("no BIOS files found.\n");
-		struct retro_message msg = 
+		struct retro_message msg =
 		{
 			"no BIOS found, expect bugs!",
 			180
@@ -1490,9 +1480,8 @@ void retro_init(void)
 	/* Set how much slower PSX CPU runs * 100 (so that 200 is 2 times)
 	 * we have to do this because cache misses and some IO penalties
 	 * are not emulated. Warning: changing this may break compatibility. */
-#if !defined(__arm__) || defined(__ARM_ARCH_7A__)
 	cycle_multiplier = 175;
-#else
+#ifdef HAVE_PRE_ARMV7
 	cycle_multiplier = 200;
 #endif
 	pl_rearmed_cbs.gpu_peops.iUseDither = 1;
diff --git a/frontend/main.c b/frontend/main.c
index 4d43549..89e96e4 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -26,6 +26,7 @@
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
 #include "../plugins/dfsound/spu_config.h"
+#include "arm_features.h"
 #include "revision.h"
 
 #ifndef NO_FRONTEND
@@ -142,7 +143,7 @@ void emu_set_default_config(void)
 	spu_config.iVolume = 768;
 	spu_config.iTempo = 0;
 	spu_config.iUseThread = 1; // no effect if only 1 core is detected
-#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX GPH hack */
+#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
 	spu_config.iUseReverb = 0;
 	spu_config.iUseInterpolation = 0;
 	spu_config.iTempo = 1;
@@ -771,7 +772,7 @@ int emu_save_state(int slot)
 		return ret;
 
 	ret = SaveState(fname);
-#if defined(__arm__) && !defined(__ARM_ARCH_7A__) && !defined(_3DS) /* XXX GPH hack */
+#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
 	sync();
 #endif
 	SysPrintf("* %s \"%s\" [%d]\n",
@@ -1029,4 +1030,3 @@ void SysCloseLibrary(void *lib) {
 	dlclose(lib);
 #endif
 }
-
diff --git a/frontend/plugin.c b/frontend/plugin.c
index acc5601..d713452 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -49,37 +49,30 @@ extern void CALLBACK SPUasync(unsigned int, unsigned int);
 extern int  CALLBACK SPUplayCDDAchannel(short *, int);
 
 /* PAD */
-
-
-// Lecture du port de la playstation, etat des boutons lu à cette endroit !
-// Distribution des  manettes en fonction du port. Si 2, une sur chacun des ports.
-// Si supérieur a deux on en connecte 4 sur port 1 et le reste sur port 2
 static long PADreadPort1(PadDataS *pad, int pad_index)
 {
-	pad->controllerType = in_type[pad_index];
-	pad->buttonStatus = ~in_keystate[pad_index];
-	//pad->buttonStatus = ~in_keystate;
-	if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) {
-                pad->leftJoyX = in_analog_left[pad_index][0];
-                pad->leftJoyY = in_analog_left[pad_index][1];
-                pad->rightJoyX = in_analog_right[pad_index][0];
-                pad->rightJoyY = in_analog_right[pad_index][1];
-        }
-	return 0;
+    pad->controllerType = in_type[pad_index];
+    pad->buttonStatus = ~in_keystate[pad_index];
+    if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) {
+        pad->leftJoyX = in_analog_left[pad_index][0];
+        pad->leftJoyY = in_analog_left[pad_index][1];
+        pad->rightJoyX = in_analog_right[pad_index][0];
+        pad->rightJoyY = in_analog_right[pad_index][1];
+    }
+    return 0;
 }
 
 static long PADreadPort2(PadDataS *pad)
 {
-	pad->controllerType = in_type[4];
-	pad->buttonStatus = ~in_keystate[4];
-	//pad->buttonStatus = ~in_keystate >> 16;
-	if (in_type[4] == PSE_PAD_TYPE_ANALOGPAD || in_type[4] == PSE_PAD_TYPE_NEGCON) {
-		pad->leftJoyX = in_analog_left[4][0];
-		pad->leftJoyY = in_analog_left[4][1];
-		pad->rightJoyX = in_analog_right[4][0];
-		pad->rightJoyY = in_analog_right[4][1];
-	}
-	return 0;
+    pad->controllerType = in_type[4];
+    pad->buttonStatus = ~in_keystate[4];
+    if (in_type[4] == PSE_PAD_TYPE_ANALOGPAD || in_type[4] == PSE_PAD_TYPE_NEGCON) {
+        pad->leftJoyX = in_analog_left[4][0];
+        pad->leftJoyY = in_analog_left[4][1];
+        pad->rightJoyX = in_analog_right[4][0];
+        pad->rightJoyY = in_analog_right[4][1];
+    }
+    return 0;
 }
 
 /* GPU */
diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 89803ce..ff3518e 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -39,7 +39,6 @@
 int in_type[8];
 int in_analog_left[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
 int in_analog_right[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
-//int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
 int in_adev[2] = { -1, -1 }, in_adev_axis[2][2] = {{ 0, 1 }, { 0, 1 }};
 int in_adev_is_nublike[2];
 int in_keystate, in_state_gun;
@@ -614,7 +613,6 @@ static void update_input(void)
 	emu_set_action(emu_act);
 
 	in_keystate[0] = actions[IN_BINDTYPE_PLAYER12];
-
 }
 #else /* MAEMO */
 extern void update_input(void);
diff --git a/frontend/plugin_lib.h b/frontend/plugin_lib.h
index eb8d00f..50fcf9e 100644
--- a/frontend/plugin_lib.h
+++ b/frontend/plugin_lib.h
@@ -17,8 +17,6 @@ enum {
 	DKEY_CROSS,
 	DKEY_SQUARE,
 };
-//extern int in_type1, in_type2;
-//extern int in_keystate, in_state_gun, in_a1[2], in_a2[2], in_a3[2], in_a4[2];
 extern int  in_state_gun;
 extern int in_type[8];
 extern int in_analog_left[8][2];
-- 
cgit v1.2.3


From 29f3675b9b2f24b8a16db73588b8b04d628eabd8 Mon Sep 17 00:00:00 2001
From: alexis-puska
Date: Thu, 12 May 2016 01:45:26 +0200
Subject: second implementation of multitap

add game/core option to enabled or disabled multitap.
Test with micro machine V3 and 5 devices, 2 multitap enabled, all
device react good i can’t test the 6 7 8 select player but i can select
8 gamer. The 2 multitap works fine.

i detect a bug, when we change the game pad type to analog, the library
crash, see it next time
---
 frontend/libretro.c   |  4 ++--
 frontend/plugin.c     | 30 +++++++++++++++++++-----------
 frontend/plugin_lib.c |  2 ++
 frontend/plugin_lib.h |  4 +++-
 4 files changed, 26 insertions(+), 14 deletions(-)

(limited to 'frontend')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 4486b95..361695c 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -58,8 +58,8 @@ int in_type[8];
 int in_analog_left[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
 int in_analog_right[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
 unsigned short in_keystate[8];
-int multitap1;
-int multitap2;
+int multitap1 = 0;
+int multitap2 = 0;
 int in_enable_vibration = 1;
 
 /* PSX max resolution is 640x512, but with enhancement it's 1024x512 */
diff --git a/frontend/plugin.c b/frontend/plugin.c
index d713452..cf93df8 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -49,10 +49,14 @@ extern void CALLBACK SPUasync(unsigned int, unsigned int);
 extern int  CALLBACK SPUplayCDDAchannel(short *, int);
 
 /* PAD */
-static long PADreadPort1(PadDataS *pad, int pad_index)
-{
+static long PADreadPort1(PadDataS *pad, int pad_index) {
     pad->controllerType = in_type[pad_index];
     pad->buttonStatus = ~in_keystate[pad_index];
+    if(multitap1==1){
+    	pad->portMultitap=1;
+    }else{
+    	pad->portMultitap=0;
+    }
     if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) {
         pad->leftJoyX = in_analog_left[pad_index][0];
         pad->leftJoyY = in_analog_left[pad_index][1];
@@ -62,15 +66,19 @@ static long PADreadPort1(PadDataS *pad, int pad_index)
     return 0;
 }
 
-static long PADreadPort2(PadDataS *pad)
-{
-    pad->controllerType = in_type[4];
-    pad->buttonStatus = ~in_keystate[4];
-    if (in_type[4] == PSE_PAD_TYPE_ANALOGPAD || in_type[4] == PSE_PAD_TYPE_NEGCON) {
-        pad->leftJoyX = in_analog_left[4][0];
-        pad->leftJoyY = in_analog_left[4][1];
-        pad->rightJoyX = in_analog_right[4][0];
-        pad->rightJoyY = in_analog_right[4][1];
+static long PADreadPort2(PadDataS *pad, int pad_index) {
+	pad->controllerType = in_type[pad_index];
+    pad->buttonStatus = ~in_keystate[pad_index];
+    if(multitap2==1){
+    	pad->portMultitap=2;
+    }else{
+    	pad->portMultitap=0;
+    }
+    if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) {
+        pad->leftJoyX = in_analog_left[pad_index][0];
+        pad->leftJoyY = in_analog_left[pad_index][1];
+        pad->rightJoyX = in_analog_right[pad_index][0];
+        pad->rightJoyY = in_analog_right[pad_index][1];
     }
     return 0;
 }
diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index ff3518e..ad2f49b 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -37,6 +37,8 @@
 #define HUD_HEIGHT 10
 
 int in_type[8];
+int multitap1;
+int multitap2;
 int in_analog_left[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
 int in_analog_right[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
 int in_adev[2] = { -1, -1 }, in_adev_axis[2][2] = {{ 0, 1 }, { 0, 1 }};
diff --git a/frontend/plugin_lib.h b/frontend/plugin_lib.h
index 50fcf9e..ad27fc2 100644
--- a/frontend/plugin_lib.h
+++ b/frontend/plugin_lib.h
@@ -17,8 +17,10 @@ enum {
 	DKEY_CROSS,
 	DKEY_SQUARE,
 };
-extern int  in_state_gun;
+extern int in_state_gun;
 extern int in_type[8];
+extern int multitap1;
+extern int multitap2;
 extern int in_analog_left[8][2];
 extern int in_analog_right[8][2];
 unsigned short in_keystate[8];
-- 
cgit v1.2.3


From c663ec74b85ca464d4aecf5697505ebc79ec0f93 Mon Sep 17 00:00:00 2001
From: cbransden
Date: Thu, 12 May 2016 12:31:41 +0100
Subject: Init in_type fully

---
 frontend/libretro.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'frontend')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 361695c..5bcbb1b 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -54,7 +54,10 @@ extern char Mcd1Data[MCD_SIZE];
 extern char McdDisable[2];
 
 /* PCSX ReARMed core calls and stuff */
-int in_type[8];
+int in_type[8] =  { PSE_PAD_TYPE_STANDARD, PSE_PAD_TYPE_STANDARD,
+                  PSE_PAD_TYPE_STANDARD, PSE_PAD_TYPE_STANDARD,
+                  PSE_PAD_TYPE_STANDARD, PSE_PAD_TYPE_STANDARD,
+                  PSE_PAD_TYPE_STANDARD, PSE_PAD_TYPE_STANDARD };
 int in_analog_left[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
 int in_analog_right[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
 unsigned short in_keystate[8];
-- 
cgit v1.2.3


From 56abf6140ec44820247d574b30b6a62221e86b0c Mon Sep 17 00:00:00 2001
From: alexis-puska
Date: Thu, 12 May 2016 20:33:06 +0200
Subject: fix analog value

fix analog value
---
 frontend/libretro.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'frontend')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 5bcbb1b..0cd724e 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1330,22 +1330,17 @@ void retro_run(void)
 			if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, j))
 				in_keystate[i] |= retro_psx_map[j];
 		}
-	}
 
-	if (in_type[0] == PSE_PAD_TYPE_ANALOGPAD)
-	{
-		in_analog_left[0][0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-		in_analog_left[0][1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
-		in_analog_right[0][0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-		in_analog_right[0][1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
-	}
 
-	if (in_type[1] == PSE_PAD_TYPE_ANALOGPAD)
-	{
-		in_analog_left[1][0] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-		in_analog_left[1][1] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
-		in_analog_right[1][0] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-		in_analog_right[1][1] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+		printf("%i : %i\n",i , input_state_cb(i, RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X));
+
+		if (in_type[i] == PSE_PAD_TYPE_ANALOGPAD)
+		{
+			in_analog_left[i][0] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
+			in_analog_left[i][1] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+			in_analog_right[i][0] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
+			in_analog_right[i][1] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+		}
 	}
 
 	stop = 0;
-- 
cgit v1.2.3


From 6f1d3c7a18600c59227b3373a5205841174f8e44 Mon Sep 17 00:00:00 2001
From: alexis-puska
Date: Thu, 12 May 2016 21:18:17 +0200
Subject: comment debugging printf

---
 frontend/libretro.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'frontend')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 0cd724e..6e859c7 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1331,8 +1331,7 @@ void retro_run(void)
 				in_keystate[i] |= retro_psx_map[j];
 		}
 
-
-		printf("%i : %i\n",i , input_state_cb(i, RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X));
+		//printf("%i : %i\n",i , input_state_cb(i, RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X));
 
 		if (in_type[i] == PSE_PAD_TYPE_ANALOGPAD)
 		{
-- 
cgit v1.2.3


From bebaef4be9a87d92b11bc29a002a531a9d1fa5d7 Mon Sep 17 00:00:00 2001
From: dankcushions
Date: Fri, 13 May 2016 16:21:37 +0100
Subject: Defensive code to avoid SEGFAULT

---
 frontend/plugin.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'frontend')

diff --git a/frontend/plugin.c b/frontend/plugin.c
index cf93df8..53ecac9 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -67,7 +67,12 @@ static long PADreadPort1(PadDataS *pad, int pad_index) {
 }
 
 static long PADreadPort2(PadDataS *pad, int pad_index) {
-	pad->controllerType = in_type[pad_index];
+    /* Temporary hack to avoid segfault when pad_index is a crazy number */
+    if (pad_index <= 1 || pad_index > 8) {
+        pad_index = 1;
+    }
+
+    pad->controllerType = in_type[pad_index];
     pad->buttonStatus = ~in_keystate[pad_index];
     if(multitap2==1){
     	pad->portMultitap=2;
-- 
cgit v1.2.3


From 3b1a5e21b399fcb38c5d8ead3c16603f566d7ffa Mon Sep 17 00:00:00 2001
From: cbransden
Date: Fri, 13 May 2016 17:50:34 +0100
Subject: Style nits

---
 frontend/libretro.c | 14 +++++---------
 frontend/plugin.c   | 26 ++++++++++++++------------
 2 files changed, 19 insertions(+), 21 deletions(-)

(limited to 'frontend')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 6e859c7..bdce90e 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1312,8 +1312,7 @@ static void update_variables(bool in_flight)
 
 void retro_run(void)
 {
-
-   int i;
+    int i;
 
 	input_poll_cb();
 
@@ -1321,17 +1320,14 @@ void retro_run(void)
 	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
 		update_variables(true);
 
-	// reset all keystate, query from libretro for keystate
+	// reset all keystate, query libretro for keystate
 	int j;
-	for(i=0;i<8;i++){
+	for(i = 0; i < 8; i++) {
 		in_keystate[i] = 0;
-		// query from libretro for keystate
-		for (j = 0; j < RETRO_PSX_MAP_LEN; j++){
+		// query libretro for keystate
+		for (j = 0; j < RETRO_PSX_MAP_LEN; j++)
 			if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, j))
 				in_keystate[i] |= retro_psx_map[j];
-		}
-
-		//printf("%i : %i\n",i , input_state_cb(i, RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X));
 
 		if (in_type[i] == PSE_PAD_TYPE_ANALOGPAD)
 		{
diff --git a/frontend/plugin.c b/frontend/plugin.c
index 53ecac9..5663e6d 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -52,12 +52,13 @@ extern int  CALLBACK SPUplayCDDAchannel(short *, int);
 static long PADreadPort1(PadDataS *pad, int pad_index) {
     pad->controllerType = in_type[pad_index];
     pad->buttonStatus = ~in_keystate[pad_index];
-    if(multitap1==1){
-    	pad->portMultitap=1;
-    }else{
-    	pad->portMultitap=0;
-    }
-    if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) {
+    if (multitap1 == 1)
+    	pad->portMultitap = 1;
+    else
+    	pad->portMultitap = 0;
+    
+    if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON)
+    {
         pad->leftJoyX = in_analog_left[pad_index][0];
         pad->leftJoyY = in_analog_left[pad_index][1];
         pad->rightJoyX = in_analog_right[pad_index][0];
@@ -74,12 +75,13 @@ static long PADreadPort2(PadDataS *pad, int pad_index) {
 
     pad->controllerType = in_type[pad_index];
     pad->buttonStatus = ~in_keystate[pad_index];
-    if(multitap2==1){
-    	pad->portMultitap=2;
-    }else{
-    	pad->portMultitap=0;
-    }
-    if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) {
+    if (multitap2 ==1 )
+    	pad->portMultitap = 2;
+    else
+    	pad->portMultitap = 0;
+    
+    if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON)
+    {
         pad->leftJoyX = in_analog_left[pad_index][0];
         pad->leftJoyY = in_analog_left[pad_index][1];
         pad->rightJoyX = in_analog_right[pad_index][0];
-- 
cgit v1.2.3