X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fplugins.c;h=a2f8fe27503b06ceda0201ffb6b53e9badbe6ed8;hb=70575e81838e2c8d842dd28c3fc7fbb91b395061;hp=19de72c51364b74e7822139512a7d16e38d354dc;hpb=b17ff6dfd1c32ae18bbcd81be47befd0f16f26b7;p=pcsx_rearmed.git

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 19de72c5..a2f8fe27 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -630,6 +630,7 @@ void _PADstartPoll(PadDataS *pad) {
 	switch (pad->controllerType) {
 		case PSE_PAD_TYPE_MOUSE:
 			stdpar[0] = 0x12;
+			stdpar[1] = 0x5a;
 			stdpar[2] = pad->buttonStatus & 0xff;
 			stdpar[3] = pad->buttonStatus >> 8;
 			stdpar[4] = pad->moveX;
@@ -639,6 +640,7 @@ void _PADstartPoll(PadDataS *pad) {
 			break;
 		case PSE_PAD_TYPE_NEGCON: // npc101/npc104(slph00001/slph00069)
 			stdpar[0] = 0x23;
+			stdpar[1] = 0x5a;
 			stdpar[2] = pad->buttonStatus & 0xff;
 			stdpar[3] = pad->buttonStatus >> 8;
 			stdpar[4] = pad->rightJoyX;
@@ -691,6 +693,7 @@ void _PADstartPoll(PadDataS *pad) {
 			break;
 		case PSE_PAD_TYPE_ANALOGPAD: // scph1150
 			stdpar[0] = 0x73;
+			stdpar[1] = 0x5a;
 			stdpar[2] = pad->buttonStatus & 0xff;
 			stdpar[3] = pad->buttonStatus >> 8;
 			stdpar[4] = pad->rightJoyX;
@@ -702,6 +705,7 @@ void _PADstartPoll(PadDataS *pad) {
 			break;
 		case PSE_PAD_TYPE_ANALOGJOY: // scph1110
 			stdpar[0] = 0x53;
+			stdpar[1] = 0x5a;
 			stdpar[2] = pad->buttonStatus & 0xff;
 			stdpar[3] = pad->buttonStatus >> 8;
 			stdpar[4] = pad->rightJoyX;
@@ -712,8 +716,8 @@ void _PADstartPoll(PadDataS *pad) {
 			respSize = 8;
 			break;
 		case PSE_PAD_TYPE_STANDARD:
-		default:
 			stdpar[0] = 0x41;
+			stdpar[1] = 0x5a;
 			stdpar[2] = pad->buttonStatus & 0xff;
 			stdpar[3] = pad->buttonStatus >> 8;
 			//avoid analog value in multitap mode if change pad type in game.
@@ -723,6 +727,19 @@ void _PADstartPoll(PadDataS *pad) {
 			stdpar[7] = 0xff;
 			memcpy(buf, stdpar, 8);
 			respSize = 8;
+			break;
+		default:
+			stdpar[0] = 0xff;
+			stdpar[1] = 0xff;
+			stdpar[2] = 0xff;
+			stdpar[3] = 0xff;
+			stdpar[4] = 0xff;
+			stdpar[5] = 0xff;
+			stdpar[6] = 0xff;
+			stdpar[7] = 0xff;
+			memcpy(buf, stdpar, 8);
+			respSize = 8;
+			break;
 	}
 }
 
@@ -747,7 +764,8 @@ unsigned char _PADpoll(int port, unsigned char value) {
 		req = value;
 
 		// Don't enable Analog/Vibration for a standard pad
-		if (in_type[port] == PSE_PAD_TYPE_STANDARD) {
+		if (in_type[port] == PSE_PAD_TYPE_STANDARD ||
+			in_type[port] == PSE_PAD_TYPE_NEGCON) {
 			; // Pad keystate already in buffer
 		}
 		else
@@ -772,9 +790,13 @@ unsigned char _PADpoll(int port, unsigned char value) {
 				case CMD_READ_DATA_AND_VIBRATE:
 				//mem the vibration value for Large motor;
 				pad[port].Vib[1] = value;
+
+				if (in_type[port] == PSE_PAD_TYPE_STANDARD &&
+					in_type[port] == PSE_PAD_TYPE_NEGCON)
+					break;
+
 				//vibration
-				if (in_type[port] != PSE_PAD_TYPE_STANDARD)
-					vibrate(port);
+				vibrate(port);
 				break;
 			}
 		break;