drath/libratbag
1
0
Fork 1
mirror of https://github.com/libratbag/libratbag.git synced 2026-11-07 23:23:52 +01:00
Code Issues Projects Releases Wiki Activity

hidraw: break ratbag_open_hidraw in two

Browse Source 
We want to be able to find sibling hidraw nodes. For that, we need to
open and test several different hidraw nodes. Makes the opening of a
specific hidraw node in its own function.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Benjamin Tissoires
2015-10-07 16:48:05 -04:00
parent abde78e6c4
commit ce37417525
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libratbag-hidraw.c
View File

@@ -133,20 +133,15 @@ out:
return hidraw_udev;
}
int
ratbag_open_hidraw(struct ratbag_device *device)
static int
ratbag_open_hidraw_node(struct ratbag_device *device, struct udev_device *hidraw_udev)
{
struct hidraw_devinfo info;
struct udev_device *hidraw_udev;
int fd, res;
const char *devnode;
device->hidraw.fd = -1;
hidraw_udev = udev_find_hidraw(device);
if (!hidraw_udev)
return -ENODEV;
devnode = udev_device_get_devnode(hidraw_udev);
fd = ratbag_open_path(device, devnode, O_RDWR);
if (fd < 0)
@@ -192,16 +187,31 @@ ratbag_open_hidraw(struct ratbag_device *device)
ratbag_hidraw_parse_report_descriptor(device);
}
udev_device_unref(hidraw_udev);
return 0;
err:
udev_device_unref(hidraw_udev);
if (fd >= 0)
ratbag_close_fd(device, fd);
return -errno;
}
int
ratbag_open_hidraw(struct ratbag_device *device)
{
struct udev_device *hidraw_udev;
int rc;
hidraw_udev = udev_find_hidraw(device);
if (!hidraw_udev)
return -ENODEV;
rc = ratbag_open_hidraw_node(device, hidraw_udev);
udev_device_unref(hidraw_udev);
return rc;
}
int
ratbag_hidraw_has_report(struct ratbag_device *device, uint8_t report_id)
{