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

Merge pull request from markand/fix-vid-pid

Browse Source 
Use EVIOCGID's ioctl to get vendor/product id,
This commit is contained in:
Twinaphex 2018-02-26 18:39:33 +01:00 committed by GitHub
commit 4dc9c408d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions

13
input/drivers_joypad/udev_joypad.c

@ -151,6 +151,7 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
unsigned axes = 0; unsigned axes = 0;
struct udev_device *parent = NULL; struct udev_device *parent = NULL;
struct udev_joypad *pad = (struct udev_joypad*)&udev_pads[p]; struct udev_joypad *pad = (struct udev_joypad*)&udev_pads[p];
struct input_id inputid = {0};
unsigned long keybit[NBITS(KEY_MAX)] = {0}; unsigned long keybit[NBITS(KEY_MAX)] = {0};
unsigned long absbit[NBITS(ABS_MAX)] = {0}; unsigned long absbit[NBITS(ABS_MAX)] = {0};
unsigned long ffbit[NBITS(FF_MAX)] = {0}; unsigned long ffbit[NBITS(FF_MAX)] = {0};
@ -163,16 +164,12 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
return -1; return -1;
} }
/* Don't worry about unref'ing the parent. */
parent = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device");
pad->vid = pad->pid = 0; pad->vid = pad->pid = 0;
if ((buf = udev_device_get_sysattr_value(parent, "idVendor")) != NULL) if (ioctl(fd, EVIOCGID, &inputid) >= 0) {
pad->vid = strtol(buf, NULL, 16); pad->vid = inputid.vendor;
pad->pid = inputid.product;
if ((buf = udev_device_get_sysattr_value(parent, "idProduct")) != NULL) }
pad->pid = strtol(buf, NULL, 16);
RARCH_LOG("[udev]: Plugged pad: %s (%u:%u) on port #%u.\n", RARCH_LOG("[udev]: Plugged pad: %s (%u:%u) on port #%u.\n",
pad->ident, pad->vid, pad->pid, p); pad->ident, pad->vid, pad->pid, p);