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

diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c
index f4a14faf..af6b80b8 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):
@@ -15,9 +15,6 @@
 #include <windows.h>
 #endif
 
-#include <stdio.h>
-#include <string.h>
-
 #include "main.h"
 
 unsigned char CurPad, CurByte, CurCmd, CmdLen;
@@ -43,10 +40,11 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
 			pad_init(); \
 			break; \
 		case PSE_PAD_TYPE_GUNCON: \
-			PAD##n##_startPoll = PADstartPoll_guncon; \
-			PAD##n##_poll = PADpoll_guncon; \
-			guncon_init(); \
-			break; \
+			//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: \
 		case PSE_PAD_TYPE_GUN: \
 		default: \
@@ -56,20 +54,19 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
 		} \
 	}
 
-//                case PSE_PAD_TYPE_NEGCON: \
-//                        PAD##n##_startPoll = PADstartPoll_negcon; \
-//                        PAD##n##_poll = PADpoll_negcon; \
-//                        negcon_init(); \
-//                        break; \
 
 void dfinput_activate(void)
 {
+	#ifndef HAVE_LIBRETRO
 	PadDataS pad;
-	int i;
 
+	pad.portMultitap = -1;
+	pad.requestPadIndex = 0;
 	PAD1_readPort1(&pad);
 	select_pad(1);
 
+	pad.requestPadIndex = 1;
 	PAD2_readPort2(&pad);
 	select_pad(2);
+	#endif
 }