From patchwork Thu Oct 25 14:09:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 1644471 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 E51233FC36 for ; Thu, 25 Oct 2012 14:16:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759540Ab2JYOOE (ORCPT ); Thu, 25 Oct 2012 10:14:04 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:63311 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946072Ab2JYOLE (ORCPT ); Thu, 25 Oct 2012 10:11:04 -0400 Received: by mail-wi0-f172.google.com with SMTP id hq12so6028840wib.1 for ; Thu, 25 Oct 2012 07:11:03 -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=vWsi8SZlSPBU3xNHG3+P/H8vhVnnf0NyXKSFNBj7SqE=; b=i75BAMCEIcVxX/8mVOxyG4sAGzjwFyoRPLG74qSCiYRU6PLnuYiZNE1nROwBmDRZkv mUS7Qx4ojVBV1ovT2n7gnxG4pwYFrAxz0Q4TIJsCJiYCG+C6N0EDrs3t+mDemADTHeWF loS1KAF/3ehnfvRCqD+AqYMbfJecHStvryQoTlpmh5mosQQaUb+uNnjhs6NtLzs3qzrh WP/81DFn8nPJSt6AfZXyl59pbPOL5S10e+2jQWHH5/1JKoZ+kUdMsSWt5dajM6X2NnbR 2/DzYWooKS3x4Olhq9Z9ItfpHRuPav2H3Cbd48JxGrCmynrVgsENiRG3AapJMCLfExRD xXng== Received: by 10.180.97.35 with SMTP id dx3mr14159169wib.14.1351174263524; Thu, 25 Oct 2012 07:11:03 -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.01 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 07:11:02 -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 03/10] HID: hid-multitouch: support arrays for the split of the touches in a report Date: Thu, 25 Oct 2012 16:09:42 +0200 Message-Id: <1351174189-24719-4-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 Win8 certification introduced the ability to transmit two X and two Y per touch. The specification precises that it must be in an array, with a report count == 2. 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 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 1382554..e96ecc3 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -577,12 +577,16 @@ 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_index + 1 == field->report_count) { + /* we only take into account the last report + * of a field if report_count > 1 */ + 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); + } }