From b51fca84116f0f27e33e4cf0456501a0754add68 Mon Sep 17 00:00:00 2001 From: Themaister Date: Wed, 31 Jul 2013 20:19:53 +0200 Subject: [PATCH] Fix X/Y on Shield. --- android/native/jni/input_android.c | 4 ++-- frontend/menu/menu_common.c | 2 +- frontend/menu/rgui.c | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c index d7ac140604..a986e1dc3a 100644 --- a/android/native/jni/input_android.c +++ b/android/native/jni/input_android.c @@ -1482,8 +1482,8 @@ static void android_input_set_keybinds(void *data, unsigned device, g_settings.input.dpad_emulation[port] = ANALOG_DPAD_DUALANALOG; keycode_lut[AKEYCODE_BUTTON_B] |= ((RETRO_DEVICE_ID_JOYPAD_A+1) << shift); keycode_lut[AKEYCODE_BUTTON_A] |= ((RETRO_DEVICE_ID_JOYPAD_B+1) << shift); - keycode_lut[AKEYCODE_BUTTON_X] |= ((RETRO_DEVICE_ID_JOYPAD_X+1) << shift); - keycode_lut[AKEYCODE_BUTTON_Y] |= ((RETRO_DEVICE_ID_JOYPAD_Y+1) << shift); + keycode_lut[AKEYCODE_BUTTON_Y] |= ((RETRO_DEVICE_ID_JOYPAD_X+1) << shift); + keycode_lut[AKEYCODE_BUTTON_X] |= ((RETRO_DEVICE_ID_JOYPAD_Y+1) << shift); keycode_lut[AKEYCODE_BUTTON_L1] |= ((RETRO_DEVICE_ID_JOYPAD_L+1) << shift); keycode_lut[AKEYCODE_BUTTON_R1] |= ((RETRO_DEVICE_ID_JOYPAD_R+1) << shift); keycode_lut[AKEYCODE_BUTTON_THUMBL] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift); diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index 0b73efc303..a543b4adef 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -834,7 +834,7 @@ bool menu_iterate(void) // Throttle in case VSync is broken (avoid 1000+ FPS RGUI). time = rarch_get_time_usec(); delta = (time - rgui->last_time) / 1000; - target_msec = 1000 / g_settings.video.refresh_rate; + target_msec = 750 / g_settings.video.refresh_rate; // Try to sleep less, so we can hopefully rely on FPS logger. sleep_msec = target_msec - delta; if (sleep_msec > 0) rarch_sleep(sleep_msec); diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index 2093953cd6..b95cea36e7 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -792,6 +792,9 @@ static void render_text(rgui_handle_t *rgui) case ANALOG_DPAD_LSTICK: strlcpy(type_str, "Left Stick", sizeof(type_str)); break; + case ANALOG_DPAD_DUALANALOG: + strlcpy(type_str, "Dual Analog", sizeof(type_str)); + break; case ANALOG_DPAD_RSTICK: strlcpy(type_str, "Right Stick", sizeof(type_str)); break;