fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-05-08 05:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

hidpp: clear message queue before initiating new requests (v2)

Browse source 
This prevents the use of responses from other HID++ applications (such
as Solaar and ltunify).

 - v2: do not hang in a loop when read() fails, e.g. when it returns EIO
   because the device was unplugged.

Signed-off-by: Peter Wu <lekensteyn@gmail.com>
This commit is contained in:
Peter Wu 2013-08-06 19:57:09 +02:00 • committed by Martin Pitt
parent 4a211e07c3
commit 132f9373a5
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/linux/hidpp-device.c
View file

@ -29,6 +29,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <errno.h>
#include "hidpp-device.h"
@ -271,6 +272,27 @@ hidpp_device_print_buffer (HidppDevice *device, const HidppMessage *msg)
g_print ("param[0]=%02x\n\n", msg->s.params[0]);
}
static void
hidpp_discard_messages (HidppDevice *device)
{
HidppDevicePrivate *priv = device->priv;
GPollFD poll[] = {
{
.fd = priv->fd,
.events = G_IO_IN | G_IO_OUT | G_IO_ERR,
},
};
char c;
int r;
while (g_poll (poll, G_N_ELEMENTS(poll), 0) > 0) {
/* kernel discards remainder of packet */
r = read (priv->fd, &c, 1);
if (r < 0 && errno != EINTR)
break;
}
}
/**
* hidpp_device_cmd:
**/
@ -302,6 +324,9 @@ hidpp_device_cmd (HidppDevice *device,
msg_len = HIDPP_MSG_LENGTH(request);
/* ignore all unrelated queued messages */
hidpp_discard_messages(device);
/* write to the device */
wrote = write (priv->fd, (const char *)request, msg_len);
if ((gsize) wrote != msg_len) {