On Mon, Dec 20, 2010 at 08:07:15PM -0800, Ping Cheng wrote: > Process devices that do not report device_id through ABS_MISC from > the kernel as WCM_PROTOCOL_GENERIC in wcmUSB.c. > > Signed-off-by: Ping Cheng <[email protected]> > Acked-by: Chris Bagwell <[email protected]> > > Chris, I remember that you acked this patch. But I can not find > the original one somehow (most likely I have deleted it since I > thought it has been merged). > --- > src/wcmUSB.c | 14 +++----------- > 1 files changed, 3 insertions(+), 11 deletions(-) > > diff --git a/src/wcmUSB.c b/src/wcmUSB.c > index f2cc9a5..b34e743 100644 > --- a/src/wcmUSB.c > +++ b/src/wcmUSB.c > @@ -513,17 +513,9 @@ int usbWcmGetRanges(InputInfoPtr pInfo) > common->wcmMaxDist = absinfo.maximum; > > > - if ((common->tablet_id >= 0xd0) && (common->tablet_id <= 0xd3)) > - { > - /* BTN_TOOL_DOUBLETAP means this is a touchpad and > - * !BTN_TOOL_TRIPLETAP detects this is MT-version > - * of touchpad; which uses generic protocol. > - */ > - if (ISBITSET(common->wcmKeys, BTN_TOOL_DOUBLETAP) && > - !ISBITSET(common->wcmKeys, BTN_TOOL_TRIPLETAP)) > - common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC; > - } > - > + /* A generic protocol device does not report ABS_MISC event */ > + if (!ISBITSET (abs, ABS_MISC)) > + common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC; > > return Success; > } > -- > 1.7.3.3 >
merged with a whitespace fix, thanks. Cheers, Peter ------------------------------------------------------------------------------ Lotusphere 2011 Register now for Lotusphere 2011 and learn how to connect the dots, take your collaborative environment to the next level, and enter the era of Social Business. http://p.sf.net/sfu/lotusphere-d2d _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
