diff options
Diffstat (limited to 'plugins/dfinput')
| -rw-r--r-- | plugins/dfinput/main.c | 18 | ||||
| -rw-r--r-- | plugins/dfinput/pad.c | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c index 475ea07..af6b80b 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): @@ -40,10 +40,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; \ @@ -52,13 +54,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 } diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c index 7e00a11..853c8c8 100644 --- a/plugins/dfinput/pad.c +++ b/plugins/dfinput/pad.c @@ -254,6 +254,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 +303,4 @@ void pad_init(void) padstate[i].PadMode = padstate[i].pad.controllerType == PSE_PAD_TYPE_ANALOGPAD; } } +#endif |