From patchwork Wed Nov 7 16:37:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 1711701 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 6A1CDDFB7A for ; Wed, 7 Nov 2012 16:41:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753455Ab2KGQkw (ORCPT ); Wed, 7 Nov 2012 11:40:52 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:56378 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753079Ab2KGQiB (ORCPT ); Wed, 7 Nov 2012 11:38:01 -0500 Received: by mail-ee0-f46.google.com with SMTP id b15so1021344eek.19 for ; Wed, 07 Nov 2012 08:38:00 -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=P50v/QZfcKCTKNhTwHLXU59THZaUzLlyyJiB8K0gv6g=; b=1JxIpwYwqiI1xBqd82h1EUzFdaY99IrrdwY8AsZqNnJoQbysAnFxRKlfFnqP3xm/yg lLdF47FwAfJZHyGUw13iLZzn/Yh3xi7Ch1BXJP2F4zuIuLXe5q9Cw9i1i0uVsOXd0BGn 8vyE1pZHqFNObwg1JTSbwKL9zX65de+oqFuwrUY9Qi0qCehNKe2nOOq+oOEqopfiKdZs fU1tU6t7HaAFbTNpipIhC5W7bhHPsr+SwAVXz1nFwloZtQUzxOW0jTjKLLbphbtt6eCu UxVJDqYpKWrKG+P/kIJEvC104PpsvcV7ucG2mdEew+KtDwqUlq3hB8Q/YwKcsFmRk2ey 2S+g== Received: by 10.14.175.71 with SMTP id y47mr17190623eel.36.1352306280611; Wed, 07 Nov 2012 08:38:00 -0800 (PST) Received: from miniplouf.banquise.com (lan31-8-82-247-176-67.fbx.proxad.net. [82.247.176.67]) by mx.google.com with ESMTPS id a44sm64766844eeo.7.2012.11.07.08.37.59 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 08:37:59 -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 v3 05/13] HID: hid-multitouch: support arrays for the split of the touches in a report Date: Wed, 7 Nov 2012 17:37:28 +0100 Message-Id: <1352306256-12180-6-git-send-email-benjamin.tissoires@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1352306256-12180-1-git-send-email-benjamin.tissoires@gmail.com> References: <1352306256-12180-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 --- 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); + } }