mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(udev_joypad.c) Fix reconnect issue

Browse Source
This commit is contained in:
twinaphex 2015-06-03 19:50:48 +02:00
parent bfdde9c586
commit 47ac99c2db
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
input/drivers_joypad/udev_joypad.c
View File

@ -64,7 +64,7 @@ struct udev_joypad
uint16_t strength[2]; uint16_t strength[2];
uint16_t configured_strength[2]; uint16_t configured_strength[2];
char *ident; char ident[PATH_MAX_LENGTH];
char *path; char *path;
int32_t vid; int32_t vid;
int32_t pid; int32_t pid;
@ -217,9 +217,11 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
autoconfig_params_t params = {{0}}; autoconfig_params_t params = {{0}};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (ioctl(fd, EVIOCGNAME(sizeof(settings->input.device_names[0])), pad->ident) < 0) strlcpy(pad->ident, settings->input.device_names[p], sizeof(pad->ident));
if (ioctl(fd, EVIOCGNAME(sizeof(pad->ident)), pad->ident) < 0)
{ {
RARCH_LOG("[udev]: Failed to get pad name.\n"); RARCH_LOG("[udev]: Failed to get pad name: %s.\n", pad->ident);
return -1; return -1;
} }
@ -364,7 +366,7 @@ static void udev_free_pad(unsigned pad, bool hotplug)
free(udev_pads[pad].path); free(udev_pads[pad].path);
if (udev_pads[pad].ident) if (udev_pads[pad].ident)
*udev_pads[pad].ident = '\0'; udev_pads[pad].ident[0] = '\0';
memset(&udev_pads[pad], 0, sizeof(udev_pads[pad])); memset(&udev_pads[pad], 0, sizeof(udev_pads[pad]));
@ -519,10 +521,7 @@ static bool udev_joypad_init(void *data)
(void)data; (void)data;
for (i = 0; i < MAX_USERS; i++) for (i = 0; i < MAX_USERS; i++)
{
udev_pads[i].fd = -1; udev_pads[i].fd = -1;
udev_pads[i].ident = settings->input.device_names[i];
}
g_udev = udev_new(); g_udev = udev_new();
if (!g_udev) if (!g_udev)