From 59056e656c6475816ab45b2798bd4d4466482f6a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 13 Oct 2009 14:51:49 +1000 Subject: Remove the reopen timer logic. This logic was needed in older kernels that sometimes gave error messages after coming back from resume (2.6.27 release kernels). I haven't seen any log files that needed this reopen timer in a long time, suggesting that need for it is gone. Signed-off-by: Peter Hutterer --- include/evdev-properties.h | 2 +- man/evdev.man | 4 -- src/evdev.c | 137 ++++++++------------------------------------- 3 files changed, 24 insertions(+), 119 deletions(-) diff --git a/include/evdev-properties.h b/include/evdev-properties.h index 3e3c194..7df2876 100644 --- a/include/evdev-properties.h +++ b/include/evdev-properties.h @@ -56,7 +56,7 @@ /* Reopen attempts. */ /* CARD8 */ -#define EVDEV_PROP_REOPEN "Evdev Reopen Attempts" +#define EVDEV_PROP_REOPEN "Evdev Reopen Attempts" /* OBSOLETE */ /* Run-time calibration */ /* CARD32, 4 values [minx, maxx, miny, maxy], or no values for unset */ diff --git a/man/evdev.man b/man/evdev.man index 9dd7a77..4771167 100644 --- a/man/evdev.man +++ b/man/evdev.man @@ -151,10 +151,6 @@ axes regardless of the presence of other axes. This may trigger buggy behavior and events from this axis are always forwarded. Users are discouraged from setting this option. .TP 7 -.BI "Option \*qReopenAttempts\*q \*q" integer \*q -Number of reopen attempts after a read error occurs on the device (e.g. after -waking up from suspend). In between each attempt is a 100ms wait. Default: 10. -.TP 7 .BI "Option \*qCalibration\*q \*q" "min-x max-x min-y max-y" \*q Calibrates the X and Y axes for devices that need to scale to a different coordinate system than reported to the X server. This feature is required diff --git a/src/evdev.c b/src/evdev.c index 0dff271..cc44d51 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -125,7 +125,6 @@ static void EvdevInitProperty(DeviceIntPtr dev); static int EvdevSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, BOOL checkonly); static Atom prop_invert = 0; -static Atom prop_reopen = 0; static Atom prop_calibration = 0; static Atom prop_swap = 0; static Atom prop_axis_label = 0; @@ -340,56 +339,6 @@ EvdevQueueButtonClicks(InputInfoPtr pInfo, int button, int count) } } -/** - * Coming back from resume may leave us with a file descriptor that can be - * opened but fails on the first read (ENODEV). - * In this case, try to open the device until it becomes available or until - * the predefined count expires. - */ -static CARD32 -EvdevReopenTimer(OsTimerPtr timer, CARD32 time, pointer arg) -{ - InputInfoPtr pInfo = (InputInfoPtr)arg; - EvdevPtr pEvdev = pInfo->private; - - do { - pInfo->fd = open(pEvdev->device, O_RDWR | O_NONBLOCK, 0); - } while (pInfo->fd < 0 && errno == EINTR); - - if (pInfo->fd != -1) - { - if (EvdevCacheCompare(pInfo, TRUE) == Success) - { - xf86Msg(X_INFO, "%s: Device reopened after %d attempts.\n", pInfo->name, - pEvdev->reopen_attempts - pEvdev->reopen_left + 1); - EvdevOn(pInfo->dev); - } else - { - xf86Msg(X_ERROR, "%s: Device has changed - disabling.\n", - pInfo->name); - xf86DisableDevice(pInfo->dev, FALSE); - close(pInfo->fd); - pInfo->fd = -1; - pEvdev->min_maj = 0; /* don't hog the device */ - } - pEvdev->reopen_left = 0; - return 0; - } - - pEvdev->reopen_left--; - - if (!pEvdev->reopen_left) - { - xf86Msg(X_ERROR, "%s: Failed to reopen device after %d attempts.\n", - pInfo->name, pEvdev->reopen_attempts); - xf86DisableDevice(pInfo->dev, FALSE); - pEvdev->min_maj = 0; /* don't hog the device */ - return 0; - } - - return 100; /* come back in 100 ms */ -} - #define ABS_X_VALUE 0x1 #define ABS_Y_VALUE 0x2 #define ABS_VALUE 0x4 @@ -761,7 +710,6 @@ EvdevReadInput(InputInfoPtr pInfo) { struct input_event ev[NUM_EVENTS]; int i, len = sizeof(ev); - EvdevPtr pEvdev = pInfo->private; while (len == sizeof(ev)) { @@ -774,11 +722,6 @@ EvdevReadInput(InputInfoPtr pInfo) xf86RemoveEnabledDevice(pInfo); close(pInfo->fd); pInfo->fd = -1; - if (pEvdev->reopen_timer) - { - pEvdev->reopen_left = pEvdev->reopen_attempts; - pEvdev->reopen_timer = TimerSet(pEvdev->reopen_timer, 0, 100, EvdevReopenTimer, pInfo); - } } else if (errno != EAGAIN) { /* We use X_NONE here because it doesn't alloc */ @@ -1551,9 +1494,6 @@ EvdevInit(DeviceIntPtr device) /** * Init all extras (wheel emulation, etc.) and grab the device. - * - * Coming from a resume, the grab may fail with ENODEV. In this case, we set a - * timer to wake up and try to reopen the device later. */ static int EvdevOn(DeviceIntPtr device) @@ -1565,43 +1505,37 @@ EvdevOn(DeviceIntPtr device) pInfo = device->public.devicePrivate; pEvdev = pInfo->private; - if (pInfo->fd != -1 && pEvdev->grabDevice && - (rc = ioctl(pInfo->fd, EVIOCGRAB, (void *)1))) + if (pInfo->fd == -1) /* after PreInit fd is still open */ { - xf86Msg(X_WARNING, "%s: Grab failed (%s)\n", pInfo->name, - strerror(errno)); + do { + pInfo->fd = open(pEvdev->device, O_RDWR | O_NONBLOCK, 0); + } while (pInfo->fd < 0 && errno == EINTR); - /* ENODEV - device has disappeared after resume */ - if (rc && errno == ENODEV) - { - close(pInfo->fd); - pInfo->fd = -1; - } - } - - if (pInfo->fd == -1) - { - pEvdev->reopen_left = pEvdev->reopen_attempts; - pEvdev->reopen_timer = TimerSet(pEvdev->reopen_timer, 0, 100, EvdevReopenTimer, pInfo); - } else - { - pEvdev->min_maj = EvdevGetMajorMinor(pInfo); - if (EvdevIsDuplicate(pInfo)) - { - xf86Msg(X_WARNING, "%s: Refusing to enable duplicate device.\n", - pInfo->name); + if (pInfo->fd < 0) { + xf86Msg(X_ERROR, "Unable to open evdev device \"%s\".\n", + pEvdev->device); return !Success; } + } - pEvdev->reopen_timer = TimerSet(pEvdev->reopen_timer, 0, 0, NULL, NULL); + if (pEvdev->grabDevice && (rc = ioctl(pInfo->fd, EVIOCGRAB, (void *)1))) + xf86Msg(X_WARNING, "%s: Grab failed (%s)\n", pInfo->name, + strerror(errno)); - xf86FlushInput(pInfo->fd); - xf86AddEnabledDevice(pInfo); - EvdevMBEmuOn(pInfo); - pEvdev->flags |= EVDEV_INITIALIZED; - device->public.on = TRUE; + pEvdev->min_maj = EvdevGetMajorMinor(pInfo); + if (EvdevIsDuplicate(pInfo)) + { + xf86Msg(X_WARNING, "%s: Refusing to enable duplicate device.\n", + pInfo->name); + return !Success; } + xf86FlushInput(pInfo->fd); + xf86AddEnabledDevice(pInfo); + EvdevMBEmuOn(pInfo); + pEvdev->flags |= EVDEV_INITIALIZED; + device->public.on = TRUE; + return Success; } @@ -1638,11 +1572,6 @@ EvdevProc(DeviceIntPtr device, int what) pEvdev->min_maj = 0; pEvdev->flags &= ~EVDEV_INITIALIZED; device->public.on = FALSE; - if (pEvdev->reopen_timer) - { - TimerFree(pEvdev->reopen_timer); - pEvdev->reopen_timer = NULL; - } break; case DEVICE_CLOSE: @@ -2076,7 +2005,6 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags) return NULL; } - pEvdev->reopen_attempts = xf86SetIntOption(pInfo->options, "ReopenAttempts", 10); pEvdev->invert_x = xf86SetBoolOption(pInfo->options, "InvertX", FALSE); pEvdev->invert_y = xf86SetBoolOption(pInfo->options, "InvertY", FALSE); pEvdev->swap_axes = xf86SetBoolOption(pInfo->options, "SwapAxes", FALSE); @@ -2464,18 +2392,6 @@ EvdevInitProperty(DeviceIntPtr dev) EvdevPtr pEvdev = pInfo->private; int rc; BOOL invert[2]; - char reopen; - - prop_reopen = MakeAtom(EVDEV_PROP_REOPEN, strlen(EVDEV_PROP_REOPEN), - TRUE); - - reopen = pEvdev->reopen_attempts; - rc = XIChangeDeviceProperty(dev, prop_reopen, XA_INTEGER, 8, - PropModeReplace, 1, &reopen, FALSE); - if (rc != Success) - return; - - XISetDevicePropertyDeletable(dev, prop_reopen, FALSE); if (pEvdev->flags & (EVDEV_RELATIVE_EVENTS | EVDEV_ABSOLUTE_EVENTS)) { @@ -2554,13 +2470,6 @@ EvdevSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, pEvdev->invert_x = data[0]; pEvdev->invert_y = data[1]; } - } else if (atom == prop_reopen) - { - if (val->format != 8 || val->size != 1 || val->type != XA_INTEGER) - return BadMatch; - - if (!checkonly) - pEvdev->reopen_attempts = *((CARD8*)val->data); } else if (atom == prop_calibration) { if (val->format != 32 || val->type != XA_INTEGER) -- cgit v1.2.3