linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Tissoires <benjamin.tissoires@gmail.com>
To: "benjamin.tissoires" <benjamin.tissoires@gmail.com>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Henrik Rydberg <rydberg@euromail.se>,
	Jiri Kosina <jkosina@suse.cz>, Stephane Chatty <chatty@enac.fr>,
	linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 06/13] HID: hid-multitouch: get maxcontacts also from logical_max value
Date: Wed,  7 Nov 2012 17:37:29 +0100	[thread overview]
Message-ID: <1352306256-12180-7-git-send-email-benjamin.tissoires@gmail.com> (raw)
In-Reply-To: <1352306256-12180-1-git-send-email-benjamin.tissoires@gmail.com>

Win8 devices are required to present the feature "Maximum Contact Number".
Fortunately all win7 devices I've seen presents this feature.
If the current value is 0, then, the driver can get the actual supported
contact count by refering to the logical_max.
This win8 specification ensures that logical_max may not be above 250.
This also allows us to detect when devices like irtouch or stantum reports
an obviously wrong value of 255.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Acked-by: Henrik Rydberg <rydberg@euromail.se>
---
 drivers/hid/hid-multitouch.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index a6a4e0a..ae57b8f 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -121,6 +121,7 @@ struct mt_device {
 #define MT_CLS_GENERALTOUCH_PWT_TENFINGERS	0x0109
 
 #define MT_DEFAULT_MAXCONTACT	10
+#define MT_MAX_MAXCONTACT	250
 
 #define MT_USB_DEVICE(v, p)	HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH, v, p)
 #define MT_BT_DEVICE(v, p)	HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_MULTITOUCH, v, p)
@@ -283,6 +284,9 @@ static void mt_feature_mapping(struct hid_device *hdev,
 	case HID_DG_CONTACTMAX:
 		td->maxcontact_report_id = field->report->id;
 		td->maxcontacts = field->value[0];
+		if (!td->maxcontacts &&
+		    field->logical_maximum <= MT_MAX_MAXCONTACT)
+			td->maxcontacts = field->logical_maximum;
 		if (td->mtclass.maxcontacts)
 			/* check if the maxcontacts is given by the class */
 			td->maxcontacts = td->mtclass.maxcontacts;
-- 
1.7.11.7


  parent reply	other threads:[~2012-11-07 16:40 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-07 16:37 [PATCH v3 00/13] Win 8 support for digitizers Benjamin Tissoires
2012-11-07 16:37 ` [PATCH v3 01/13] HID: hid-input: export hidinput_calc_abs_res Benjamin Tissoires
2012-11-13  7:45   ` Jiri Kosina
2012-11-07 16:37 ` [PATCH v3 02/13] HID: hid-input: round return value of hidinput_calc_abs_res Benjamin Tissoires
2012-11-13  7:44   ` Jiri Kosina
2012-11-07 16:37 ` [PATCH v3 03/13] HID: core: fix unit exponent parsing Benjamin Tissoires
2012-11-13  7:43   ` Jiri Kosina
2012-11-07 16:37 ` [PATCH v3 04/13] HID: hid-input: add usage_index in struct hid_usage Benjamin Tissoires
2012-11-13  7:44   ` Jiri Kosina
2012-11-13 15:38   ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 05/13] HID: hid-multitouch: support arrays for the split of the touches in a report Benjamin Tissoires
2012-11-13 15:44   ` Henrik Rydberg
2012-11-07 16:37 ` Benjamin Tissoires [this message]
2012-11-07 16:37 ` [PATCH v3 07/13] HID: hid-multitouch: support T and C for win8 devices Benjamin Tissoires
2012-11-13 15:56   ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 08/13] HID: hid-multitouch: move ALWAYS_VALID quirk check Benjamin Tissoires
2012-11-13 15:57   ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 09/13] HID: hid-multitouch: add MT_QUIRK_IGNORE_DUPLICATES Benjamin Tissoires
2012-11-13 16:25   ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 10/13] HID: hid-multitouch: fix Win 8 protocol Benjamin Tissoires
2012-11-13 16:31   ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 11/13] HID: hid-multitouch: support for hovering devices Benjamin Tissoires
2012-11-13 16:42   ` Henrik Rydberg
2012-11-13 17:29     ` Benjamin Tissoires
2012-11-13 18:04       ` Henrik Rydberg
2012-11-13 18:08         ` Benjamin Tissoires
2012-11-13 18:55           ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 12/13] HID: introduce Scan Time Benjamin Tissoires
2012-11-09  8:45   ` Dmitry Torokhov
2012-11-13 14:25     ` Benjamin Tissoires
2012-11-13 17:15       ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 13/13] HID: hid-multitouch: forwards ABS_SCAN_TIME Benjamin Tissoires
2012-11-13 14:30   ` Benjamin Tissoires
2012-11-13 17:27     ` Henrik Rydberg
2012-11-13 17:45       ` Benjamin Tissoires
2012-11-13 18:28         ` Henrik Rydberg
2012-11-13 18:43           ` Henrik Rydberg
2012-11-13  7:47 ` [PATCH v3 00/13] Win 8 support for digitizers Jiri Kosina
2012-11-13  8:12   ` Benjamin Tissoires
2012-11-13 17:33   ` Henrik Rydberg
2012-11-13 17:52     ` Benjamin Tissoires

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1352306256-12180-7-git-send-email-benjamin.tissoires@gmail.com \
    --to=benjamin.tissoires@gmail.com \
    --cc=chatty@enac.fr \
    --cc=dmitry.torokhov@gmail.com \
    --cc=jkosina@suse.cz \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rydberg@euromail.se \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).