From patchwork Fri Feb 27 21:00:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 5903291 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EE155BF440 for ; Fri, 27 Feb 2015 21:00:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2FAE520253 for ; Fri, 27 Feb 2015 21:00:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE2EF2021B for ; Fri, 27 Feb 2015 21:00:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755459AbbB0VAe (ORCPT ); Fri, 27 Feb 2015 16:00:34 -0500 Received: from mail-ob0-f179.google.com ([209.85.214.179]:59100 "EHLO mail-ob0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755246AbbB0VAd (ORCPT ); Fri, 27 Feb 2015 16:00:33 -0500 Received: by mail-ob0-f179.google.com with SMTP id wp4so20956859obc.10 for ; Fri, 27 Feb 2015 13:00:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=o1zoqt22U9YxJoIXb3pfQ3mJds8dRUyrEgJpGedtja4=; b=FZsGHV9GmAUSm2+DzleoEIowgNuKGrGp4w4nz0SktFSg2R43x3ZTP9DTsQuLaecJJr vpbdWJFBtA4ccq3gw55X9/USDvbi6VExYLJrpMG56Q1ZoxHuoggWVLWGNwoctElqOwyX nb4SiMWPGqMlYlbOL+dQmV/EYc/hgMU15cyOjC2fBQXgcsZJMOEMMuWGBlzW6M/Xovve YwrCJdF5sAWb9pQoHFwZpAtkf2Lw9+LpxNa3/4re0vpnDxqnegb5f7c23X6kIIkq/MhC i8mLqRML6181sFWUa2FTinjxzR+VYSTq+vWBRA9JUDfxJTGgnfc1Axv7AY6Yu+NYuvNG k+AQ== X-Gm-Message-State: ALoCoQnvol6d0q2QJEGXtmBZM/bAYQ8We01Wu9xgh3sP2qbMr9EHnnhmgWV4RDi9Ua7kLnM1HvDs X-Received: by 10.182.126.197 with SMTP id na5mr11486286obb.2.1425070832880; Fri, 27 Feb 2015 13:00:32 -0800 (PST) Received: from localhost (199-87-125-144.dyn.kc.surewest.net. [199.87.125.144]) by mx.google.com with ESMTPSA id dd8sm2997186oeb.1.2015.02.27.13.00.32 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 27 Feb 2015 13:00:32 -0800 (PST) From: Seth Forshee To: Jiri Kosina Cc: Seth Forshee , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] HID: multitouch: Add support for button type usage Date: Fri, 27 Feb 2015 15:00:01 -0600 Message-Id: <1425070801-73595-1-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP According to [1], Windows Precision Touchpad devices must supply a button type usage in the device capabilities feature report. A value of 0 indicates that the device contains a depressible button (i.e. it's a click-pad) whereas a value of 1 indicates a non-depressible button. Add support for this usage and set INPUT_PROP_BUTTONPAD on the touchpad input device whenever a depressible button is present. [1] https://msdn.microsoft.com/en-us/library/windows/hardware/dn467314(v=vs.85).aspx Signed-off-by: Seth Forshee --- drivers/hid/hid-multitouch.c | 19 +++++++++++++++++++ include/linux/hid.h | 1 + 2 files changed, 20 insertions(+) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index f65e78b..b19d721 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -72,6 +72,10 @@ MODULE_LICENSE("GPL"); #define MT_INPUTMODE_TOUCHSCREEN 0x02 #define MT_INPUTMODE_TOUCHPAD 0x03 +#define MT_BUTTONTYPE_DEPRESSIBLE 0 +#define MT_BUTTONTYPE_NONDEPRESSIBLE 1 +#define MT_BUTTONTYPE_MAX MT_BUTTONTYPE_NONDEPRESSIBLE + struct mt_slot { __s32 x, y, cx, cy, p, w, h; __s32 contactid; /* the device ContactID assigned to this slot */ @@ -116,6 +120,7 @@ struct mt_device { __u8 touches_by_report; /* how many touches are present in one report: * 1 means we should use a serial protocol * > 1 means hybrid (multitouch) protocol */ + __u8 buttontype; /* depressible or non-depressible touchpad */ bool serial_maybe; /* need to check for serial protocol */ bool curvalid; /* is the current contact valid? */ unsigned mt_flags; /* flags to pass to input-mt */ @@ -334,6 +339,16 @@ static void mt_feature_mapping(struct hid_device *hdev, td->maxcontacts = td->mtclass.maxcontacts; break; + case HID_DG_BUTTONTYPE: + if (usage->usage_index >= field->report_count) { + dev_err(&hdev->dev, "HID_DG_BUTTONTYPE out of range\n"); + break; + } + + if (field->value[usage->usage_index] <= MT_BUTTONTYPE_MAX) + td->buttontype = field->value[usage->usage_index]; + + break; } } @@ -728,6 +743,9 @@ static void mt_touch_input_configured(struct hid_device *hdev, if (cls->quirks & MT_QUIRK_NOT_SEEN_MEANS_UP) td->mt_flags |= INPUT_MT_DROP_UNUSED; + if (td->buttontype == MT_BUTTONTYPE_DEPRESSIBLE) + __set_bit(INPUT_PROP_BUTTONPAD, input->propbit); + input_mt_init_slots(input, td->maxcontacts, td->mt_flags); td->mt_flags = 0; @@ -1009,6 +1027,7 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN; td->cc_index = -1; td->mt_report_id = -1; + td->buttontype = MT_BUTTONTYPE_NONDEPRESSIBLE; hid_set_drvdata(hdev, td); td->fields = devm_kzalloc(&hdev->dev, sizeof(struct mt_fields), diff --git a/include/linux/hid.h b/include/linux/hid.h index 06c4607..498ddad 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -269,6 +269,7 @@ struct hid_item { #define HID_DG_DEVICEINDEX 0x000d0053 #define HID_DG_CONTACTCOUNT 0x000d0054 #define HID_DG_CONTACTMAX 0x000d0055 +#define HID_DG_BUTTONTYPE 0x000d0059 #define HID_DG_BARRELSWITCH2 0x000d005a #define HID_DG_TOOLSERIALNUMBER 0x000d005b