svn commit: r358824 - head/sys/dev/usb/input

Vladimir Kondratyev wulf at FreeBSD.org
Mon Mar 9 21:01:23 UTC 2020


Author: wulf
Date: Mon Mar  9 21:01:22 2020
New Revision: 358824
URL: https://svnweb.freebsd.org/changeset/base/358824

Log:
  wmt(4): Fix Synaptics Touch Digitizer V04 attachment
  
  Touch Digitizer V04 report descriptor declares 'Contact Count Maximum' usage
  as constant. That was not supported by descriptor parser.
  
  PR:		232040
  Reported by:	Sergei Akhmatdinov <sakhmatd at darkn.space>
  MFC after:	1 week

Modified:
  head/sys/dev/usb/input/wmt.c

Modified: head/sys/dev/usb/input/wmt.c
==============================================================================
--- head/sys/dev/usb/input/wmt.c	Mon Mar  9 20:49:59 2020	(r358823)
+++ head/sys/dev/usb/input/wmt.c	Mon Mar  9 21:01:22 2020	(r358824)
@@ -655,9 +655,8 @@ wmt_hid_parse(struct wmt_softc *sc, const void *d_ptr,
 				thqa_cert_rid = hi.report_ID;
 				break;
 			}
-			if (hi.collevel == 1 && touch_coll &&
-			    WMT_HI_ABSOLUTE(hi) && hi.usage ==
-			      HID_USAGE2(HUP_DIGITIZERS, HUD_CONTACT_MAX)) {
+			if (hi.collevel == 1 && touch_coll && hi.usage ==
+			    HID_USAGE2(HUP_DIGITIZERS, HUD_CONTACT_MAX)) {
 				cont_count_max = hi.logical_maximum;
 				cont_max_rid = hi.report_ID;
 				if (sc != NULL)


More information about the svn-src-head mailing list