X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fplugins.c;h=007b61e07c414e5c1a97fa63e0100bc82e299e5e;hb=2ca181a92610030e29f146c876c55fd5a5f46ba9;hp=64996b2445c11872bf749ccc64f4190ea1fa1eee;hpb=52c9fcc88f6a908c359afbf12f821602c25df123;p=pcsx_rearmed.git

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 64996b24..007b61e0 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -373,9 +373,16 @@ static int multitap2 = -1;
 //Pad information, keystate, mode, config mode, vibration
 static PadDataS pad[8];
 
-static int reqPos, respSize, req, ledStateReq44;
+static int reqPos, respSize, req;
+static int ledStateReq44[8];
 
-static unsigned char buf[256];
+static unsigned char buf[256];
+static unsigned char bufMulti[34] = { 0x80, 0x5a, 
+									0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+									0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+									0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+									0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+									
 unsigned char stdpar[8] = { 0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 unsigned char multitappar[34] = { 0x80, 0x5a, 
 									0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -394,7 +401,8 @@ static unsigned char resp4D[8]    = {0xF3, 0x5A, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0
 
 //fixed reponse of request number 41, 48, 49, 4A, 4B, 4E, 4F
 static unsigned char resp40[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char resp41[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned char resp41[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static unsigned char resp43[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 static unsigned char resp44[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 static unsigned char resp49[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 static unsigned char resp4A[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -498,15 +506,20 @@ enum {
 	REQ4F = 0x4F
 };
 
+
+
+
+//NO MULTITAP
+
 void initBufForRequest(int padIndex, char value){
 	switch (value){
 		//Pad keystate already in buffer
 		//case CMD_READ_DATA_AND_VIBRATE :
 		//	break;
 		case CMD_CONFIG_MODE :
-			if(pad[padIndex].configMode == TRUE){
-				buf[0] = 0xF3;
-				buf[1] = 0x53;
+			if(pad[padIndex].configMode == 1){
+				memcpy(buf, resp43, 8);
+				break;
 			}
 			//else, not in config mode, pad keystate return (already in the buffer)
 			break;
@@ -550,23 +563,26 @@ void initBufForRequest(int padIndex, char value){
 			memcpy(buf, resp4F, 8);
 			break;
 	}
-}
+}
+
+
+
 
 void reqIndex2Treatment(int padIndex, char value){
-	switch (value){
+	switch (req){
 		case CMD_CONFIG_MODE :
 			//0x43
 			if(value == 0){
-				pad[padIndex].configMode = FALSE;
+				pad[padIndex].configMode = 0;
 			}else{
-				pad->configMode = TRUE;
+				pad[padIndex].configMode = 1;
 			}
 			break;
 		case CMD_SET_MODE_AND_LOCK :
 			//0x44 store the led state for change mode if the next value = 0x02
 			//0x01 analog ON
 			//0x00 analog OFF
-			ledStateReq44 = value;
+			ledStateReq44[padIndex] = value;
 			break;
 		case CMD_QUERY_ACT :
 			//0x46
@@ -596,74 +612,12 @@ void vibrate(int padIndex){
 		pad[padIndex].VibF[0] = pad[padIndex].Vib[0];
 		pad[padIndex].VibF[1] = pad[padIndex].Vib[1];
 		plat_trigger_vibrate(padIndex, pad[padIndex].VibF[0], pad[padIndex].VibF[1]);
-		printf("new value for vibration pad %i", padIndex);
+		//printf("vibration pad %i", padIndex);
 	}
-}
-	
-
-
-//Build response for 0x42 request Multitap in port
-void _PADstartPollMultitap(PadDataS padd[4]) {
-    int i = 0;
-    int offset = 2;
-    PadDataS pad;
-    for(i = 0; i < 4; i++) {
-    	offset = 2 + (i * 8);
-    	pad = padd[i];
-		switch (pad.controllerType) {
-			case PSE_PAD_TYPE_MOUSE:
-				multitappar[offset] = 0x12;
-				multitappar[offset + 1] = 0x5a;
-				multitappar[offset + 2] = pad.buttonStatus & 0xff;
-				multitappar[offset + 3] = pad.buttonStatus >> 8;
-				multitappar[offset + 4] = pad.moveX;
-				multitappar[offset + 5] = pad.moveY;
-
-				break;
-			case PSE_PAD_TYPE_NEGCON: // npc101/npc104(slph00001/slph00069)
-				multitappar[offset] = 0x23;
-				multitappar[offset + 1] = 0x5a;
-				multitappar[offset + 2] = pad.buttonStatus & 0xff;
-				multitappar[offset + 3] = pad.buttonStatus >> 8;
-				multitappar[offset + 4] = pad.rightJoyX;
-				multitappar[offset + 5] = pad.rightJoyY;
-				multitappar[offset + 6] = pad.leftJoyX;
-				multitappar[offset + 7] = pad.leftJoyY;
-
-				break;
-			case PSE_PAD_TYPE_ANALOGPAD: // scph1150
-				multitappar[offset] = 0x73;
-				multitappar[offset + 1] = 0x5a;
-				multitappar[offset + 2] = pad.buttonStatus & 0xff;
-				multitappar[offset + 3] = pad.buttonStatus >> 8;
-				multitappar[offset + 4] = pad.rightJoyX;
-				multitappar[offset + 5] = pad.rightJoyY;
-				multitappar[offset + 6] = pad.leftJoyX;
-				multitappar[offset + 7] = pad.leftJoyY;
-
-				break;
-			case PSE_PAD_TYPE_ANALOGJOY: // scph1110
-				multitappar[offset] = 0x53;
-				multitappar[offset + 1] = 0x5a;
-				multitappar[offset + 2] = pad.buttonStatus & 0xff;
-				multitappar[offset + 3] = pad.buttonStatus >> 8;
-				multitappar[offset + 4] = pad.rightJoyX;
-				multitappar[offset + 5] = pad.rightJoyY;
-				multitappar[offset + 6] = pad.leftJoyX;
-				multitappar[offset + 7] = pad.leftJoyY;
-
-				break;
-			case PSE_PAD_TYPE_STANDARD:
-			default:
-				multitappar[offset] = 0x41;
-				multitappar[offset + 1] = 0x5a;
-				multitappar[offset + 2] = pad.buttonStatus & 0xff;
-				multitappar[offset + 3] = pad.buttonStatus >> 8;
-		}
-    }
-    memcpy(buf, multitappar, 34);
-    respSize = 34;
-}
+}
+
+
+
 
 //Build response for 0x42 request Pad in port
 void _PADstartPoll(PadDataS *pad) {
@@ -711,52 +665,77 @@ void _PADstartPoll(PadDataS *pad) {
             respSize = 8;
             break;
         case PSE_PAD_TYPE_STANDARD:
-        default:
+        default:
+        	stdpar[0] = 0x41;
             stdpar[2] = pad->buttonStatus & 0xff;
-            stdpar[3] = pad->buttonStatus >> 8;
-        	memcpy(buf, stdpar, 4);
+            stdpar[3] = pad->buttonStatus >> 8;
+            //avoid analog value in multitap mode if change pad type in game.
+            stdpar[4] = 0xff;
+            stdpar[5] = 0xff;
+            stdpar[6] = 0xff;
+            stdpar[7] = 0xff;
+        	memcpy(buf, stdpar, 8);
         	respSize = 8;
     }
 }
 
+
+//Build response for 0x42 request Multitap in port
+//Response header for multitap : 0x80, 0x5A, (Pad information port 1-2A), (Pad information port 1-2B), (Pad information port 1-2C), (Pad information port 1-2D)
+void _PADstartPollMultitap(PadDataS padd[4]) {
+    int i = 0;
+    int offset = 2;
+    PadDataS pad;
+    for(i = 0; i < 4; i++) {
+    	offset = 2 + (i * 8);
+    	pad = padd[i];
+		_PADstartPoll(&pad);
+		memcpy(multitappar+offset, stdpar, 8);
+    }
+    memcpy(bufMulti, multitappar, 34);
+    respSize = 34;
+}
 
 
-unsigned char _PADpoll(int padIndex, unsigned char value) {
-		
-	//If no multitap on the port, we made the full implementation of dualshock protocol
-	if(multitap1 == 0){
-		if(reqPos==0){
-			//mem the request number
-			req = value;
-			//copy the default value of request response in buffer instead of the keystate
-			initBufForRequest(padIndex,value);
-		}
-		
-		//if no new request the pad return 0xff, for signaling connected
-		if ( reqPos >= respSize) return 0xff;
-		
-		switch(reqPos){
-			case 2:
-				reqIndex2Treatment(padIndex, value);
-			break;
-			case 3:
-				switch(req) {
-					case CMD_SET_MODE_AND_LOCK :
-						//change mode on pad
-					break;
-					case CMD_READ_DATA_AND_VIBRATE:
-					//mem the vibration value for Large motor;
-					pad[padIndex].Vib[1] = value;
-					//vibration
-					vibrate(padIndex);
-					break;
-				
-			break;
-			}
+unsigned char _PADpoll(int port, unsigned char value) {
+	if(reqPos==0){
+		//mem the request number
+		req = value;
+		//copy the default value of request response in buffer instead of the keystate
+		initBufForRequest(port,value);
+	}
+	
+	//if no new request the pad return 0xff, for signaling connected
+	if ( reqPos >= respSize) return 0xff;
+	
+	switch(reqPos){
+		case 2:
+			reqIndex2Treatment(port, value);
+		break;
+		case 3:
+			switch(req) {
+				case CMD_SET_MODE_AND_LOCK :
+					//change mode on pad
+				break;
+				case CMD_READ_DATA_AND_VIBRATE:
+				//mem the vibration value for Large motor;
+				pad[port].Vib[1] = value;
+				//vibration
+				vibrate(port);
+				break;
+			
+		break;
 		}
 	}
 	return buf[reqPos++];
-}
+}
+
+
+unsigned char _PADpollMultitap(int port, unsigned char value) {
+	if ( reqPos >= respSize) return 0xff;
+	return bufMulti[reqPos++];
+}
+
 
 // refresh the button state on port 1.
 // int pad is not needed.
@@ -785,13 +764,18 @@ unsigned char CALLBACK PAD1__startPoll(int pad) {
 		}
 		_PADstartPollMultitap(padd);
 	}
-	printf("\n");
+	//printf("\npad 1 : ");
 	return 0x00;
 }
 
 unsigned char CALLBACK PAD1__poll(unsigned char value) {
-	char tmp = _PADpoll(0, value);
-	printf("%2x:%2x , ",value,tmp);
+	char tmp;
+	if(multitap1 == 1){
+		tmp = _PADpollMultitap(0, value);
+	}else{
+		tmp = _PADpoll(0, value);
+	}
+	//printf("%2x:%2x, ",value,tmp);
 	return tmp;
 	
 }
@@ -842,11 +826,16 @@ static int LoadPAD1plugin(const char *PAD1dll) {
 unsigned char CALLBACK PAD2__startPoll(int pad) {
 	reqPos = 0;
 	int pad_index = 0;
-	if(multitap1 == 1){
-		pad_index+=4;
-	}else{
-		pad_index=1;
+	if(multitap1 == 0 && multitap2 == 0){
+		pad_index += 1;
+	}else if(multitap1 == 1 && multitap2 == 0){
+		pad_index += 4;
+	}else if(multitap1 == 0 && multitap2 == 2){
+		pad_index += 1;
+	}else if(multitap1 == 1 && multitap2 == 2){
+		pad_index += 4;
 	}
+
 	//first call the pad provide if a multitap is connected between the psx and himself
 	if(multitap2 == -1){
 		PadDataS padd;
@@ -872,11 +861,19 @@ unsigned char CALLBACK PAD2__startPoll(int pad) {
 		}
 		_PADstartPollMultitap(padd);
 	}
+	//printf("\npad 2 : ");
 	return 0x00;
 }
 
 unsigned char CALLBACK PAD2__poll(unsigned char value) {
-	return _PADpoll(1,value);
+	char tmp;
+	if(multitap2 == 2){
+		tmp = _PADpollMultitap(1, value);
+	}else{
+		tmp = _PADpoll(1, value);
+	}
+	//printf("%2x:%2x, ",value,tmp);
+	return tmp;
 }
 
 long CALLBACK PAD2__configure(void) { return 0; }