mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evdev: rename device_removed() to evdev_input_device_destroy()

Browse Source 
evdev_input_device_destroy() will completement the API of
evdev_input_device_create(), both being independent from udev.

Since the udev-specific device_removed() would only call
evdev_input_device_destroy() and do nothing else, device_remove() calls
are simply replaced with evdev_input_device_destroy().

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen
2012-08-03 14:38:57 +03:00
committed by Kristian Høgsberg
parent c4f3338745
commit a123e5c46a
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/evdev.c
+21 -21
View File
@@ -354,7 +354,7 @@ evdev_input_device_data(int fd, uint32_t mask, void *data)
len = read(fd, &ev, sizeof ev); len = read(fd, &ev, sizeof ev);
if (len < 0 || len % sizeof ev[0] != 0) { if (len < 0 || len % sizeof ev[0] != 0) {
/* FIXME: call device_removed when errno is ENODEV. */ /* FIXME: call evdev_input_device_destroy when errno is ENODEV. */
return 1; return 1;
} }
@@ -529,6 +529,24 @@ err0:
return NULL; return NULL;
} }
static void
evdev_input_device_destroy(struct evdev_input_device *device)
{
struct evdev_dispatch *dispatch;
dispatch = device->dispatch;
if (dispatch)
dispatch->interface->destroy(dispatch);
wl_event_source_remove(device->source);
wl_list_remove(&device->link);
if (device->mtdev)
mtdev_close_delete(device->mtdev);
close(device->fd);
free(device->devnode);
free(device);
}
static const char default_seat[] = "seat0"; static const char default_seat[] = "seat0";
static void static void
@@ -550,24 +568,6 @@ device_added(struct udev_device *udev_device, struct evdev_seat *master)
evdev_input_device_create(master, c->wl_display, devnode); evdev_input_device_create(master, c->wl_display, devnode);
} }
static void
device_removed(struct evdev_input_device *device)
{
struct evdev_dispatch *dispatch;
dispatch = device->dispatch;
if (dispatch)
dispatch->interface->destroy(dispatch);
wl_event_source_remove(device->source);
wl_list_remove(&device->link);
if (device->mtdev)
mtdev_close_delete(device->mtdev);
close(device->fd);
free(device->devnode);
free(device);
}
static void static void
evdev_notify_keyboard_focus(struct evdev_seat *seat) evdev_notify_keyboard_focus(struct evdev_seat *seat)
{ {
@@ -674,7 +674,7 @@ evdev_udev_handler(int fd, uint32_t mask, void *data)
wl_list_for_each_safe(device, next, wl_list_for_each_safe(device, next,
&master->devices_list, link) &master->devices_list, link)
if (!strcmp(device->devnode, devnode)) { if (!strcmp(device->devnode, devnode)) {
device_removed(device); evdev_input_device_destroy(device);
break; break;
} }
} }
@@ -768,7 +768,7 @@ evdev_remove_devices(struct weston_seat *seat_base)
struct evdev_input_device *device, *next; struct evdev_input_device *device, *next;
wl_list_for_each_safe(device, next, &seat->devices_list, link) wl_list_for_each_safe(device, next, &seat->devices_list, link)
device_removed(device); evdev_input_device_destroy(device);
notify_keyboard_focus_out(&seat->base.seat); notify_keyboard_focus_out(&seat->base.seat);
} }