X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfinput%2Fmain.c;h=5d676c474718a31f9efc23942aff4ffe07ba849a;hb=5ced3945423cda0010597b27b7da6bce77b12baa;hp=af6b80b8516e1099e1d9e00d085234f0028f6b53;hpb=f3943713b53452d545fb58c9dee0c00dd0c2b6d7;p=pcsx_rearmed.git

diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c
index af6b80b8..5d676c47 100644
--- a/plugins/dfinput/main.c
+++ b/plugins/dfinput/main.c
@@ -1,5 +1,5 @@
 /*
- * (C) Gražvydas "notaz" Ignotas, 2011
+ * (C) Gražvydas "notaz" Ignotas, 2011
  *
  * This work is licensed under the terms of any of these licenses
  * (at your option):
@@ -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);
 
+#if 0 //ndef HAVE_LIBRETRO
+
 static int old_controller_type1 = -1, old_controller_type2 = -1;
 
 #define select_pad(n) \
@@ -40,12 +35,11 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
 			pad_init(); \
 			break; \
 		case PSE_PAD_TYPE_GUNCON: \
-			//Removed for new Guncon functionality, may have been required for very old touchscreen support
-			//PAD##n##_startPoll = PADstartPoll_guncon; \
-			//PAD##n##_poll = PADpoll_guncon; \
-			//guncon_init(); \
-			//break; \
-                case PSE_PAD_TYPE_NEGCON: \
+			PAD##n##_startPoll = PADstartPoll_guncon; \
+			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; \
@@ -54,10 +48,8 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
 		} \
 	}
 
-
 void dfinput_activate(void)
 {
-	#ifndef HAVE_LIBRETRO
 	PadDataS pad;
 
 	pad.portMultitap = -1;
@@ -68,5 +60,12 @@ void dfinput_activate(void)
 	pad.requestPadIndex = 1;
 	PAD2_readPort2(&pad);
 	select_pad(2);
-	#endif
 }
+
+#else // use libretro's libpcsxcore/plugins.c code
+
+void dfinput_activate(void)
+{
+}
+
+#endif