X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin.c;h=30b0e0828a86324f52b8a8d3513662ae0aa7cf16;hb=4b353f8adc434d4168df88bca58e793becaa891b;hp=49ae1feae373d5863869de731a610dac264d7da5;hpb=6d552c5fd9cd5115748aaf0b704aba264eab257b;p=pcsx_rearmed.git

diff --git a/frontend/plugin.c b/frontend/plugin.c
index 49ae1fea..30b0e082 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -49,30 +49,49 @@ extern void CALLBACK SPUasync(unsigned int, unsigned int);
 extern int  CALLBACK SPUplayCDDAchannel(short *, int);
 
 /* PAD */
-static long PADreadPort1(PadDataS *pad)
-{
-	pad->controllerType = in_type1;
-	pad->buttonStatus = ~in_keystate;
-	if (in_type1 == PSE_PAD_TYPE_ANALOGPAD) {
-		pad->leftJoyX = in_a1[0];
-		pad->leftJoyY = in_a1[1];
-		pad->rightJoyX = in_a2[0];
-		pad->rightJoyY = in_a2[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 || in_type[pad_index] == PSE_PAD_TYPE_GUNCON)
+    {
+        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];
+	    
+	pad->absoluteX = in_analog_left[pad_index][0];
+        pad->absoluteY = in_analog_left[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) {
-		pad->leftJoyX = in_a3[0];
-		pad->leftJoyY = in_a3[1];
-		pad->rightJoyX = in_a4[0];
-		pad->rightJoyY = in_a4[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 || in_type[pad_index] == PSE_PAD_TYPE_GUNCON)
+    {
+        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];
+	    
+	pad->absoluteX = in_analog_left[pad_index][0];
+        pad->absoluteY = in_analog_left[pad_index][1];
+    }
+    return 0;
 }
 
 /* GPU */