diff options
| author | notaz | 2014-12-20 20:26:22 +0200 |
|---|---|---|
| committer | notaz | 2014-12-20 21:27:23 +0200 |
| commit | d71c709541218f67ab32229b03307b045a8ed6cb (patch) | |
| tree | 8fc070bbe8339e1b669766cac5eba01299b679dc /frontend | |
| parent | 4e47706596441172d1cc3f203b8baa398cea3023 (diff) | |
| download | pcsx_rearmed-d71c709541218f67ab32229b03307b045a8ed6cb.tar.gz pcsx_rearmed-d71c709541218f67ab32229b03307b045a8ed6cb.tar.bz2 pcsx_rearmed-d71c709541218f67ab32229b03307b045a8ed6cb.zip | |
fix up other platforms after rumble change
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/libretro.c | 2 | ||||
| -rw-r--r-- | frontend/plat_dummy.c | 2 | ||||
| -rw-r--r-- | frontend/plat_pandora.c | 2 | ||||
| -rw-r--r-- | frontend/plat_pollux.c | 7 | ||||
| -rw-r--r-- | frontend/plat_sdl.c | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/frontend/libretro.c b/frontend/libretro.c index 47f07a6..74b5dbf 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -197,7 +197,7 @@ void pl_timing_prepare(int is_pal) is_pal_mode = is_pal; } -void plat_trigger_vibrate(int pad, uint32_t low, uint32_t high) +void plat_trigger_vibrate(int pad, int low, int high) { rumble.set_rumble_state(pad, RETRO_RUMBLE_STRONG, high << 8); rumble.set_rumble_state(pad, RETRO_RUMBLE_WEAK, low ? 0xffff : 0x0); diff --git a/frontend/plat_dummy.c b/frontend/plat_dummy.c index baed0d5..b490cff 100644 --- a/frontend/plat_dummy.c +++ b/frontend/plat_dummy.c @@ -54,7 +54,7 @@ void *plat_prepare_screenshot(int *w, int *h, int *bpp) return 0; } -void plat_trigger_vibrate(int is_strong) +void plat_trigger_vibrate(int pad, int low, int high) { } diff --git a/frontend/plat_pandora.c b/frontend/plat_pandora.c index 3202c1d..41dc2fe 100644 --- a/frontend/plat_pandora.c +++ b/frontend/plat_pandora.c @@ -106,6 +106,6 @@ void plat_gvideo_open(int is_pal) plat_omap_gvideo_open(); } -void plat_trigger_vibrate(int is_strong) +void plat_trigger_vibrate(int pad, int low, int high) { } diff --git a/frontend/plat_pollux.c b/frontend/plat_pollux.c index cb7afef..33e9417 100644 --- a/frontend/plat_pollux.c +++ b/frontend/plat_pollux.c @@ -704,10 +704,15 @@ static int haptic_init(void) return 0; } -void plat_trigger_vibrate(int is_strong) +void plat_trigger_vibrate(int pad, int low, int high) { + int is_strong; int ret; + if (low == 0 && high == 0) + return; + is_strong = (high >= 0xf0); + if (hapticdev == -2) return; // it's broken if (hapticdev < 0) { diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c index 4e77dc3..5e11cf8 100644 --- a/frontend/plat_sdl.c +++ b/frontend/plat_sdl.c @@ -336,7 +336,7 @@ void *plat_prepare_screenshot(int *w, int *h, int *bpp) return 0; } -void plat_trigger_vibrate(int is_strong) +void plat_trigger_vibrate(int pad, int low, int high) { } |