Merge branch 'mainline' into libretro

[pcsx_rearmed.git] / plugins / dfinput / main.c

diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c
index f4a14fa..4204b86 100644 (file)
--- a/plugins/dfinput/main.c
+++ b/plugins/dfinput/main.c
@@ -15,9 +15,6 @@
 #include <windows.h>
 #endif
 
-#include <stdio.h>
-#include <string.h>
-
 #include "main.h"
 
 unsigned char CurPad, CurByte, CurCmd, CmdLen;
@@ -56,20 +53,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
 }