diff options
| author | Twinaphex | 2016-07-26 14:24:43 +0200 |
|---|---|---|
| committer | GitHub | 2016-07-26 14:24:43 +0200 |
| commit | 41ad29beb13d815c2cfa9abb3fc8e87f80e7370e (patch) | |
| tree | 0814b15dba3fb3e680eb6106be3c3972ec1ed0fb /plugins | |
| parent | 95527e3538b73dbbb63d28365a25e3fcff3c2650 (diff) | |
| parent | 2ca181a92610030e29f146c876c55fd5a5f46ba9 (diff) | |
| download | pcsx_rearmed-41ad29beb13d815c2cfa9abb3fc8e87f80e7370e.tar.gz pcsx_rearmed-41ad29beb13d815c2cfa9abb3fc8e87f80e7370e.tar.bz2 pcsx_rearmed-41ad29beb13d815c2cfa9abb3fc8e87f80e7370e.zip | |
Merge pull request #51 from alexis-puska/master
add rumble support for controler 1 and 2
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfinput/main.c | 2 | ||||
| -rw-r--r-- | plugins/dfinput/pad.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/plugins/dfinput/main.c b/plugins/dfinput/main.c index ee4625c..4204b86 100644 --- a/plugins/dfinput/main.c +++ b/plugins/dfinput/main.c @@ -56,6 +56,7 @@ static int old_controller_type1 = -1, old_controller_type2 = -1; void dfinput_activate(void) { + #ifndef HAVE_LIBRETRO PadDataS pad; pad.portMultitap = -1; @@ -66,4 +67,5 @@ void dfinput_activate(void) 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 |