mirror of
https://gitlab.freedesktop.org/libevdev/libevdev.git
synced 2025-12-21 02:40:06 +01:00
Move read_more_events() up in the file
No functional change Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
parent
1c425e9837
commit
8b01184404
1 changed files with 25 additions and 25 deletions
|
|
@ -701,6 +701,31 @@ out:
|
||||||
return rc ? -errno : 0;
|
return rc ? -errno : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
read_more_events(struct libevdev *dev)
|
||||||
|
{
|
||||||
|
int free_elem;
|
||||||
|
int len;
|
||||||
|
struct input_event *next;
|
||||||
|
|
||||||
|
free_elem = queue_num_free_elements(dev);
|
||||||
|
if (free_elem <= 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
next = queue_next_element(dev);
|
||||||
|
len = read(dev->fd, next, free_elem * sizeof(struct input_event));
|
||||||
|
if (len < 0) {
|
||||||
|
return -errno;
|
||||||
|
} else if (len > 0 && len % sizeof(struct input_event) != 0)
|
||||||
|
return -EINVAL;
|
||||||
|
else if (len > 0) {
|
||||||
|
int nev = len/sizeof(struct input_event);
|
||||||
|
queue_set_num_elements(dev, queue_num_elements(dev) + nev);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
sync_state(struct libevdev *dev)
|
sync_state(struct libevdev *dev)
|
||||||
{
|
{
|
||||||
|
|
@ -859,31 +884,6 @@ update_state(struct libevdev *dev, const struct input_event *e)
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
|
||||||
read_more_events(struct libevdev *dev)
|
|
||||||
{
|
|
||||||
int free_elem;
|
|
||||||
int len;
|
|
||||||
struct input_event *next;
|
|
||||||
|
|
||||||
free_elem = queue_num_free_elements(dev);
|
|
||||||
if (free_elem <= 0)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
next = queue_next_element(dev);
|
|
||||||
len = read(dev->fd, next, free_elem * sizeof(struct input_event));
|
|
||||||
if (len < 0) {
|
|
||||||
return -errno;
|
|
||||||
} else if (len > 0 && len % sizeof(struct input_event) != 0)
|
|
||||||
return -EINVAL;
|
|
||||||
else if (len > 0) {
|
|
||||||
int nev = len/sizeof(struct input_event);
|
|
||||||
queue_set_num_elements(dev, queue_num_elements(dev) + nev);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sanitize/modify events where needed.
|
* Sanitize/modify events where needed.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue