[PATCH xserver] xfree86: Remove event reading code from xf86Wakeup
Peter Hutterer
peter.hutterer at who-t.net
Mon May 30 01:40:42 UTC 2016
On Fri, May 27, 2016 at 05:51:48PM -0700, Keith Packard wrote:
> Oops. This didn't get removed when xfree86 was converted over to use
> the input thread.
>
> Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Cheers,
Peter
> ---
> hw/xfree86/common/xf86Events.c | 28 ----------------------------
> 1 file changed, 28 deletions(-)
>
> diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
> index 7191980..5db0dfb 100644
> --- a/hw/xfree86/common/xf86Events.c
> +++ b/hw/xfree86/common/xf86Events.c
> @@ -247,34 +247,6 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
> void
> xf86Wakeup(void *blockData, int err, void *pReadmask)
> {
> - fd_set *LastSelectMask = (fd_set *) pReadmask;
> - fd_set devicesWithInput;
> - InputInfoPtr pInfo;
> -
> - if (err >= 0) {
> -
> - XFD_ANDSET(&devicesWithInput, LastSelectMask, &EnabledDevices);
> - if (XFD_ANYSET(&devicesWithInput)) {
> - pInfo = xf86InputDevs;
> - while (pInfo) {
> - if (pInfo->read_input && pInfo->fd >= 0 &&
> - (FD_ISSET(pInfo->fd, &devicesWithInput) != 0)) {
> - input_lock();
> -
> - /*
> - * Remove the descriptior from the set because more than one
> - * device may share the same file descriptor.
> - */
> - FD_CLR(pInfo->fd, &devicesWithInput);
> -
> - pInfo->read_input(pInfo);
> - input_unlock();
> - }
> - pInfo = pInfo->next;
> - }
> - }
> - }
> -
> if (err >= 0) { /* we don't want the handlers called if select() */
> IHPtr ih, ih_tmp; /* returned with an error condition, do we? */
>
> --
> 2.8.1
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
>
More information about the xorg-devel
mailing list