From patchwork Thu Oct 25 14:09:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 1644411 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 7368F3FC36 for ; Thu, 25 Oct 2012 14:13:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750821Ab2JYONl (ORCPT ); Thu, 25 Oct 2012 10:13:41 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:60191 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754816Ab2JYOLI (ORCPT ); Thu, 25 Oct 2012 10:11:08 -0400 Received: by mail-wg0-f42.google.com with SMTP id fm10so3583495wgb.1 for ; Thu, 25 Oct 2012 07:11:07 -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=kAIjvavRlbSC6fU06HkKmv6W5GIboZAlGF97cgW7ASQ=; b=xhU1e+NmFyv6xG5/iRnrQCnBwOA+cEg4/f/LZe9YUrS6sy1xYvWSlv/FF7Fm5V9zvW /hE7unnqFWhC1Szwx7GC+g0gPoO8q7wGlnG0TandOy2PNVm1h15QVnRjJ0ABmaDJnXA5 AoRWyIclokmo5RF3Oda2Hf92QXLjrHAauUV8iBHflz87S1PJPOwGfuVM8EkkHXCBAGDd GChSAyD7p1bFL7EsBlchg2R7z+OqrTLCmOW+4JJp0aSvGmDb1ESgP5lRNFgngoNDFoDz um32TiD9RmdV6WCNUahC7x3R8jNmmbFzRvuqQ9buIWBZkGK/cRTWmxjYEwDWhuer5ySc HeEQ== Received: by 10.180.96.129 with SMTP id ds1mr14123279wib.17.1351174267394; Thu, 25 Oct 2012 07:11:07 -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.05 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 07:11:06 -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 05/10] HID: hid-multitouch: support T and C for win8 devices Date: Thu, 25 Oct 2012 16:09:44 +0200 Message-Id: <1351174189-24719-6-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 input specification clarifies the X and Y sent by devices. It distincts the position where the user wants to Touch (T) from the center of the ellipsoide (C). This patch enable supports for this distinction in hid-multitouch. We recognize Win8 certified devices from their vendor feature 0xff0000c5 where Microsoft put a signed blob in the report to check if the device passed the certification. Signed-off-by: Benjamin Tissoires --- drivers/hid/hid-multitouch.c | 53 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 38a4feb..ff2354c 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -52,9 +52,10 @@ MODULE_LICENSE("GPL"); #define MT_QUIRK_VALID_IS_CONFIDENCE (1 << 6) #define MT_QUIRK_SLOT_IS_CONTACTID_MINUS_ONE (1 << 8) #define MT_QUIRK_NO_AREA (1 << 9) +#define MT_QUIRK_WIN_8_CERTIFIED (1 << 10) struct mt_slot { - __s32 x, y, p, w, h; + __s32 x, y, cx, cy, p, w, h; __s32 contactid; /* the device ContactID assigned to this slot */ bool touch_state; /* is the touch valid? */ }; @@ -292,6 +293,10 @@ static void mt_feature_mapping(struct hid_device *hdev, td->maxcontacts = td->mtclass.maxcontacts; break; + case 0xff0000c5: + if (field->report_count == 256 && field->report_size == 8) + td->mtclass.quirks |= MT_QUIRK_WIN_8_CERTIFIED; + break; } } @@ -350,18 +355,36 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi, case HID_UP_GENDESK: switch (usage->hid) { case HID_GD_X: - hid_map_usage(hi, usage, bit, max, + if (cls->quirks & MT_QUIRK_WIN_8_CERTIFIED && + usage_index) { + hid_map_usage(hi, usage, bit, max, + EV_ABS, ABS_MT_TOOL_X); + set_abs(hi->input, ABS_MT_TOOL_X, field, + cls->sn_move); + } else { + hid_map_usage(hi, usage, bit, max, EV_ABS, ABS_MT_POSITION_X); - set_abs(hi->input, ABS_MT_POSITION_X, field, - cls->sn_move); + set_abs(hi->input, ABS_MT_POSITION_X, field, + cls->sn_move); + } + mt_store_field(usage, td, hi); td->last_field_index = field->index; return 1; case HID_GD_Y: - hid_map_usage(hi, usage, bit, max, + if (cls->quirks & MT_QUIRK_WIN_8_CERTIFIED && + usage_index) { + hid_map_usage(hi, usage, bit, max, + EV_ABS, ABS_MT_TOOL_Y); + set_abs(hi->input, ABS_MT_TOOL_Y, field, + cls->sn_move); + } else { + hid_map_usage(hi, usage, bit, max, EV_ABS, ABS_MT_POSITION_Y); - set_abs(hi->input, ABS_MT_POSITION_Y, field, - cls->sn_move); + set_abs(hi->input, ABS_MT_POSITION_Y, field, + cls->sn_move); + } + mt_store_field(usage, td, hi); td->last_field_index = field->index; return 1; @@ -502,6 +525,12 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input) input_event(input, EV_ABS, ABS_MT_POSITION_X, s->x); input_event(input, EV_ABS, ABS_MT_POSITION_Y, s->y); + if (td->mtclass.quirks & MT_QUIRK_WIN_8_CERTIFIED) { + input_event(input, EV_ABS, ABS_MT_TOOL_X, + s->cx); + input_event(input, EV_ABS, ABS_MT_TOOL_Y, + s->cy); + } input_event(input, EV_ABS, ABS_MT_ORIENTATION, wide); input_event(input, EV_ABS, ABS_MT_PRESSURE, s->p); input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR, major); @@ -553,10 +582,16 @@ static int mt_event(struct hid_device *hid, struct hid_field *field, td->curdata.p = value; break; case HID_GD_X: - td->curdata.x = value; + if (usage->code == ABS_MT_POSITION_X) + td->curdata.x = value; + else + td->curdata.cx = value; break; case HID_GD_Y: - td->curdata.y = value; + if (usage->code == ABS_MT_POSITION_Y) + td->curdata.y = value; + else + td->curdata.cy = value; break; case HID_DG_WIDTH: td->curdata.w = value;