Better error reporting if the read fails.

Work properly if we're defining entirely by capability maps.
master
Zephaniah E. Hull 20 years ago
parent 47482dad76
commit 94cb4aa1f8
  1. 8
      ChangeLog
  2. 7
      src/evdev.c
  3. 3
      src/evdev_brain.c

@ -1,3 +1,11 @@
2006-02-27 Zephaniah E. Hull,,, <warp@aehallh.com>
* src/evdev.c: (EvdevReadInput):
Better error reporting if the read fails.
* src/evdev_brain.c: (evdevNewDriver):
Work properly if we're defining entirely by capability maps.
2006-02-24 Zephaniah E. Hull <warp@aehallh.com>
* src/Makefile.am:

@ -89,11 +89,12 @@ EvdevReadInput(InputInfoPtr pInfo)
int len, value;
while (xf86WaitForInput (pInfo->fd, 0) > 0) {
len = read(pInfo->fd, &ev, sizeof ev);
if (len != sizeof ev) {
len = read(pInfo->fd, &ev, sizeof(ev));
if (len != sizeof(ev)) {
/* The kernel promises that we always only read a complete
* event, so len != sizeof ev is an error. */
xf86Msg(X_ERROR, "Read error: %s\n", strerror(errno));
xf86Msg(X_ERROR, "Read error: %s (%d, %d != %ld)\n",
strerror(errno), errno, len, sizeof (ev));
break;
}

@ -427,8 +427,11 @@ evdevNewDriver (evdevDriverPtr driver)
{
if (!evdev_alive)
return FALSE;
/* FIXME: Make this check valid given all the ways to look. */
#if 0
if (!(driver->name || driver->phys || driver->device))
return FALSE;
#endif
if (!driver->callback)
return FALSE;

Loading…
Cancel
Save