fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-02-05 00:30:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

udev: factor out device_removed handling

Browse source 
No functional changes

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
This commit is contained in:
Peter Hutterer 2014-03-13 14:24:48 +10:00
parent 73ce45ad49
commit f6ba613e9e
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/udev-seat.c
View file

@ -116,6 +116,27 @@ device_added(struct udev_device *udev_device, struct udev_input *input)
return 0;
}
static void
device_removed(struct udev_device *udev_device, struct udev_input *input)
{
const char *devnode;
struct evdev_device *device, *next;
struct udev_seat *seat;
devnode = udev_device_get_devnode(udev_device);
list_for_each(seat, &input->base.seat_list, base.link) {
list_for_each_safe(device, next,
&seat->base.devices_list, base.link) {
if (!strcmp(device->devnode, devnode)) {
log_info("input device %s, %s removed\n",
device->devname, device->devnode);
evdev_device_remove(device);
break;
}
}
}
}
static int
udev_input_add_devices(struct udev_input *input, struct udev *udev)
{
@ -155,10 +176,7 @@ evdev_udev_handler(void *data)
{
struct udev_input *input = data;
struct udev_device *udev_device;
struct evdev_device *device, *next;
const char *action;
const char *devnode;
struct udev_seat *seat;
udev_device = udev_monitor_receive_device(input->udev_monitor);
if (!udev_device)
@ -171,22 +189,10 @@ evdev_udev_handler(void *data)
if (strncmp("event", udev_device_get_sysname(udev_device), 5) != 0)
goto out;
if (!strcmp(action, "add")) {
if (!strcmp(action, "add"))
device_added(udev_device, input);
}
else if (!strcmp(action, "remove")) {
devnode = udev_device_get_devnode(udev_device);
list_for_each(seat, &input->base.seat_list, base.link) {
list_for_each_safe(device, next,
&seat->base.devices_list, base.link)
if (!strcmp(device->devnode, devnode)) {
log_info("input device %s, %s removed\n",
device->devname, device->devnode);
evdev_device_remove(device);
break;
}
}
}
else if (!strcmp(action, "remove"))
device_removed(udev_device, input);
out:
udev_device_unref(udev_device);