From patchwork Thu Oct 25 14:09:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 1644381 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id F12E33FC36 for ; Thu, 25 Oct 2012 14:13:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758273Ab2JYOMg (ORCPT ); Thu, 25 Oct 2012 10:12:36 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:33526 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750980Ab2JYOLM (ORCPT ); Thu, 25 Oct 2012 10:11:12 -0400 Received: by mail-wi0-f178.google.com with SMTP id hr7so1690347wib.1 for ; Thu, 25 Oct 2012 07:11:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; bh=st4kZ904ReB0eAwVIGb+sCcHTQIio5OdGSHHm0xm+dY=; b=tse4pFH7FTqNvN1TvquSmQaIEHKwyU4tgxS8N3HbzKJ9nVS0jUbG+f2lqJxTfT6YzD Fikp8Z+64Zd7UBUBdfHXmDu6fTQP6HeJ+qAQiCsSXeUO1EdiA3ufR8c1gk47UUSxH96R xUCnloGcI9j7EM0K7AI0ZKr3/QoCCfCQTcxt9GpmqyNpbS+LzRNf+hQ3SLWLttLtEdz8 S3MivLtEBCxaPCzfevya9u6LZSSXgr1yXHY9u2ehgW38omODthiducaBzH2fTXS1PG08 I/n0IJFJBk0kvbK1p0MmfUfgxmyu4Qd7jR1staDEN3M19Roc2SMNMAh+pPzDLK2MMO66 PlhQ== Received: by 10.180.88.130 with SMTP id bg2mr10697433wib.22.1351174270799; Thu, 25 Oct 2012 07:11:10 -0700 (PDT) Received: from miniplouf.lan (lan31-8-82-247-176-67.fbx.proxad.net. [82.247.176.67]) by mx.google.com with ESMTPS id bn7sm11429654wib.8.2012.10.25.07.11.09 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 07:11:10 -0700 (PDT) From: Benjamin Tissoires To: "benjamin.tissoires" , Dmitry Torokhov , Henrik Rydberg , Jiri Kosina , Stephane Chatty , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/10] HID: hid-multitouch: fix Win 8 protocol Date: Thu, 25 Oct 2012 16:09:46 +0200 Message-Id: <1351174189-24719-8-git-send-email-benjamin.tissoires@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351174189-24719-1-git-send-email-benjamin.tissoires@gmail.com> References: <1351174189-24719-1-git-send-email-benjamin.tissoires@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Win 8 specification is much more precise than the Win 7 one. Moreover devices that need to take certification must be submitted to Microsoft. The result is a better protocol support and we can rely on that to skip all the messy tests we used to do. The protocol specify the fact that each valid touch must be reported within a frame, and that the release touch coordinate must be the same than the last known touch. So we can use the always_valid quirk and dismiss reports when we touch coordiante do not follow this rule. Signed-off-by: Benjamin Tissoires --- drivers/hid/hid-multitouch.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index c8290e2..6d4ad30 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -510,6 +510,18 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input) int slotnum = mt_compute_slot(td, input); struct mt_slot *s = &td->curdata; + if (td->mtclass.quirks & MT_QUIRK_WIN_8_CERTIFIED && + !s->touch_state) { + struct input_mt_slot *slot = &input->mt->slots[slotnum]; + int prv_x = input_mt_get_value(slot, ABS_MT_POSITION_X); + int prv_y = input_mt_get_value(slot, ABS_MT_POSITION_Y); + /* valid releases occurs when the last x and y positions + * are the same as the last known touch. */ + if (!input_mt_is_active(slot) || + prv_x != s->x || prv_y != s->y) + return; + } + if (slotnum < 0 || slotnum >= td->maxcontacts) return; @@ -681,8 +693,8 @@ static void mt_post_parse_default_settings(struct mt_device *td) { __s32 quirks = td->mtclass.quirks; - /* unknown serial device needs special quirks */ - if (td->touches_by_report == 1) { + /* unknown serial devices or win8 ones need special quirks */ + if (td->touches_by_report == 1 || quirks & MT_QUIRK_WIN_8_CERTIFIED) { quirks |= MT_QUIRK_ALWAYS_VALID; quirks &= ~MT_QUIRK_NOT_SEEN_MEANS_UP; quirks &= ~MT_QUIRK_VALID_IS_INRANGE;