From 12c0311f04c84976ab2c0e7e0df1456923fbd3ac Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 14 Aug 2014 00:56:40 +0200 Subject: [PATCH] (Input) Get rid of unused devices_size --- driver.h | 1 - input/android_input.c | 1 - input/apple_input.c | 12 ------------ input/dinput.c | 1 - input/gx_input.c | 1 - input/linuxraw_input.c | 1 - input/ps3_input.c | 1 - input/psp_input.c | 1 - input/qnx_input.c | 1 - input/rwebinput_input.c | 1 - input/sdl_input.c | 1 - input/udev_input.c | 1 - input/x11_input.c | 1 - input/xdk_xinput_input.c | 1 - 14 files changed, 25 deletions(-) diff --git a/driver.h b/driver.h index e8dd1654ba..8d473ee8fa 100644 --- a/driver.h +++ b/driver.h @@ -268,7 +268,6 @@ typedef struct input_driver bool (*set_sensor_state)(void *data, unsigned port, enum retro_sensor_action action, unsigned rate); float (*get_sensor_input)(void *data, unsigned port, unsigned id); uint64_t (*get_capabilities)(void *data); - unsigned (*devices_size)(void *data); const char *ident; void (*grab_mouse)(void *data, bool state); diff --git a/input/android_input.c b/input/android_input.c index 09e5a76955..18c826109c 100644 --- a/input/android_input.c +++ b/input/android_input.c @@ -808,7 +808,6 @@ const input_driver_t input_android = { android_input_set_sensor_state, android_input_get_sensor_input, android_input_get_capabilities, - NULL, "android_input", NULL, diff --git a/input/apple_input.c b/input/apple_input.c index fd85be9870..e92a4f4eb9 100644 --- a/input/apple_input.c +++ b/input/apple_input.c @@ -618,13 +618,6 @@ static uint64_t apple_input_get_capabilities(void *data) return caps; } -#ifdef IOS -static unsigned apple_devices_size(void *data) -{ - return DEVICE_LAST; -} -#endif - const rarch_joypad_driver_t *apple_get_joypad_driver(void *data) { return joypad; @@ -639,11 +632,6 @@ const input_driver_t input_apple = { NULL, NULL, apple_input_get_capabilities, -#ifdef IOS - apple_devices_size, -#else - NULL, -#endif "apple_input", NULL, apple_input_set_rumble, diff --git a/input/dinput.c b/input/dinput.c index af2e8f9e2c..b19b43dba2 100644 --- a/input/dinput.c +++ b/input/dinput.c @@ -566,7 +566,6 @@ const input_driver_t input_dinput = { NULL, NULL, dinput_get_capabilities, - NULL, "dinput", dinput_grab_mouse, diff --git a/input/gx_input.c b/input/gx_input.c index b5f2ad9eb4..07366add86 100644 --- a/input/gx_input.c +++ b/input/gx_input.c @@ -538,7 +538,6 @@ const input_driver_t input_gx = { NULL, NULL, gx_input_get_capabilities, - NULL, "gx", NULL, diff --git a/input/linuxraw_input.c b/input/linuxraw_input.c index 6d62f06107..4f6bd7e045 100644 --- a/input/linuxraw_input.c +++ b/input/linuxraw_input.c @@ -246,7 +246,6 @@ const input_driver_t input_linuxraw = { NULL, NULL, linuxraw_get_capabilities, - NULL, "linuxraw", NULL, linuxraw_set_rumble, diff --git a/input/ps3_input.c b/input/ps3_input.c index e60f9f2b2c..28fb6ba5f4 100644 --- a/input/ps3_input.c +++ b/input/ps3_input.c @@ -361,7 +361,6 @@ const input_driver_t input_ps3 = { ps3_input_set_sensor_state, NULL, ps3_input_get_capabilities, - NULL, "ps3", NULL, diff --git a/input/psp_input.c b/input/psp_input.c index bc2a9d17b6..ca48903c9a 100644 --- a/input/psp_input.c +++ b/input/psp_input.c @@ -174,7 +174,6 @@ const input_driver_t input_psp = { NULL, NULL, psp_input_get_capabilities, - NULL, "psp", NULL, diff --git a/input/qnx_input.c b/input/qnx_input.c index fca5e27330..62d69fdbc4 100644 --- a/input/qnx_input.c +++ b/input/qnx_input.c @@ -834,7 +834,6 @@ const input_driver_t input_qnx = { NULL, NULL, qnx_input_get_capabilities, - NULL, "qnx_input", NULL, NULL, diff --git a/input/rwebinput_input.c b/input/rwebinput_input.c index caf8f4a292..ec9d2c0ab8 100644 --- a/input/rwebinput_input.c +++ b/input/rwebinput_input.c @@ -189,7 +189,6 @@ const input_driver_t input_rwebinput = { NULL, NULL, rwebinput_get_capabilities, - NULL, "rwebinput", rwebinput_grab_mouse, }; diff --git a/input/sdl_input.c b/input/sdl_input.c index c807961151..ba439a4413 100644 --- a/input/sdl_input.c +++ b/input/sdl_input.c @@ -336,7 +336,6 @@ const input_driver_t input_sdl = { NULL, NULL, sdl_get_capabilities, - NULL, #ifdef HAVE_SDL2 "sdl2", sdl_grab_mouse, diff --git a/input/udev_input.c b/input/udev_input.c index d00a106039..8540776423 100644 --- a/input/udev_input.c +++ b/input/udev_input.c @@ -828,7 +828,6 @@ const input_driver_t input_udev = { NULL, NULL, udev_input_get_capabilities, - NULL, "udev", udev_input_grab_mouse, udev_input_set_rumble, diff --git a/input/x11_input.c b/input/x11_input.c index 13bedf2abe..998073660f 100644 --- a/input/x11_input.c +++ b/input/x11_input.c @@ -329,7 +329,6 @@ const input_driver_t input_x = { NULL, NULL, x_input_get_capabilities, - NULL, "x", x_grab_mouse, x_set_rumble, diff --git a/input/xdk_xinput_input.c b/input/xdk_xinput_input.c index 4c859f4f53..fc7b1ab840 100644 --- a/input/xdk_xinput_input.c +++ b/input/xdk_xinput_input.c @@ -277,7 +277,6 @@ const input_driver_t input_xinput = NULL, NULL, xdk_input_get_capabilities, - NULL, "xinput", NULL,