X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfinput%2Fmain.c;h=4f1d03f6ca4e9cf1be64185eca4491dfb2be2cca;hb=1351a8fbef932e26a56e841b6c43de6d907fde5c;hp=475ea073a1d8227cc471b348cdd0e5a9243dacc7;hpb=003cfc63c69b3e900de768317354dfb80bbf6a55;p=pcsx_rearmed.git

diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c
index 475ea073..4f1d03f6 100644
--- a/plugins/dfinput/main.c
+++ b/plugins/dfinput/main.c
@@ -8,13 +8,6 @@
  * See the COPYING file in the top-level directory.
  */
 
-#ifndef _WIN32
-#define CALLBACK
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
 #include "main.h"
 
 unsigned char CurPad, CurByte, CurCmd, CmdLen;
@@ -27,6 +20,8 @@ extern unsigned char CALLBACK PAD2__startPoll(int pad);
 extern unsigned char CALLBACK PAD1__poll(unsigned char value);
 extern unsigned char CALLBACK PAD2__poll(unsigned char value);
 
+#ifndef HAVE_LIBRETRO
+
 static int old_controller_type1 = -1, old_controller_type2 = -1;
 
 #define select_pad(n) \
@@ -44,6 +39,7 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
 			PAD##n##_poll = PADpoll_guncon; \
 			guncon_init(); \
 			break; \
+		case PSE_PAD_TYPE_NEGCON: \
 		case PSE_PAD_TYPE_GUN: \
 		default: \
 			PAD##n##_startPoll = PAD##n##__startPoll; \
@@ -56,9 +52,20 @@ void dfinput_activate(void)
 {
 	PadDataS pad;
 
+	pad.portMultitap = -1;
+	pad.requestPadIndex = 0;
 	PAD1_readPort1(&pad);
 	select_pad(1);
 
+	pad.requestPadIndex = 1;
 	PAD2_readPort2(&pad);
 	select_pad(2);
 }
+
+#else // use libretro's libpcsxcore/plugins.c code
+
+void dfinput_activate(void)
+{
+}
+
+#endif