From da4d2a9f42ad928ecfd26e8098a0d8a34bdf86c8 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 10 Jan 2017 17:05:04 +0100 Subject: [PATCH] Remove conditionals for device JOYPAD from input_state callback functions --- input/drivers/android_input.c | 8 +++----- input/drivers/cocoa_input.c | 12 ++++-------- input/drivers/ctr_input.c | 4 +--- input/drivers/dinput.c | 4 +--- input/drivers/gx_input.c | 4 +--- input/drivers/linuxraw_input.c | 6 ++---- input/drivers/ps3_input.c | 4 +--- input/drivers/psp_input.c | 4 +--- input/drivers/qnx_input.c | 8 ++------ input/drivers/rwebinput_input.c | 6 +----- input/drivers/sdl_input.c | 4 ++-- input/drivers/udev_input.c | 6 ++---- input/drivers/wiiu_input.c | 4 +--- input/drivers/x11_input.c | 6 ++---- input/drivers/xdk_xinput_input.c | 4 +--- 15 files changed, 25 insertions(+), 59 deletions(-) diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 881637c00e..444bc2c04d 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -1122,11 +1122,9 @@ static int16_t android_input_state(void *data, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port] && binds[port][id].valid) - return input_joypad_pressed(android->joypad, joypad_info, - port, binds[port], id) || - android_keyboard_port_input_pressed(binds[port],id); - break; + return input_joypad_pressed(android->joypad, joypad_info, + port, binds[port], id) || + android_keyboard_port_input_pressed(binds[port],id); case RETRO_DEVICE_ANALOG: if (binds[port]) return input_joypad_analog(android->joypad, joypad_info, diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c index 1233cf9c52..fef44094bb 100644 --- a/input/drivers/cocoa_input.c +++ b/input/drivers/cocoa_input.c @@ -289,16 +289,12 @@ static int16_t cocoa_input_state(void *data, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port] && binds[port][id].valid) - { - return apple_input_is_pressed(port, binds[port], id) || - input_joypad_pressed(apple->joypad, joypad_info, port, binds[port], id) + return apple_input_is_pressed(port, binds[port], id) || + input_joypad_pressed(apple->joypad, joypad_info, port, binds[port], id) #ifdef HAVE_MFI - || input_joypad_pressed(apple->sec_joypad, joypad_info, port, binds[port], id) + || input_joypad_pressed(apple->sec_joypad, joypad_info, port, binds[port], id) #endif - ; - } - break; + ; case RETRO_DEVICE_ANALOG: #ifdef HAVE_MFI if (binds[port]) diff --git a/input/drivers/ctr_input.c b/input/drivers/ctr_input.c index 8495d9690f..1094159754 100644 --- a/input/drivers/ctr_input.c +++ b/input/drivers/ctr_input.c @@ -63,9 +63,7 @@ static int16_t ctr_input_state(void *data, const struct retro_keybind **binds, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port] && binds[port][id].valid) - return input_joypad_pressed(ctr->joypad, joypad_info, port, binds[port], id); - break; + return input_joypad_pressed(ctr->joypad, joypad_info, port, binds[port], id); case RETRO_DEVICE_ANALOG: if (binds[port]) return input_joypad_analog(ctr->joypad, joypad_info, port, idx, id, binds[port]); diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c index 5d1ff4da4f..238afcdbbc 100644 --- a/input/drivers/dinput.c +++ b/input/drivers/dinput.c @@ -481,9 +481,7 @@ static int16_t dinput_input_state(void *data, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port]) - return dinput_is_pressed(di, binds[port], port, id); - break; + return dinput_is_pressed(di, binds[port], port, id); case RETRO_DEVICE_KEYBOARD: return dinput_keyboard_pressed(di, id); diff --git a/input/drivers/gx_input.c b/input/drivers/gx_input.c index b733834e4a..4a92cf8ba7 100644 --- a/input/drivers/gx_input.c +++ b/input/drivers/gx_input.c @@ -58,9 +58,7 @@ static int16_t gx_input_state(void *data, const struct retro_keybind **binds, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port] && binds[port][id].valid) - return input_joypad_pressed(gx->joypad, joypad_info, port, binds[port], id); - break; + return input_joypad_pressed(gx->joypad, joypad_info, port, binds[port], id); case RETRO_DEVICE_ANALOG: if (binds[port]) return input_joypad_analog(gx->joypad, joypad_info, port, idx, id, binds[port]); diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c index 9895c3a9b2..9b6bda88d5 100644 --- a/input/drivers/linuxraw_input.c +++ b/input/drivers/linuxraw_input.c @@ -128,10 +128,8 @@ static int16_t linuxraw_input_state(void *data, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port] && binds[port][id].valid) - return linuxraw_is_pressed(linuxraw, binds[port], id) || - input_joypad_pressed(linuxraw->joypad, joypad_info, port, binds[port], id); - break; + return linuxraw_is_pressed(linuxraw, binds[port], id) || + input_joypad_pressed(linuxraw->joypad, joypad_info, port, binds[port], id); case RETRO_DEVICE_ANALOG: if (binds[port]) ret = linuxraw_analog_pressed(linuxraw, binds[port], idx, id); diff --git a/input/drivers/ps3_input.c b/input/drivers/ps3_input.c index 5aabae558c..9d61afdbaf 100644 --- a/input/drivers/ps3_input.c +++ b/input/drivers/ps3_input.c @@ -118,9 +118,7 @@ static int16_t ps3_input_state(void *data, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port] && binds[port][id].valid) - return input_joypad_pressed(ps3->joypad, joypad_info, port, binds[port], id); - break; + return input_joypad_pressed(ps3->joypad, joypad_info, port, binds[port], id); case RETRO_DEVICE_ANALOG: if (binds[port]) return input_joypad_analog(ps3->joypad, joypad_info, port, idx, id, binds[port]); diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c index 39b1427bf3..0638cff67f 100644 --- a/input/drivers/psp_input.c +++ b/input/drivers/psp_input.c @@ -80,9 +80,7 @@ static int16_t psp_input_state(void *data, const struct retro_keybind **binds, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port] && binds[port][id].valid) - return input_joypad_pressed(psp->joypad, joypad_info, port, binds[port], id); - break; + return input_joypad_pressed(psp->joypad, joypad_info, port, binds[port], id); case RETRO_DEVICE_ANALOG: if (binds[port]) return input_joypad_analog(psp->joypad, joypad_info, port, idx, id, binds[port]); diff --git a/input/drivers/qnx_input.c b/input/drivers/qnx_input.c index a881b395ca..7a63b7e1ab 100644 --- a/input/drivers/qnx_input.c +++ b/input/drivers/qnx_input.c @@ -783,16 +783,12 @@ static int16_t qnx_input_state(void *data, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port] && binds[port][id].valid) - return qnx_is_pressed(qnx, binds[port], port, id); - break; + return qnx_is_pressed(qnx, binds[port], port, id); case RETRO_DEVICE_KEYBOARD: - return qnx_keyboard_pressed(qnx, id); - break; + return qnx_keyboard_pressed(qnx, id); case RETRO_DEVICE_POINTER: case RARCH_DEVICE_POINTER_SCREEN: return qnx_pointer_input_state(qnx, idx, id, device == RARCH_DEVICE_POINTER_SCREEN); - break; default: break; } diff --git a/input/drivers/rwebinput_input.c b/input/drivers/rwebinput_input.c index 30de0252f5..ec21a81d90 100644 --- a/input/drivers/rwebinput_input.c +++ b/input/drivers/rwebinput_input.c @@ -150,15 +150,11 @@ static int16_t rwebinput_input_state(void *data, const struct retro_keybind **bi switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port] && binds[port][id].valid) - return rwebinput_is_pressed(rwebinput, binds[port], id); - break; + return rwebinput_is_pressed(rwebinput, binds[port], id); case RETRO_DEVICE_ANALOG: return rwebinput_analog_pressed(rwebinput, binds[port], idx, id); - case RETRO_DEVICE_KEYBOARD: return rwebinput_key_pressed(rwebinput, id); - case RETRO_DEVICE_MOUSE: return rwebinput_mouse_state(rwebinput, id); } diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c index c837e2cbee..801e1cee77 100644 --- a/input/drivers/sdl_input.c +++ b/input/drivers/sdl_input.c @@ -119,7 +119,7 @@ static int16_t sdl_joypad_device_state(sdl_input_t *sdl, const struct retro_keyb settings_t *settings = config_get_ptr(); const struct retro_keybind *binds = binds_[port]; - if (binds && binds[id].valid && sdl_is_pressed(sdl, port, binds, id)) + if (sdl_is_pressed(sdl, port, binds, id)) { *device = INPUT_DEVICE_TYPE_KEYBOARD; return 1; @@ -129,7 +129,7 @@ static int16_t sdl_joypad_device_state(sdl_input_t *sdl, const struct retro_keyb joypad_info.auto_binds = settings->input.autoconf_binds[port]; joypad_info.axis_threshold = settings->input.axis_threshold; - if (binds && binds[id].valid && input_joypad_pressed(sdl->joypad, joypad_info, 0, binds, id)) + if (input_joypad_pressed(sdl->joypad, joypad_info, 0, binds, id)) { *device = INPUT_DEVICE_TYPE_JOYPAD; return 1; diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c index 0b0ba26491..8f69389cd8 100644 --- a/input/drivers/udev_input.c +++ b/input/drivers/udev_input.c @@ -510,10 +510,8 @@ static int16_t udev_input_state(void *data, const struct retro_keybind **binds, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port] && binds[port][id].valid) - return udev_input_is_pressed(binds[port], id) || - input_joypad_pressed(udev->joypad, joypad_info, port, binds[port], id); - break; + return udev_input_is_pressed(binds[port], id) || + input_joypad_pressed(udev->joypad, joypad_info, port, binds[port], id); case RETRO_DEVICE_ANALOG: ret = udev_analog_pressed(binds[port], idx, id); if (!ret && binds[port]) diff --git a/input/drivers/wiiu_input.c b/input/drivers/wiiu_input.c index 70b9adc3c8..b4c1d288ed 100644 --- a/input/drivers/wiiu_input.c +++ b/input/drivers/wiiu_input.c @@ -65,9 +65,7 @@ static int16_t wiiu_input_state(void *data, const struct retro_keybind **binds, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port][id].valid) - return input_joypad_pressed(wiiu->joypad, joypad_info, port, binds[port], id); - break; + return input_joypad_pressed(wiiu->joypad, joypad_info, port, binds[port], id); case RETRO_DEVICE_ANALOG: if (binds[port]) return input_joypad_analog(wiiu->joypad, joypad_info, port, idx, id, binds[port]); diff --git a/input/drivers/x11_input.c b/input/drivers/x11_input.c index b449cb0f06..6e737be5b9 100644 --- a/input/drivers/x11_input.c +++ b/input/drivers/x11_input.c @@ -235,10 +235,8 @@ static int16_t x_input_state(void *data, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port] && binds[port][id].valid) - return x_is_pressed(x11, binds[port], id) || - input_joypad_pressed(x11->joypad, joypad_info, port, binds[port], id); - break; + return x_is_pressed(x11, binds[port], id) || + input_joypad_pressed(x11->joypad, joypad_info, port, binds[port], id); case RETRO_DEVICE_KEYBOARD: return x_key_pressed(x11, id); case RETRO_DEVICE_ANALOG: diff --git a/input/drivers/xdk_xinput_input.c b/input/drivers/xdk_xinput_input.c index 919eebc174..0d1ba26c85 100644 --- a/input/drivers/xdk_xinput_input.c +++ b/input/drivers/xdk_xinput_input.c @@ -65,9 +65,7 @@ static int16_t xdk_input_state(void *data, const struct retro_keybind **binds, switch (device) { case RETRO_DEVICE_JOYPAD: - if (binds[port] && binds[port][id].valid) - return input_joypad_pressed(xdk->joypad, joypad_info, port, binds[port], id); - break; + return input_joypad_pressed(xdk->joypad, joypad_info, port, binds[port], id); case RETRO_DEVICE_ANALOG: if (binds[port]) return input_joypad_analog(xdk->joypad, joypad_info, port, index, id, binds[port]);