From patchwork Wed Nov 14 15:59:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 1742291 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 08B46DF264 for ; Wed, 14 Nov 2012 16:02:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422912Ab2KNP7t (ORCPT ); Wed, 14 Nov 2012 10:59:49 -0500 Received: from mail-wi0-f170.google.com ([209.85.212.170]:63070 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422874Ab2KNP7s (ORCPT ); Wed, 14 Nov 2012 10:59:48 -0500 Received: by mail-wi0-f170.google.com with SMTP id cb5so536880wib.1 for ; Wed, 14 Nov 2012 07:59:46 -0800 (PST) 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=IcncJYU4FyviK36yoR2XbwnaVX55ggztdkEcN8gW2Qw=; b=M23ZYR57N/xPL6SZ1ZxRUav9fX+d4tW3NY8KdJSPTFuLN/KRO3/7OhF92Sliu3ZPfV QinZVHz89/nPfX81VZfhuKMc3xQD1nvkIstG0GRA1Qcf5t+PmvBsSPNZ6gJPA/UhdVUw aBTUW8YCYHuXIxehsb2BvtiFUzXI2IDsAOWi/CYex/Yy00+kTxP0El+YnkfkZAMuIu2N by4bdqp2Twtps6MgjHlgmo6Ref5XyxOorKD+ycnKHF9ZjH19J9RwUU4ZgVQfsBxGa9vG mYHnLJ3hdmxmB2gd+nurjXw9xJYRfmawROaqT/lflZu+pnUoG+hgIbFgmJ1QHDyFgHMG BPAw== Received: by 10.181.11.197 with SMTP id ek5mr26804918wid.4.1352908786702; Wed, 14 Nov 2012 07:59:46 -0800 (PST) Received: from localhost.localdomain.com (lan31-8-82-247-176-67.fbx.proxad.net. [82.247.176.67]) by mx.google.com with ESMTPS id r10sm3050116wiz.0.2012.11.14.07.59.45 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Nov 2012 07:59:45 -0800 (PST) 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 v4 05/14] HID: hid-multitouch: support arrays for the split of the touches in a report Date: Wed, 14 Nov 2012 16:59:17 +0100 Message-Id: <1352908766-4492-6-git-send-email-benjamin.tissoires@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1352908766-4492-1-git-send-email-benjamin.tissoires@gmail.com> References: <1352908766-4492-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 Win8 certification introduced the ability to transmit two X and two Y per touch. The specification precises that it must be used in an array. This test guarantees that we split the touches on the last element in this array. Signed-off-by: Benjamin Tissoires Reviewed-by: Henrik Rydberg --- drivers/hid/hid-multitouch.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 9f64e36..a6a4e0a 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -577,12 +577,15 @@ static int mt_event(struct hid_device *hid, struct hid_field *field, return 0; } - if (usage->hid == td->last_slot_field) - mt_complete_slot(td, field->hidinput->input); - - if (field->index == td->last_field_index - && td->num_received >= td->num_expected) - mt_sync_frame(td, field->hidinput->input); + if (usage->usage_index + 1 == field->report_count) { + /* we only take into account the last report. */ + if (usage->hid == td->last_slot_field) + mt_complete_slot(td, field->hidinput->input); + + if (field->index == td->last_field_index + && td->num_received >= td->num_expected) + mt_sync_frame(td, field->hidinput->input); + } }