DrathOrg/libratbag-plus
1
0
Fork 0
forked from drath/libratbag
Code Pull Requests Activity

Store the input_id in ratbag directly

Browse Source 
This should be cleaned up eventually when we will be actually using
libevdev.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Benjamin Tissoires
2015-08-14 22:16:17 -04:00
parent f626958758
commit c6cf35a5fc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libratbag-private.h
View File

@@ -45,6 +45,7 @@ struct ratbag {
struct udev_device *udev_hidraw;
int evdev_fd;
int refcount;
struct input_id ids;
struct ratbag_driver *driver;
struct libratbag *libratbag;
};

5
src/libratbag.c
View File

@@ -240,7 +240,6 @@ LIBRATBAG_EXPORT struct ratbag*
ratbag_new_from_fd(struct libratbag *libratbag, int fd)
{
int rc;
struct input_id ids;
struct ratbag *ratbag = NULL;
struct ratbag_driver *driver;
char buf[256];
@@ -256,7 +255,7 @@ ratbag_new_from_fd(struct libratbag *libratbag, int fd)
ratbag->libratbag = libratbag_ref(libratbag);
rc = ioctl(fd, EVIOCGID, &ids);
rc = ioctl(fd, EVIOCGID, &ratbag->ids);
if (rc < 0)
goto out_err;
@@ -277,7 +276,7 @@ ratbag_new_from_fd(struct libratbag *libratbag, int fd)
if (rc)
goto out_err;
driver = ratbag_find_driver(libratbag, ratbag, &ids);
driver = ratbag_find_driver(libratbag, ratbag, &ratbag->ids);
if (!driver) {
errno = ENOTSUP;
goto err_udev;