From 3247de9afa3e1647893e7c0f2fff3807799d043d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Sep 2016 18:39:46 +0200 Subject: [PATCH] Cleanup --- input/input_autodetect.c | 10 +++------- input/input_driver.c | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/input/input_autodetect.c b/input/input_autodetect.c index c3e912b1df..40b121cd73 100644 --- a/input/input_autodetect.c +++ b/input/input_autodetect.c @@ -103,23 +103,18 @@ static int input_try_autoconfigure_joypad_from_conf(config_file_t *conf, && params->pid != 0 && input_vid != 0 && input_pid != 0) - { score += 3; - } /* Check for name match */ if (string_is_equal(ident, params->name)) - { score += 2; - } else { if (!string_is_empty(ident) && !strncmp(params->name, ident, strlen(ident))) - { score += 1; - } } + return score; } @@ -225,7 +220,8 @@ static bool input_autoconfigure_joypad_from_conf_dir( for (i = 0; i < list->size; i++) { conf = config_file_new(list->elems[i].data); - ret = input_try_autoconfigure_joypad_from_conf(conf, params); + ret = input_try_autoconfigure_joypad_from_conf(conf, params); + if(ret >= current_best) { index = i; diff --git a/input/input_driver.c b/input/input_driver.c index 8f27a5d6c3..0b31266798 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -99,7 +99,7 @@ struct turbo_buttons static turbo_buttons_t input_driver_turbo_btns; #ifdef HAVE_COMMAND -static command_t *input_driver_command = NULL; +static command_t *input_driver_command = NULL; #endif #ifdef HAVE_NETWORKGAMEPAD static input_remote_t *input_driver_remote = NULL;