X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fplugins.c;h=3d0ed3c5d90a90f69614789c26eccb27bac86aaa;hb=29f3675b9b2f24b8a16db73588b8b04d628eabd8;hp=57078badaddab31b62ca0af218ad3d1c7acbf540;hpb=b2058a5bead44a5b5ecaa903e9bbf3231477fde9;p=pcsx_rearmed.git

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 57078bad..3d0ed3c5 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -88,6 +88,7 @@ SPUreadDMAMem         SPU_readDMAMem;
 SPUplayADPCMchannel   SPU_playADPCMchannel;
 SPUfreeze             SPU_freeze;
 SPUregisterCallback   SPU_registerCallback;
+SPUregisterScheduleCb SPU_registerScheduleCb;
 SPUasync              SPU_async;
 SPUplayCDDAchannel    SPU_playCDDAchannel;
 
@@ -320,6 +321,7 @@ void *hSPUDriver = NULL;
 long CALLBACK SPU__configure(void) { return 0; }
 void CALLBACK SPU__about(void) {}
 long CALLBACK SPU__test(void) { return 0; }
+void CALLBACK SPU__registerScheduleCb(void (CALLBACK *cb)(unsigned int)) {}
 
 #define LoadSpuSym1(dest, name) \
 	LoadSym(SPU_##dest, SPU##dest, name, TRUE);
@@ -356,6 +358,7 @@ static int LoadSPUplugin(const char *SPUdll) {
 	LoadSpuSym1(playADPCMchannel, "SPUplayADPCMchannel");
 	LoadSpuSym1(freeze, "SPUfreeze");
 	LoadSpuSym1(registerCallback, "SPUregisterCallback");
+	LoadSpuSym0(registerScheduleCb, "SPUregisterScheduleCb");
 	LoadSpuSymN(async, "SPUasync");
 	LoadSpuSymN(playCDDAchannel, "SPUplayCDDAchannel");
 
@@ -365,16 +368,89 @@ static int LoadSPUplugin(const char *SPUdll) {
 void *hPAD1Driver = NULL;
 void *hPAD2Driver = NULL;
 
-static unsigned char buf[256];
+static int multitap1 = -1;
+static int multitap2 = -1;
+
+static unsigned char buf[512];
 unsigned char stdpar[10] = { 0x00, 0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 unsigned char mousepar[8] = { 0x00, 0x12, 0x5a, 0xff, 0xff, 0xff, 0xff };
 unsigned char analogpar[9] = { 0x00, 0xff, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+unsigned char multitappar[35] = { 0x00, 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};
 
 static int bufcount, bufc;
 
-PadDataS padd1, padd2;
+//PadDataS padd1, padd2;
+unsigned char _PADstartPollMultitap(PadDataS padd[4]) {
+	int i=0;
+	int decallage=2;
+    bufc = 0;
+    PadDataS pad;
+    for(i=0;i<4;i++){
+    	decallage = 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;
+
+				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;
+
+				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;
+
+				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;
+
+				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;
+		}
+    }
+
+    memcpy(buf, multitappar, 35);
+    bufcount = 34;
+
+    return buf[bufc++];
+}
 
 unsigned char _PADstartPoll(PadDataS *pad) {
+
     bufc = 0;
 
     switch (pad->controllerType) {
@@ -427,29 +503,64 @@ unsigned char _PADstartPoll(PadDataS *pad) {
         default:
             stdpar[3] = pad->buttonStatus & 0xff;
             stdpar[4] = pad->buttonStatus >> 8;
-
-            memcpy(buf, stdpar, 5);
-            bufcount = 4;
+        	memcpy(buf, stdpar, 5);
+        	bufcount = 4;
     }
 
     return buf[bufc++];
 }
 
 unsigned char _PADpoll(unsigned char value) {
-    if (bufc > bufcount) return 0;
+	if (bufc > bufcount) return 0;
     return buf[bufc++];
 }
 
+// rafraichissement de l'état des boutons sur port 1,
+// int pad dans le code d'origine ne sert a rien...
 unsigned char CALLBACK PAD1__startPoll(int pad) {
-    PadDataS padd;
-
-    PAD1_readPort1(&padd);
-
-    return _PADstartPoll(&padd);
+	//first call the pad provide if a multitap is connected between the psx and himself
+	if(multitap1 == -1){
+		PadDataS padd;
+		PAD1_readPort1(&padd,0);
+		multitap1 = padd.portMultitap;
+	}
+	// just one pad is on port 1 : NO MULTITAP
+	if (multitap1 == 0){
+		PadDataS padd;
+		PAD1_readPort1(&padd,0);
+		return _PADstartPoll(&padd);
+	}else{
+		//a multitap is plugged : refresh all pad.
+		int i=0;
+		PadDataS padd[4];
+		for(i=0;i<4;i++){
+			PAD1_readPort1(&padd[i],i);
+		}
+		return _PADstartPollMultitap(padd);
+	}
 }
 
 unsigned char CALLBACK PAD1__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(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; }
@@ -495,15 +606,56 @@ 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;
+		PAD2_readPort2(&padd,pad_index);
+		multitap2 = padd.portMultitap;
+	}
 
-	PAD2_readPort2(&padd);
-    
-	return _PADstartPoll(&padd);
+	// just one pad is on port 2 : NO MULTITAP
+	if (multitap2 == 0){
+		PadDataS padd;
+		PAD2_readPort2(&padd,pad_index);
+		return _PADstartPoll(&padd);
+	}else{
+		//a multitap is plugged : refresh all pad.
+		int i=pad_index;
+		PadDataS padd[4];
+		for(i=0;i<4;i++){
+			PAD2_readPort2(&padd[i],i+pad_index);
+		}
+		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; }