From 8b9b4c9f8f3d892c657e5a4ad0f799c23cfa735b Mon Sep 17 00:00:00 2001
From: negativeExponent
Date: Sat, 31 Oct 2020 07:15:03 +0800
Subject: Remove dfinput plugin from Makefile

The dfinput plugin is not used in this codebase, so remove them when
compiling.

Will repurpose dfinput_activate() to do out init later.
---
 Makefile            | 2 ++
 frontend/libretro.c | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 993b05e..d751fb1 100644
--- a/Makefile
+++ b/Makefile
@@ -258,7 +258,9 @@ LDFLAGS += -lm
 endif
 
 # dfinput
+ifneq "$(PLATFORM)" "libretro"
 OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
+endif
 
 # frontend/gui
 OBJS += frontend/cspace.o
diff --git a/frontend/libretro.c b/frontend/libretro.c
index 323932a..6416b67 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1440,7 +1440,7 @@ bool retro_load_game(const struct retro_game_info *info)
    }
 
    plugin_call_rearmed_cbs();
-   dfinput_activate();
+   /* dfinput_activate(); */
 
    if (CheckCdrom() == -1)
    {
@@ -2198,7 +2198,7 @@ static void update_variables(bool in_flight)
          GPU_open(&gpuDisp, "PCSX", NULL);
       }
 
-      dfinput_activate();
+      /* dfinput_activate(); */
    }
    else
    {
-- 
cgit v1.2.3


From 4c7a462ed37b73f05ff8cc16b477c22e5b2daa26 Mon Sep 17 00:00:00 2001
From: negativeExponent
Date: Sat, 31 Oct 2020 19:38:47 +0800
Subject: Fix negcon not working correctly in some games

---
 libpcsxcore/plugins.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 19de72c..8d99be2 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -747,7 +747,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 +773,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;
-- 
cgit v1.2.3