[PATCH mouse] bsd: Don't try to use SIGIO for input ABI >= 23

Adam Jackson ajax at redhat.com
Tue Jun 7 20:42:28 UTC 2016


On Tue, 2016-06-07 at 13:09 -0700, Keith Packard wrote:
> Adam Jackson <ajax at redhat.com> writes:
> 
> > Signed-off-by: Adam Jackson <ajax at redhat.com>
> > ---
> >  src/bsd_mouse.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/src/bsd_mouse.c b/src/bsd_mouse.c
> > index a2c8ec7..dc628d4 100644
> > --- a/src/bsd_mouse.c
> > +++ b/src/bsd_mouse.c
> > @@ -546,8 +546,10 @@ usbMouseProc(DeviceIntPtr pPointer, int what)
> >                  pInfo->fd = -1;
> >              } else {
> >                  xf86FlushInput(pInfo->fd);
> > +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 23
> >                  if (!xf86InstallSIGIOHandler (pInfo->fd, usbSigioReadInput,
> >                                                pInfo))
> > +#endif
> >                      AddEnabledDevice(pInfo->fd);
> 
> I looked at this code and walked away -- why isn't this just using
> xf86AddEnabledDevice?

No idea, which is a bit distressing. That code seems to have come in
between 6.7 and 7.0, and I can't find a git copy of that cvs history
anywhere (and the cvs services are long since shut down). Thankfully I
think I've found the old cvsroot on kemper, I'll get that imported.

That certainly would be a less icky solution though, will send an update.

- ajax


More information about the xorg-devel mailing list