From a72759aba0748776630997ed668282981a3e1df8 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 2 Sep 2020 05:26:24 +0200 Subject: [PATCH] (input drivers) Cleanups --- input/drivers/ctr_input.c | 4 +--- input/drivers/dos_input.c | 2 -- input/drivers/ps2_input.c | 4 ---- input/drivers/ps4_input.c | 2 -- input/drivers/uwp_input.c | 2 -- input/drivers/wiiu_input.c | 6 +----- input/drivers/xdk_xinput_input.c | 2 -- input/drivers/xenon360_input.c | 2 -- 8 files changed, 2 insertions(+), 22 deletions(-) diff --git a/input/drivers/ctr_input.c b/input/drivers/ctr_input.c index 6f0284fd38..570d244100 100644 --- a/input/drivers/ctr_input.c +++ b/input/drivers/ctr_input.c @@ -32,7 +32,7 @@ typedef struct ctr_input { - const input_device_driver_t *joypad; + void *empty; } ctr_input_t; static int16_t ctr_input_state( @@ -47,8 +47,6 @@ static int16_t ctr_input_state( unsigned idx, unsigned id) { - ctr_input_t *ctr = (ctr_input_t*)data; - if (port >= MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS) return 0; diff --git a/input/drivers/dos_input.c b/input/drivers/dos_input.c index 03480d3958..39784d483c 100644 --- a/input/drivers/dos_input.c +++ b/input/drivers/dos_input.c @@ -66,8 +66,6 @@ static int16_t dos_input_state( unsigned idx, unsigned id) { - dos_input_t *dos = (dos_input_t*)data; - if (port > 0) return 0; diff --git a/input/drivers/ps2_input.c b/input/drivers/ps2_input.c index d2863cc83b..db5e0a914d 100644 --- a/input/drivers/ps2_input.c +++ b/input/drivers/ps2_input.c @@ -43,8 +43,6 @@ static int16_t ps2_input_state( unsigned idx, unsigned id) { - ps2_input_t *ps2 = (ps2_input_t*)data; - switch (device) { case RETRO_DEVICE_JOYPAD: @@ -66,8 +64,6 @@ static int16_t ps2_input_state( static void ps2_input_free_input(void *data) { - ps2_input_t *ps2 = (ps2_input_t*)data; - free(data); } diff --git a/input/drivers/ps4_input.c b/input/drivers/ps4_input.c index 2d52a1759f..68b2b22e6f 100644 --- a/input/drivers/ps4_input.c +++ b/input/drivers/ps4_input.c @@ -49,8 +49,6 @@ static int16_t ps4_input_state( unsigned idx, unsigned id) { - ps4_input_t *ps4 = (ps4_input_t*)data; - switch (device) { case RETRO_DEVICE_JOYPAD: diff --git a/input/drivers/uwp_input.c b/input/drivers/uwp_input.c index 027620aab1..327a1bb435 100644 --- a/input/drivers/uwp_input.c +++ b/input/drivers/uwp_input.c @@ -80,8 +80,6 @@ static int16_t uwp_input_state( unsigned index, unsigned id) { - uwp_input_t *uwp = (uwp_input_t*)data; - switch (device) { case RETRO_DEVICE_JOYPAD: diff --git a/input/drivers/wiiu_input.c b/input/drivers/wiiu_input.c index 317805160f..17a98248b9 100644 --- a/input/drivers/wiiu_input.c +++ b/input/drivers/wiiu_input.c @@ -102,9 +102,7 @@ static int16_t wiiu_input_state( unsigned idx, unsigned id) { - wiiu_input_t *wiiu = (wiiu_input_t*)data; - - if (!wiiu || !(port < DEFAULT_MAX_PADS) || !binds || !binds[port]) + if (!(port < DEFAULT_MAX_PADS) || !binds || !binds[port]) return 0; switch (device) @@ -151,8 +149,6 @@ static int16_t wiiu_input_state( static void wiiu_input_free_input(void *data) { - wiiu_input_t *wiiu = (wiiu_input_t*)data; - KBDTeardown(); free(data); diff --git a/input/drivers/xdk_xinput_input.c b/input/drivers/xdk_xinput_input.c index 446293d139..b21f0f73ae 100644 --- a/input/drivers/xdk_xinput_input.c +++ b/input/drivers/xdk_xinput_input.c @@ -52,8 +52,6 @@ static int16_t xdk_input_state( unsigned index, unsigned id) { - xdk_input_t *xdk = (xdk_input_t*)data; - if (port >= DEFAULT_MAX_PADS) return 0; diff --git a/input/drivers/xenon360_input.c b/input/drivers/xenon360_input.c index ba4b25bb0d..b2fb383c21 100644 --- a/input/drivers/xenon360_input.c +++ b/input/drivers/xenon360_input.c @@ -74,8 +74,6 @@ static int16_t xenon360_input_state( unsigned idx, unsigned id) { - uint64_t button = binds[port][id].joykey; - if (port >= DEFAULT_MAX_PADS) return 0;