From patchwork Thu Sep 28 09:42:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei-Ning Huang X-Patchwork-Id: 9975585 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8FF46603F2 for ; Thu, 28 Sep 2017 09:42:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80EDF29500 for ; Thu, 28 Sep 2017 09:42:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 758E329541; Thu, 28 Sep 2017 09:42:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13C3829500 for ; Thu, 28 Sep 2017 09:42:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751857AbdI1Jmr (ORCPT ); Thu, 28 Sep 2017 05:42:47 -0400 Received: from mail-pf0-f179.google.com ([209.85.192.179]:53676 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751241AbdI1Jmq (ORCPT ); Thu, 28 Sep 2017 05:42:46 -0400 Received: by mail-pf0-f179.google.com with SMTP id x78so593668pff.10 for ; Thu, 28 Sep 2017 02:42:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=eLVn+Bqs4jo9bGTq0axmr6OJokbEs0hRxbAF4Rv+Zng=; b=bgcOgnZmvN9ngsZ27Tmzd4jHcK1L6zMQhAPALpEh2o/TA8/kg1v4SjPIDIS23d9Trm GiY7+eD9oG1t2XnbKSfDr+VYdrnBFmOlBahTzTi5NNODdgfeDwqWZWJAyjTVgarNxcFp EJD7IhZSuF0KNtAe5+BBwZI7zaGiCRxk0hYwQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eLVn+Bqs4jo9bGTq0axmr6OJokbEs0hRxbAF4Rv+Zng=; b=lv65ptqykUxlRZ5S/G2TKnOIsvuF5VkId3VQdomozDXPXhjj5I24UaWVgNMwVkdxOb p+YbfwRNNxQbRVhGusrA2qfrdG0vSejGCXF/OD7vUBUB+xsOm1pUUTlJvKuKINxajwHi np1143Ze+Mt9unH0/nFC6ofoIuQEzdON8vFZNyGdor3Da8wEUTf8Sl8wN3Wa1DV3hMPB qDnZayuUQ2n40eoJmwQJ71j1MHm/51BcB85Ze4bZ0HLxyaq0jrJ+Sa44jFyZhwmSZkgS ShsmXjrnMqTugJDL1KLeXDNTKcG2E6WBctCHwQRzFPH50JGSJ/oOA23Nm8ZgXLeRxHUl U8gA== X-Gm-Message-State: AHPjjUgijcXvpXzn7Zu789h0G8UDylV0CJY047sQ4n+IIINqk27M/v/r jJfthH+KJqa2oBgQUEeCTI+FQw== X-Google-Smtp-Source: AOwi7QBH23KGY6RzpbtplN/Hwa4+6iC7yklifVag9tLG6w46NAvGH7WI31uiQgHXA7xygAsSj73mYw== X-Received: by 10.84.215.214 with SMTP id g22mr3592530plj.165.1506591766199; Thu, 28 Sep 2017 02:42:46 -0700 (PDT) Received: from wnhuang0.tpe.corp.google.com ([2401:fa00:1:b:716f:fc52:d100:6002]) by smtp.gmail.com with ESMTPSA id l12sm2294602pgp.74.2017.09.28.02.42.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Sep 2017 02:42:45 -0700 (PDT) From: Wei-Ning Huang X-Google-Original-From: Wei-Ning Huang To: LKML , Linux Input Cc: Dmitry Torokhov , Jiri Kosina , Wei-Ning Huang Subject: [PATCH v3] HID: hid-multitouch: support fine-grain orientation reporting Date: Thu, 28 Sep 2017 17:42:34 +0800 Message-Id: <20170928094234.7270-1-wnhuang@google.com> X-Mailer: git-send-email 2.12.2 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The current hid-multitouch driver only allow the report of two orientations, vertical and horizontal. We use the Azimuth orientation usage 0x3F under the Digitizer usage page to report orientation if the device supports it. Changelog: v1 -> v2: - Fix commit message. - Remove resolution reporting for ABS_MT_ORIENTATION. v2 -> v3: - Fix commit message. Signed-off-by: Wei-Ning Huang Reviewed-by: Dmitry Torokhov --- drivers/hid/hid-multitouch.c | 35 +++++++++++++++++++++++++++++++++-- include/linux/hid.h | 1 + 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 440b999304a5..f9801d1b1eae 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -84,11 +84,12 @@ MODULE_LICENSE("GPL"); #define MT_IO_FLAGS_PENDING_SLOTS 2 struct mt_slot { - __s32 x, y, cx, cy, p, w, h; + __s32 x, y, cx, cy, p, w, h, a; __s32 contactid; /* the device ContactID assigned to this slot */ bool touch_state; /* is the touch valid? */ bool inrange_state; /* is the finger in proximity of the sensor? */ bool confidence_state; /* is the touch made by a finger? */ + bool has_azimuth; /* the contact reports azimuth */ }; struct mt_class { @@ -591,6 +592,20 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi, td->cc_index = field->index; td->cc_value_index = usage->usage_index; return 1; + case HID_DG_AZIMUTH: + hid_map_usage(hi, usage, bit, max, + EV_ABS, ABS_MT_ORIENTATION); + /* + * Azimuth has the range of [0, MAX) representing a full + * revolution. Set ABS_MT_ORIENTATION to a quarter of + * MAX according the definition of ABS_MT_ORIENTATION + */ + input_set_abs_params(hi->input, ABS_MT_ORIENTATION, + 0, field->logical_maximum / 4, + cls->sn_move ? + field->logical_maximum / cls->sn_move : 0, 0); + mt_store_field(usage, td, hi); + return 1; case HID_DG_CONTACTMAX: /* we don't set td->last_slot_field as contactcount and * contact max are global to the report */ @@ -683,6 +698,10 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input) int wide = (s->w > s->h); int major = max(s->w, s->h); int minor = min(s->w, s->h); + int orientation = wide; + + if (s->has_azimuth) + orientation = s->a; /* * divided by two to match visual scale of touch @@ -699,7 +718,8 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input) input_event(input, EV_ABS, ABS_MT_TOOL_Y, s->cy); input_event(input, EV_ABS, ABS_MT_DISTANCE, !s->touch_state); - input_event(input, EV_ABS, ABS_MT_ORIENTATION, wide); + input_event(input, EV_ABS, ABS_MT_ORIENTATION, + orientation); input_event(input, EV_ABS, ABS_MT_PRESSURE, s->p); input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR, major); input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR, minor); @@ -789,6 +809,17 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field, break; case HID_DG_CONTACTCOUNT: break; + case HID_DG_AZIMUTH: + /* + * Azimuth is counter-clockwise and ranges from [0, MAX) + * (a full revolution). Convert it to clockwise ranging + * [-MAX/2, MAX/2]. + */ + if (value > field->logical_maximum / 2) + value -= field->logical_maximum; + td->curdata.a = -value; + td->curdata.has_azimuth = true; + break; case HID_DG_TOUCH: /* do nothing */ break; diff --git a/include/linux/hid.h b/include/linux/hid.h index ab05a86269dc..d81b9b6fd83a 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -281,6 +281,7 @@ struct hid_item { #define HID_DG_DEVICECONFIG 0x000d000e #define HID_DG_DEVICESETTINGS 0x000d0023 +#define HID_DG_AZIMUTH 0x000d003f #define HID_DG_CONFIDENCE 0x000d0047 #define HID_DG_WIDTH 0x000d0048 #define HID_DG_HEIGHT 0x000d0049