mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Connect task now sets PID/VID too

Browse Source
This commit is contained in:
twinaphex 2016-12-16 14:02:11 +01:00
parent c3a9ade051
commit 209305f944
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
input/drivers/android_input.c
View File

@ -902,8 +902,6 @@ static void handle_hotplug(android_input_data_t *android_data,
params.idx = *port;
params.vid = vendorId;
params.pid = productId;
settings->input.pid[*port] = params.pid;
settings->input.vid[*port] = params.vid;
strlcpy(params.driver, android_joypad.ident, sizeof(params.driver));
input_autoconfigure_connect(&params);
@ -1031,7 +1029,8 @@ static bool android_input_key_pressed(void *data, int key)
android_input_t *android = (android_input_t*)data;
settings_t *settings = config_get_ptr();
if(settings->input.binds[0][key].valid && android_keyboard_port_input_pressed(settings->input.binds[0],key))
if( settings->input.binds[0][key].valid
&& android_keyboard_port_input_pressed(settings->input.binds[0],key))
return true;
if (settings->input.binds[0][key].valid &&

3
input/drivers_joypad/dinput_joypad.c
View File

@ -281,9 +281,6 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
params.pid = dinput_joypad_pid(g_joypad_cnt);
input_autoconfigure_connect(&params);
settings->input.pid[g_joypad_cnt] = params.pid;
settings->input.vid[g_joypad_cnt] = params.vid;
}
#ifdef HAVE_XINPUT

2
input/drivers_joypad/udev_joypad.c
View File

@ -286,8 +286,6 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
params.idx = p;
params.vid = pad->vid;
params.pid = pad->pid;
settings->input.pid[p] = params.pid;
settings->input.vid[p] = params.vid;
strlcpy(params.driver, udev_joypad.ident,
sizeof(params.driver));

9
tasks/task_autodetect.c
View File

@ -170,9 +170,12 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
task->title = strdup(msg);
}
strlcpy(settings->input.device_names[params->idx],
params->name,
sizeof(settings->input.device_names[params->idx]));
if (!string_is_empty(params->name))
strlcpy(settings->input.device_names[params->idx],
params->name,
sizeof(settings->input.device_names[params->idx]));
settings->input.pid[params->idx] = params->pid;
settings->input.vid[params->idx] = params->vid;
input_autoconfigure_joypad_reindex_devices();
}