From d7317d732984f27c47ca773cbde083e1dd568593 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 8 Jun 2014 06:09:57 +0200 Subject: [PATCH] (PSP) Take out unnecessary custom menu binds --- input/psp_input.c | 48 +---------------------------------------------- 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/input/psp_input.c b/input/psp_input.c index 43523f39c9..6187f5b182 100644 --- a/input/psp_input.c +++ b/input/psp_input.c @@ -184,49 +184,6 @@ static void psp_input_poll(void *data) } } -static bool psp_menu_input_state(uint64_t joykey, uint64_t state) -{ - switch (joykey) - { - case CONSOLE_MENU_A: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_A); - case CONSOLE_MENU_B: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_B); - case CONSOLE_MENU_X: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_X); - case CONSOLE_MENU_Y: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_Y); - case CONSOLE_MENU_START: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_START); - case CONSOLE_MENU_SELECT: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT); - case CONSOLE_MENU_UP: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_UP); - case CONSOLE_MENU_DOWN: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN); - case CONSOLE_MENU_LEFT: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT); - case CONSOLE_MENU_RIGHT: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT); - case CONSOLE_MENU_L: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_L); - case CONSOLE_MENU_R: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_R); - case CONSOLE_MENU_HOME: - return (state & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (state & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3)); - case CONSOLE_MENU_L2: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_L2); - case CONSOLE_MENU_R2: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_R2); - case CONSOLE_MENU_L3: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3); - case CONSOLE_MENU_R3: - return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3); - default: - return false; - } -} - static int16_t psp_input_state(void *data, const struct retro_keybind **binds, unsigned port, unsigned device, unsigned index, unsigned id) @@ -239,10 +196,7 @@ static int16_t psp_input_state(void *data, const struct retro_keybind **binds, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port][id].joykey >= CONSOLE_MENU_FIRST && binds[port][id].joykey <= CONSOLE_MENU_LAST) - return psp_menu_input_state(binds[port][id].joykey, psp->pad_state) ? 1 : 0; - else - return input_joypad_pressed(&psp_joypad, port, binds[port], id); + return input_joypad_pressed(&psp_joypad, port, binds[port], id); case RETRO_DEVICE_ANALOG: return input_joypad_analog(&psp_joypad, port, index, id, binds[port]); }