X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fplugins.c;h=c9ccd2ae9fa280edd3a0294fe6ae9d05dd3aea4b;hb=f40e483e356bb10c6094c3a4edadd636c3ca9f13;hp=372fdd001ee8d83d40c55b07aba9c173e21d9394;hpb=ace14ab3172ad90809a3cc5e8fe67d5cac9e294b;p=pcsx_rearmed.git

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 372fdd00..c9ccd2ae 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -205,7 +205,7 @@ void CALLBACK GPU__vBlank(int val) {}
 
 #define LoadGpuSym1(dest, name) \
 	LoadSym(GPU_##dest, GPU##dest, name, TRUE);
-
+
 #define LoadGpuSym0(dest, name) \
 	LoadSym(GPU_##dest, GPU##dest, name, FALSE); \
 	if (GPU_##dest == NULL) GPU_##dest = (GPU##dest) GPU__##dest;
@@ -368,6 +368,9 @@ static int LoadSPUplugin(const char *SPUdll) {
 void *hPAD1Driver = NULL;
 void *hPAD2Driver = NULL;
 
+static int multitap1 = -1;
+static int multitap2 = -1;
+
 static unsigned char buf[256];
 unsigned char stdpar[10] = { 0x00, 0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 unsigned char mousepar[8] = { 0x00, 0x12, 0x5a, 0xff, 0xff, 0xff, 0xff };
@@ -380,63 +383,63 @@ unsigned char multitappar[35] = { 0x00, 0x80, 0x5a, 0x41, 0x5a, 0xff, 0xff, 0xff
 static int bufcount, bufc;
 
 //PadDataS padd1, padd2;
-unsigned char _PADstartPollPort1(PadDataS padd[4]) {
-	int i=0;
-	int decallage=2;
+unsigned char _PADstartPollMultitap(PadDataS padd[4]) {
+    int i = 0;
+    int offset = 2;
     bufc = 0;
     PadDataS pad;
-    for(i=0;i<4;i++){
-    	decallage = 2 + (i*8);
+    for(i = 0; i < 4; i++) {
+    	offset = 2 + (i * 8);
     	pad = padd[i];
 		switch (pad.controllerType) {
 			case PSE_PAD_TYPE_MOUSE:
-				multitappar[decallage+1] = 0x12;
-				multitappar[decallage+2] = 0x5a;
-				multitappar[decallage+3] = pad.buttonStatus & 0xff;
-				multitappar[decallage+4] = pad.buttonStatus >> 8;
-				multitappar[decallage+5] = pad.moveX;
-				multitappar[decallage+6] = pad.moveY;
+				multitappar[offset + 1] = 0x12;
+				multitappar[offset + 2] = 0x5a;
+				multitappar[offset + 3] = pad.buttonStatus & 0xff;
+				multitappar[offset + 4] = pad.buttonStatus >> 8;
+				multitappar[offset + 5] = pad.moveX;
+				multitappar[offset + 6] = pad.moveY;
 
 				break;
 			case PSE_PAD_TYPE_NEGCON: // npc101/npc104(slph00001/slph00069)
-				multitappar[decallage+1] = 0x23;
-				multitappar[decallage+2] = 0x5a;
-				multitappar[decallage+3] = pad.buttonStatus & 0xff;
-				multitappar[decallage+4] = pad.buttonStatus >> 8;
-				multitappar[decallage+5] = pad.rightJoyX;
-				multitappar[decallage+6] = pad.rightJoyY;
-				multitappar[decallage+7] = pad.leftJoyX;
-				multitappar[decallage+8] = pad.leftJoyY;
+				multitappar[offset + 1] = 0x23;
+				multitappar[offset + 2] = 0x5a;
+				multitappar[offset + 3] = pad.buttonStatus & 0xff;
+				multitappar[offset + 4] = pad.buttonStatus >> 8;
+				multitappar[offset + 5] = pad.rightJoyX;
+				multitappar[offset + 6] = pad.rightJoyY;
+				multitappar[offset + 7] = pad.leftJoyX;
+				multitappar[offset + 8] = pad.leftJoyY;
 
 				break;
 			case PSE_PAD_TYPE_ANALOGPAD: // scph1150
-				multitappar[decallage+1] = 0x73;
-				multitappar[decallage+2] = 0x5a;
-				multitappar[decallage+3] = pad.buttonStatus & 0xff;
-				multitappar[decallage+4] = pad.buttonStatus >> 8;
-				multitappar[decallage+5] = pad.rightJoyX;
-				multitappar[decallage+6] = pad.rightJoyY;
-				multitappar[decallage+7] = pad.leftJoyX;
-				multitappar[decallage+8] = pad.leftJoyY;
+				multitappar[offset + 1] = 0x73;
+				multitappar[offset + 2] = 0x5a;
+				multitappar[offset + 3] = pad.buttonStatus & 0xff;
+				multitappar[offset + 4] = pad.buttonStatus >> 8;
+				multitappar[offset + 5] = pad.rightJoyX;
+				multitappar[offset + 6] = pad.rightJoyY;
+				multitappar[offset + 7] = pad.leftJoyX;
+				multitappar[offset + 8] = pad.leftJoyY;
 
 				break;
 			case PSE_PAD_TYPE_ANALOGJOY: // scph1110
-				multitappar[decallage+1] = 0x53;
-				multitappar[decallage+2] = 0x5a;
-				multitappar[decallage+3] = pad.buttonStatus & 0xff;
-				multitappar[decallage+4] = pad.buttonStatus >> 8;
-				multitappar[decallage+5] = pad.rightJoyX;
-				multitappar[decallage+6] = pad.rightJoyY;
-				multitappar[decallage+7] = pad.leftJoyX;
-				multitappar[decallage+8] = pad.leftJoyY;
+				multitappar[offset + 1] = 0x53;
+				multitappar[offset + 2] = 0x5a;
+				multitappar[offset + 3] = pad.buttonStatus & 0xff;
+				multitappar[offset + 4] = pad.buttonStatus >> 8;
+				multitappar[offset + 5] = pad.rightJoyX;
+				multitappar[offset + 6] = pad.rightJoyY;
+				multitappar[offset + 7] = pad.leftJoyX;
+				multitappar[offset + 8] = pad.leftJoyY;
 
 				break;
 			case PSE_PAD_TYPE_STANDARD:
 			default:
-				multitappar[decallage+1] = 0x41;
-				multitappar[decallage+2] = 0x5a;
-				multitappar[decallage+3] = pad.buttonStatus & 0xff;
-				multitappar[decallage+4] = pad.buttonStatus >> 8;
+				multitappar[offset + 1] = 0x41;
+				multitappar[offset + 2] = 0x5a;
+				multitappar[offset + 3] = pad.buttonStatus & 0xff;
+				multitappar[offset + 4] = pad.buttonStatus >> 8;
 		}
     }
 
@@ -512,44 +515,56 @@ unsigned char _PADpoll(unsigned char value) {
     return buf[bufc++];
 }
 
-// rafraichissement de l'état des boutons sur port 1,
-// int pad dans le code d'origine ne sert a rien...
+// refresh the button state on port 1.
+// int pad is not needed.
 unsigned char CALLBACK PAD1__startPoll(int pad) {
-	int i=0;
-	PadDataS padd[4];
-	for(i=0;i<4;i++){
-		PAD1_readPort1(&padd[i],i);
+	// first call the pad provide if a multitap is connected between the psx and himself
+	if(multitap1 == -1)
+	{
+		PadDataS padd;
+		padd.requestPadIndex = 0;
+		PAD1_readPort1(&padd);
+		multitap1 = padd.portMultitap;
+	}
+	// just one pad is on port 1 : NO MULTITAP
+	if (multitap1 == 0)
+	{
+		PadDataS padd;
+		padd.requestPadIndex = 0;
+		PAD1_readPort1(&padd);
+		return _PADstartPoll(&padd);
+	} else {
+		// a multitap is plugged : refresh all pad.
+		int i=0;
+		PadDataS padd[4];
+		for(i = 0; i < 4; i++) {
+			padd[i].requestPadIndex = i;
+			PAD1_readPort1(&padd[i]);
+		}
+		return _PADstartPollMultitap(padd);
 	}
-	return _PADstartPollPort1(padd);
 }
 
 unsigned char CALLBACK PAD1__poll(unsigned char value) {
-
-//	if(value !=0){
-//		int i;
-//		printf("%2x  %c\n", value, value);
-//		for (i = 0; i < 35; i++) {
-//		  printf("%2x", buf[i]);
-//		}
-//		printf("\n");
-//		}
-
-	if(value==42){
-		unsigned char bufmultitap[256];
-	    memcpy(bufmultitap, multitappar, 3);
-	    bufcount = 2;
-	    return bufmultitap[bufc++];
-	}else{
+	if (multitap1 == 0)
+	{
 		return _PADpoll(value);
+	} else {
+		if(value == 42) {
+			unsigned char bufmultitap[256];
+			memcpy(bufmultitap, multitappar, 3);
+			bufcount = 2;
+			return bufmultitap[bufc++];
+		} else {
+			return _PADpoll(value);
+		}
 	}
 }
 
 long CALLBACK PAD1__configure(void) { return 0; }
 void CALLBACK PAD1__about(void) {}
 long CALLBACK PAD1__test(void) { return 0; }
-long CALLBACK PAD1__query(void) {
-	printf("PAD1__query");
-	return 3; }
+long CALLBACK PAD1__query(void) { return 3; }
 long CALLBACK PAD1__keypressed() { return 0; }
 
 #define LoadPad1Sym1(dest, name) \
@@ -589,15 +604,59 @@ static int LoadPAD1plugin(const char *PAD1dll) {
 }
 
 unsigned char CALLBACK PAD2__startPoll(int pad) {
-	PadDataS padd;
+	int pad_index = 0;
+	if(multitap1 == 1){
+		pad_index+=4;
+	}else{
+		pad_index=1;
+	}
+	//first call the pad provide if a multitap is connected between the psx and himself
+	if(multitap2 == -1){
+		PadDataS padd;
+		padd.requestPadIndex = pad_index;
+		PAD2_readPort2(&padd);
+		multitap2 = padd.portMultitap;
+	}
 
-	PAD2_readPort2(&padd);
-    
-	return _PADstartPoll(&padd);
+	// just one pad is on port 2 : NO MULTITAP
+	if (multitap2 == 0){
+		PadDataS padd;
+		padd.requestPadIndex = pad_index;
+		PAD2_readPort2(&padd);
+		return _PADstartPoll(&padd);
+	}else{
+		//a multitap is plugged : refresh all pad.
+		int i=0;
+		PadDataS padd[4];
+		for(i=0;i<4;i++){
+			padd[i].requestPadIndex = i+pad_index;
+			PAD2_readPort2(&padd[i]);
+		}
+		return _PADstartPollMultitap(padd);
+	}
 }
 
 unsigned char CALLBACK PAD2__poll(unsigned char value) {
-	return _PADpoll(value);
+//	if(value !=0){
+//		int i;
+//		printf("%2x  %c\n", value, value);
+//		for (i = 0; i < 35; i++) {
+//		  printf("%2x", buf[i]);
+//		}
+//		printf("\n");
+//		}
+	if(multitap2==0){
+		return _PADpoll(value);
+	}else {
+		if(value==42){
+			unsigned char bufmultitap[256];
+			memcpy(bufmultitap, multitappar, 3);
+			bufcount = 2;
+			return bufmultitap[bufc++];
+		}else{
+			return _PADpoll(value);
+		}
+	}
 }
 
 long CALLBACK PAD2__configure(void) { return 0; }