On 11/19/2010 01:38 AM, Peter Hutterer wrote: > On Fri, Nov 12, 2010 at 05:35:13PM -0500, Chase Douglas wrote: >> From: Chase Douglas <[email protected]>
[...] >> diff --git a/src/Makefile.am b/src/Makefile.am >> index a5c89ac..89137bc 100644 >> --- a/src/Makefile.am >> +++ b/src/Makefile.am >> @@ -29,7 +29,7 @@ AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) >> AM_CPPFLAGS =-I$(top_srcdir)/include >> >> @driver_n...@_drv_la_ltlibraries = @driver_n...@_drv.la >> -...@driver_name@_drv_la_LDFLAGS = -module -avoid-version >> +...@driver_name@_drv_la_LDFLAGS = -module -avoid-version $(MTDEV_LIBS) >> @driver_n...@_drv_ladir = @inputdir@ > > I think we should use LDADD for this? I'll look into it. >> @driver_n...@_drv_la_sources = @[email protected] \ >> diff --git a/src/evdev.c b/src/evdev.c >> index 8b13e9f..a83d4e4 100644 >> --- a/src/evdev.c >> +++ b/src/evdev.c [...] >> @@ -2503,6 +2529,16 @@ EvdevOpenDevice(InputInfoPtr pInfo) >> } >> } >> >> +#ifdef MULTITOUCH >> + if (mtdev_open(pEvdev->mtdev, pInfo->fd) == 0) >> + pEvdev->cur_slot = pEvdev->mtdev->caps.slot.value; >> + else { >> + free(pEvdev->mtdev); >> + pEvdev->mtdev = NULL; >> + xf86Msg(X_INFO, "%s: Couldn't open mtdev device\n", pInfo->name); > > return FALSE here? Originally, mtdev_open would fail if the device was not MT. In such a scenario, you wouldn't want to bail out. However, now mtdev behaves as a passthrough for non-MT devices, so returning FALSE here wouldn't be a bad idea. Thanks, -- Chase _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
