mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug where the joypad devices were not always being assigned in the same order as they were numbered under /dev/input/. This showed up mainly when using an external USB Bluetooth dongle. In that case, controllers would be assigned often in reverse order.

Browse Source
This commit is contained in:
Peter Y. Hammond 2017-12-10 22:22:01 -07:00
parent f3a58f4ff3
commit b14598657c
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
input/drivers_joypad/udev_joypad.c
View File

@ -82,6 +82,12 @@ struct udev_joypad
int32_t pid; int32_t pid;
}; };
struct joypad_udev_entry
{
const char *devnode;
struct udev_list_entry *item;
};
static struct udev *udev_joypad_fd = NULL; static struct udev *udev_joypad_fd = NULL;
static struct udev_monitor *udev_joypad_mon = NULL; static struct udev_monitor *udev_joypad_mon = NULL;
static struct udev_joypad udev_pads[MAX_USERS]; static struct udev_joypad udev_pads[MAX_USERS];
@ -526,12 +532,22 @@ static void udev_joypad_poll(void)
} }
} }
// Used for sorting devnodes to appear in the correct order
static int sort_devnodes(const void *a, const void *b)
{
const struct joypad_udev_entry *aa = a;
const struct joypad_udev_entry *bb = b;
return strcmp(aa->devnode, bb->devnode);
}
static bool udev_joypad_init(void *data) static bool udev_joypad_init(void *data)
{ {
unsigned i; unsigned i;
unsigned sorted_count = 0;
struct udev_list_entry *devs = NULL; struct udev_list_entry *devs = NULL;
struct udev_list_entry *item = NULL; struct udev_list_entry *item = NULL;
struct udev_enumerate *enumerate = NULL; struct udev_enumerate *enumerate = NULL;
struct joypad_udev_entry sorted[MAX_USERS];
(void)data; (void)data;
@ -564,6 +580,24 @@ static bool udev_joypad_init(void *data)
struct udev_device *dev = udev_device_new_from_syspath(udev_joypad_fd, name); struct udev_device *dev = udev_device_new_from_syspath(udev_joypad_fd, name);
const char *devnode = udev_device_get_devnode(dev); const char *devnode = udev_device_get_devnode(dev);
if (devnode != NULL) {
sorted[sorted_count].devnode = devnode;
sorted[sorted_count].item = item;
sorted_count++;
} else {
udev_device_unref(dev);
}
}
// Sort the udev entries by devnode name so that they are created in the proper order
qsort(sorted, sorted_count, sizeof(struct joypad_udev_entry), sort_devnodes);
for (i = 0; i < sorted_count; i++)
{
const char *name = udev_list_entry_get_name(sorted[i].item);
struct udev_device *dev = udev_device_new_from_syspath(udev_joypad_fd, name);
const char *devnode = udev_device_get_devnode(dev);
if (devnode) if (devnode)
udev_check_device(dev, devnode); udev_check_device(dev, devnode);
udev_device_unref(dev); udev_device_unref(dev);