fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2025-12-25 03:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

uinput: split uinput device creation into a helper function

Browse source 
No functional changes. This is prep work for supporting the new
UIDEV_DEV_SETUP ioctl.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Peter Hutterer 2016-04-06 15:32:56 +10:00
parent 345a1589a5
commit 7989eef759
1 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
libevdev/libevdev-uinput.c
View file

@ -271,29 +271,12 @@ fetch_syspath_and_devnode(struct libevdev_uinput *uinput_dev)
return uinput_dev->devnode ? 0 : -1;
}
LIBEVDEV_EXPORT int
libevdev_uinput_create_from_device(const struct libevdev *dev, int fd, struct libevdev_uinput** uinput_dev)
static int
uinput_create(const struct libevdev *dev, int fd,
struct libevdev_uinput *new_device)
{
int rc;
struct uinput_user_dev uidev;
struct libevdev_uinput *new_device;
int close_fd_on_error = (fd == LIBEVDEV_UINPUT_OPEN_MANAGED);
new_device = alloc_uinput_device(libevdev_get_name(dev));
if (!new_device)
return -ENOMEM;
if (fd == LIBEVDEV_UINPUT_OPEN_MANAGED) {
fd = open("/dev/uinput", O_RDWR|O_CLOEXEC);
if (fd < 0)
goto error;
new_device->fd_is_managed = 1;
} else if (fd < 0) {
log_bug(NULL, "Invalid fd %d\n", fd);
errno = EBADF;
goto error;
}
memset(&uidev, 0, sizeof(uidev));
@ -316,6 +299,39 @@ libevdev_uinput_create_from_device(const struct libevdev *dev, int fd, struct li
goto error;
}
errno = 0;
error:
return -errno;
}
LIBEVDEV_EXPORT int
libevdev_uinput_create_from_device(const struct libevdev *dev, int fd, struct libevdev_uinput** uinput_dev)
{
int rc;
struct libevdev_uinput *new_device;
int close_fd_on_error = (fd == LIBEVDEV_UINPUT_OPEN_MANAGED);
new_device = alloc_uinput_device(libevdev_get_name(dev));
if (!new_device)
return -ENOMEM;
if (fd == LIBEVDEV_UINPUT_OPEN_MANAGED) {
fd = open("/dev/uinput", O_RDWR|O_CLOEXEC);
if (fd < 0)
goto error;
new_device->fd_is_managed = 1;
} else if (fd < 0) {
log_bug(NULL, "Invalid fd %d\n", fd);
errno = EBADF;
goto error;
}
rc = uinput_create(dev, fd, new_device);
if (rc != 0)
goto error;
/* ctime notes time before/after ioctl to help us filter out devices
when traversing /sys/devices/virtual/input to find the device
node.