mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 02:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor input autoconfiguration to use a score system

Browse Source
This commit is contained in:
radius 2015-07-09 22:46:28 -05:00
parent c604b44672
commit 9d268aba54
2 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
input/drivers_joypad/dinput_joypad.c
View File

@ -230,10 +230,10 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
#endif
g_pads[g_joypad_cnt].vid = inst->guidProduct.Data1 / 0x10000;
g_pads[g_joypad_cnt].pid = inst->guidProduct.Data1 % 0x10000;
g_pads[g_joypad_cnt].vid = inst->guidProduct.Data1 % 0x10000;
g_pads[g_joypad_cnt].pid = inst->guidProduct.Data1 / 0x10000;
RARCH_LOG("PID: {%04lX} VID:{%04lX}\n", g_pads[g_joypad_cnt].pid, g_pads[g_joypad_cnt].vid);
RARCH_LOG("Device #%u PID: {%04lX} VID:{%04lX}\n", g_joypad_cnt, g_pads[g_joypad_cnt].pid, g_pads[g_joypad_cnt].vid);
#ifdef HAVE_XINPUT
#if 0
@ -276,7 +276,6 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
params.vid = dinput_joypad_vid(g_joypad_cnt);
params.pid = dinput_joypad_pid(g_joypad_cnt);
input_config_autoconfigure_joypad(&params);
RARCH_LOG("DINPUT %s %s %s\n",params.name, params.driver, params.display_name);
}
enum_iteration_done:

81
input/input_autodetect.c
View File

@ -23,7 +23,7 @@
#include "../general.h"
enum
/*enum
{
AUTODETECT_MATCH_NONE = 0,
AUTODETECT_MATCH_VID,
@ -31,7 +31,7 @@ enum
AUTODETECT_MATCH_IDENT,
AUTODETECT_MATCH_DRIVER,
AUTODETECT_MATCH_NAME
};
};*/
static void input_autoconfigure_joypad_conf(config_file_t *conf,
struct retro_keybind *binds)
@ -48,14 +48,14 @@ static void input_autoconfigure_joypad_conf(config_file_t *conf,
}
static int input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
autoconfig_params_t *params, unsigned *match)
autoconfig_params_t *params)
{
char ident[PATH_MAX_LENGTH] = {0};
char ident_idx[PATH_MAX_LENGTH] = {0};
//char ident_idx[PATH_MAX_LENGTH] = {0};
char input_driver[PATH_MAX_LENGTH] = {0};
int input_vid = 0;
int input_pid = 0;
int ret = 0;
int score = 0;
if (!conf)
return false;
@ -67,11 +67,7 @@ static int input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
config_get_int (conf, "input_vendor_id", &input_vid);
config_get_int (conf, "input_product_id", &input_pid);
snprintf(ident_idx,
sizeof(ident_idx), "%s_p%u", ident, params->idx);
/* If Vendor ID and Product ID matches, we've found our
* entry. */
/* Check for VID/PID */
if ( (params->vid == input_vid)
&& (params->pid == input_pid)
&& params->vid != 0
@ -79,37 +75,26 @@ static int input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
&& input_vid != 0
&& input_pid != 0)
{
BIT32_SET(*match, AUTODETECT_MATCH_VID);
BIT32_SET(*match, AUTODETECT_MATCH_PID);
ret = 1;
}
/* Check for name match. */
if (!strcmp(ident_idx, params->name))
{
BIT32_SET(*match, AUTODETECT_MATCH_NAME);
ret = 1;
}
/* Check for name match - name starts with ident */
if (ident[0] != '\0' && !strncmp(params->name, ident, strlen(ident)))
{
BIT32_SET(*match, AUTODETECT_MATCH_IDENT);
ret = 2;
if (!strcmp(params->driver, input_driver))
BIT32_SET(*match, AUTODETECT_MATCH_DRIVER);
score += 3;
RARCH_LOG("Autoconf: VID/PID match score=%d\n", score);
}
/* Check for name match */
if (!strcmp(ident, params->name))
{
BIT32_SET(*match, AUTODETECT_MATCH_IDENT);
ret = 1;
if (!strcmp(params->driver, input_driver))
BIT32_SET(*match, AUTODETECT_MATCH_DRIVER);
score += 2;
RARCH_LOG("Autoconf: exact name match score=%d\n", score);
}
return ret;
else
{
if (ident[0] != '\0' && !strncmp(params->name, ident, strlen(ident)))
{
score += 1;
RARCH_LOG("Autoconf: partial name match score=%d\n", score);
}
}
RARCH_LOG("Autoconf: configuration score=%d\n", score);
return score;
}
static void input_autoconfigure_joypad_add(
@ -143,13 +128,12 @@ static int input_autoconfigure_joypad_from_conf(
config_file_t *conf, autoconfig_params_t *params)
{
int ret = 0;
uint32_t match = 0;
if (!conf)
return false;
ret = input_try_autoconfigure_joypad_from_conf(conf,
params, &match);
params);
if (ret)
input_autoconfigure_joypad_add(conf, params);
@ -171,16 +155,27 @@ static bool input_autoconfigure_joypad_from_conf_dir(
if (!list)
return false;
int current_best = 0;
int index = 0;
config_file_t *conf;
for (i = 0; i < list->size; i++)
{
config_file_t *conf = config_file_new(list->elems[i].data);
ret = input_autoconfigure_joypad_from_conf(conf, params);
if (ret == 1)
break;
conf = config_file_new(list->elems[i].data);
ret = input_try_autoconfigure_joypad_from_conf(conf, params);
if(ret > current_best)
{
index = i;
current_best = ret;
}
config_file_free(conf);
}
conf = config_file_new(list->elems[index].data);
input_autoconfigure_joypad_add(conf, params);
config_file_free(conf);
string_list_free(list);
return ret !=0 ? true : false;