From patchwork Thu Apr 23 21:43:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Tunin X-Patchwork-Id: 6265471 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 98040BF4A6 for ; Thu, 23 Apr 2015 21:44:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B230520380 for ; Thu, 23 Apr 2015 21:44:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C1C372037C for ; Thu, 23 Apr 2015 21:44:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031057AbbDWVn4 (ORCPT ); Thu, 23 Apr 2015 17:43:56 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:33935 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030809AbbDWVnx (ORCPT ); Thu, 23 Apr 2015 17:43:53 -0400 Received: by lbcga7 with SMTP id ga7so23265601lbc.1; Thu, 23 Apr 2015 14:43:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=49QGYInWhTBSjJ2zrRNvPgaZueKQ5PqBZYr7Ap9Cbww=; b=PGvlAtMHvosS0BCVRma3HvXLkXOxe0Fdvjk0sXTLbYoJ0AaSv05rRzj8iMtabXx+r9 kzMCJibLEFFiEHgSphRo20T07KfpuHve18jwQfpTxJXyUFVj1qxp6pvQtHj7DhxBpCfx v3M9jmWuFKlBaWucFUaG2mtViOHcxhJfzEvDq3PUrH0ODVbcTCld9vrNZMZ8lA9jCJmy PFMnry7GIVqX/Kj7QqYjml8LVmsLk9Mjbmg9afqTHfy4XgCBK6ysuw+EpA8yryR7+S0o vNxUwVsNpqMqdVTWFYMtL2Qj0Lr1k7YFFQhM52++gmejSsNSw/p42ra5kErZzm8+ODdB 0uxQ== X-Received: by 10.112.185.100 with SMTP id fb4mr4292978lbc.79.1429825431632; Thu, 23 Apr 2015 14:43:51 -0700 (PDT) Received: from localhost.localdomain ([2.92.165.225]) by mx.google.com with ESMTPSA id uf11sm2130638lac.11.2015.04.23.14.43.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Apr 2015 14:43:50 -0700 (PDT) From: Dmitry Tunin To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Mathias Gottschlag , Dmitry Tunin Subject: [PATCH v6] psmouse - focaltech pass finger width to userspace Focaltech touchpads report finger width in packet[5] of absolute packet. Range for width in raw format is 0x10 - 0x70. Second half-byte is always 0. 0xff is reported, when a large contact area is detected. This can be handled in userspace. Date: Fri, 24 Apr 2015 00:43:32 +0300 Message-Id: <1429825412-8499-2-git-send-email-hanipouspilot@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429825412-8499-1-git-send-email-hanipouspilot@gmail.com> References: <1429825412-8499-1-git-send-email-hanipouspilot@gmail.com> 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 --- drivers/input/mouse/focaltech.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c index 23d2594..513a7e1 100644 --- a/drivers/input/mouse/focaltech.c +++ b/drivers/input/mouse/focaltech.c @@ -90,6 +90,13 @@ struct focaltech_finger_state { */ unsigned int x; unsigned int y; + + /* + * Finger width 0-7 and 15 for 'latching' + * 15 value stays until the finger is released + * Width is reported only in absolute packets + */ + unsigned int width; }; /* @@ -112,7 +119,7 @@ struct focaltech_data { struct focaltech_hw_state state; }; -static void focaltech_report_state(struct psmouse *psmouse) +static void focaltech_report_state(struct psmouse *psmouse, bool abs) { struct focaltech_data *priv = psmouse->private; struct focaltech_hw_state *state = &priv->state; @@ -137,6 +144,7 @@ static void focaltech_report_state(struct psmouse *psmouse) input_report_abs(dev, ABS_MT_POSITION_X, clamped_x); input_report_abs(dev, ABS_MT_POSITION_Y, priv->y_max - clamped_y); + if (abs) input_report_abs(dev, ABS_TOOL_WIDTH, state->width); } } input_mt_report_pointer_emulation(dev, true); @@ -187,6 +195,7 @@ static void focaltech_process_abs_packet(struct psmouse *psmouse, state->fingers[finger].x = ((packet[1] & 0xf) << 8) | packet[2]; state->fingers[finger].y = (packet[3] << 8) | packet[4]; + state->fingers[finger].width = packet[5] >> 4; state->fingers[finger].valid = true; } @@ -228,14 +237,17 @@ static void focaltech_process_packet(struct psmouse *psmouse) switch (packet[0] & 0xf) { case FOC_TOUCH: focaltech_process_touch_packet(psmouse, packet); + focaltech_report_state(psmouse, false); break; case FOC_ABS: focaltech_process_abs_packet(psmouse, packet); + focaltech_report_state(psmouse, true); break; case FOC_REL: focaltech_process_rel_packet(psmouse, packet); + focaltech_report_state(psmouse, false); break; default: @@ -331,6 +343,7 @@ static void focaltech_set_input_params(struct psmouse *psmouse) __set_bit(EV_ABS, dev->evbit); input_set_abs_params(dev, ABS_MT_POSITION_X, 0, priv->x_max, 0, 0); input_set_abs_params(dev, ABS_MT_POSITION_Y, 0, priv->y_max, 0, 0); + input_set_abs_params(dev, ABS_TOOL_WIDTH, 0, 15, 0, 0); input_mt_init_slots(dev, 5, INPUT_MT_POINTER); __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit); }