X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfinput%2Fmain.c;h=c3adedd364568a229d805c329c8fa133d6624d54;hb=cb4d282af668df3bdbd428be5a5ad26996cd0f4f;hp=73b2bda9d59ca885af2684927658dbb24fc897dc;hpb=4c08b9e7dd350a48fc3e0515913d6ccc8b15e5ae;p=pcsx_rearmed.git

diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c
index 73b2bda9..c3adedd3 100644
--- a/plugins/dfinput/main.c
+++ b/plugins/dfinput/main.c
@@ -8,6 +8,13 @@
  * 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;
@@ -15,10 +22,10 @@ unsigned char CurPad, CurByte, CurCmd, CmdLen;
 /* since this is not a proper plugin, so we'll hook emu internals in a hackish way like this */
 extern void *PAD1_startPoll, *PAD1_poll;
 extern void *PAD2_startPoll, *PAD2_poll;
-extern unsigned char PAD1__startPoll(int pad);
-extern unsigned char PAD2__startPoll(int pad);
-extern unsigned char PAD1__poll(unsigned char value);
-extern unsigned char PAD2__poll(unsigned char value);
+extern unsigned char CALLBACK PAD1__startPoll(int pad);
+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);
 
 static int old_controller_type1 = -1, old_controller_type2 = -1;
 
@@ -37,6 +44,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; \
@@ -45,6 +53,7 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
 		} \
 	}
 
+
 void dfinput_activate(void)
 {
 	PadDataS pad;