X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin.c;h=1fcd7bed2b1ac9d2249f4e4b69d180d58147bd1d;hb=de95fedd6981b4608cb78180e3bddde7e675223c;hp=acc560116e4b42380cca6e3493f59c4554e1da91;hpb=61c4962abc49e430aabea5e565d93436a57cfa0a;p=pcsx_rearmed.git

diff --git a/frontend/plugin.c b/frontend/plugin.c
index acc56011..1fcd7bed 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -49,37 +49,43 @@ 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;
+static long PADreadPort1(PadDataS *pad) {
+	int pad_index = pad->requestPadIndex;
+    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_ANALOGJOY || 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;
+static long PADreadPort2(PadDataS *pad) {
+	int pad_index = pad->requestPadIndex;
+    
+    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_ANALOGJOY || 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;
 }
 
 /* GPU */