2 files changed, 20 insertions, 5 deletions

diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c
index 475ea07..9c19bb6 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):
@@ -27,6 +27,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) \
@@ -40,10 +42,12 @@ 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: \
 			PAD##n##_startPoll = PAD##n##__startPoll; \
@@ -51,14 +55,21 @@ 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;
+	pad.requestPadIndex = 0;
 	PAD1_readPort1(&pad);
 	select_pad(1);
 
+	pad.requestPadIndex = 1;
 	PAD2_readPort2(&pad);
 	select_pad(2);
+	#endif
 }
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index 7e00a11..3e33366 100644
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -42,6 +42,7 @@ enum {
 	CMD_VIBRATION_TOGGLE = 0x4D,
 };
 
+#ifndef HAVE_LIBRETRO
 static struct {
 	uint8_t PadMode;
 	uint8_t PadID;
@@ -242,6 +243,7 @@ static void do_vibration(unsigned char value)
             break;
     }
 }
+#endif
 
 #if 0
 #include <stdio.h>
@@ -254,6 +256,7 @@ unsigned char PADpoll(unsigned char value) {
 #define PADpoll PADpoll_
 #endif
 
+#ifndef HAVE_LIBRETRO
 unsigned char PADpoll_pad(unsigned char value) {
 	if (CurByte == 0) {
 		CurCmd = value;
@@ -302,3 +305,4 @@ void pad_init(void)
 		padstate[i].PadMode = padstate[i].pad.controllerType == PSE_PAD_TYPE_ANALOGPAD;
 	}
 }
+#endif