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 475ea07..4204b86 100644 (file)
--- a/plugins/dfinput/main.c
+++ b/plugins/dfinput/main.c
@@ -44,6 +44,7 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
                        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; \
@@ -52,13 +53,19 @@ static int old_controller_type1 = -1, old_controller_type2 = -1;
                } \
        }
 
+
 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
 }