ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(udev_joypad.c) Refactor udev_add_pad

This commit is contained in:
twinaphex 2015-06-03 19:02:48 +02:00
parent 976428f7fd
commit bfdde9c586
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
input/drivers_joypad/udev_joypad.c
View File

@ -201,8 +201,9 @@ error:
return -1; return -1;
} }
static bool udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char *path) static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char *path)
{ {
int ret = 0;
int i; int i;
const char *buf; const char *buf;
struct stat st; struct stat st;
@ -219,7 +220,7 @@ static bool udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
if (ioctl(fd, EVIOCGNAME(sizeof(settings->input.device_names[0])), pad->ident) < 0) if (ioctl(fd, EVIOCGNAME(sizeof(settings->input.device_names[0])), pad->ident) < 0)
{ {
RARCH_LOG("[udev]: Failed to get pad name.\n"); RARCH_LOG("[udev]: Failed to get pad name.\n");
return false; return -1;
} }
/* Don't worry about unref'ing the parent. */ /* Don't worry about unref'ing the parent. */
@ -237,11 +238,11 @@ static bool udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
pad->ident, pad->vid, pad->pid, p); pad->ident, pad->vid, pad->pid, p);
if (fstat(fd, &st) < 0) if (fstat(fd, &st) < 0)
return false; return -1;
if ((ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) < 0) || if ((ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) < 0) ||
(ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) < 0)) (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) < 0))
return false; return -1;
/* Go through all possible keycodes, check if they are used, /* Go through all possible keycodes, check if they are used,
* and map them to button/axes/hat indices. * and map them to button/axes/hat indices.
@ -287,6 +288,8 @@ static bool udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
params.pid = pad->pid; params.pid = pad->pid;
strlcpy(params.driver, udev_joypad.ident, sizeof(params.driver)); strlcpy(params.driver, udev_joypad.ident, sizeof(params.driver));
input_config_autoconfigure_joypad(&params); input_config_autoconfigure_joypad(&params);
ret = 1;
} }
/* Check for rumble features. */ /* Check for rumble features. */
@ -300,11 +303,12 @@ static bool udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
RARCH_LOG("[udev]: Pad #%u (%s) supports %d force feedback effects.\n", p, path, pad->num_effects); RARCH_LOG("[udev]: Pad #%u (%s) supports %d force feedback effects.\n", p, path, pad->num_effects);
} }
return true; return ret;
} }
static void udev_check_device(struct udev_device *dev, const char *path, bool hotplugged) static void udev_check_device(struct udev_device *dev, const char *path, bool hotplugged)
{ {
int ret;
int pad, fd; int pad, fd;
unsigned i; unsigned i;
struct stat st; struct stat st;
@ -329,11 +333,28 @@ static void udev_check_device(struct udev_device *dev, const char *path, bool ho
if (fd < 0) if (fd < 0)
return; return;
if (udev_add_pad(dev, pad, fd, path)) ret = udev_add_pad(dev, pad, fd, path);
return;
RARCH_ERR("[udev]: Failed to add pad: %s.\n", path); switch (ret)
close(fd); {
case -1:
RARCH_ERR("[udev]: Failed to add pad: %s.\n", path);
close(fd);
break;
case 1:
/* Pad was autoconfigured. */
break;
case 0:
default:
if (hotplugged)
{
char msg[PATH_MAX_LENGTH];
snprintf(msg, sizeof(msg), "Device #%u (%s) connected.", pad, path);
rarch_main_msg_queue_push(msg, 0, 60, false);
RARCH_LOG("[udev]: %s\n", msg);
}
break;
}
} }
static void udev_free_pad(unsigned pad, bool hotplug) static void udev_free_pad(unsigned pad, bool hotplug)