X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfinput%2Fmain.c;h=4f1d03f6ca4e9cf1be64185eca4491dfb2be2cca;hb=5b5680983b7b3dde95acfe42f58e748d9f7fe1cb;hp=974c4dddac819721a7eb5fb7213a032bfdca2c68;hpb=8622c9dcd0abc62601ff6c64f93f9294c520ed58;p=pcsx_rearmed.git

diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c
index 974c4ddd..4f1d03f6 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):
@@ -35,11 +35,10 @@ 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; */ \
+			PAD##n##_startPoll = PADstartPoll_guncon; \
+			PAD##n##_poll = PADpoll_guncon; \
+			guncon_init(); \
+			break; \
 		case PSE_PAD_TYPE_NEGCON: \
 		case PSE_PAD_TYPE_GUN: \
 		default: \
@@ -48,12 +47,9 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
 			break; \
 		} \
 	}
-#endif /* HAVE_LIBRETRO */
-
 
 void dfinput_activate(void)
 {
-	#ifndef HAVE_LIBRETRO
 	PadDataS pad;
 
 	pad.portMultitap = -1;
@@ -64,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