From patchwork Sat May 30 14:10:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Tunin X-Patchwork-Id: 6513091 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 651B09F1C1 for ; Sat, 30 May 2015 14:11:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6CE1B207EA for ; Sat, 30 May 2015 14:11:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6DB7020571 for ; Sat, 30 May 2015 14:11:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932486AbbE3OLG (ORCPT ); Sat, 30 May 2015 10:11:06 -0400 Received: from mail-la0-f43.google.com ([209.85.215.43]:34766 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932344AbbE3OLF (ORCPT ); Sat, 30 May 2015 10:11:05 -0400 Received: by laat2 with SMTP id t2so73740172laa.1; Sat, 30 May 2015 07:11:03 -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=qTb7W09rCcG0NEivPeToZO2nHncJ9r7KsoQtkGY0WrM=; b=yzRCKeTFmg8VjJB3EcjvLAMD4Uip4SeVN3X/DAZdeunxrgFVcFGxvm/JzHlH7aV99l f9NfQPr4QdW3hYp4THDUpDYsqLG//kLBvNvb1pCDTFDAf7Tx5Iv4Wax0FYJiUGjiyBCw wCyhbId+GY5MdwqON7bvSnrVdA+xVwmmG2MfZdV/n8PJrN5ixMM4n80blK31b5Z3Qgcy 7Se2pL1iRYGyqCeGzo1tYWwttsZc9FBjV2U1v/PLx8PLBqb8DanZXL9B8Q2xrQ3VBedw 3VvcpzmUtTBwShyu1F1iHpZ9R+xZI2jTTP0+RE6kHt4+C0CYN7bJuc8CQk2II9aIRxbL Kj8g== X-Received: by 10.152.42.230 with SMTP id r6mr12632110lal.30.1432995063388; Sat, 30 May 2015 07:11:03 -0700 (PDT) Received: from localhost.localdomain (95-25-246-124.broadband.corbina.ru. [95.25.246.124]) by mx.google.com with ESMTPSA id wm10sm2364064lbb.26.2015.05.30.07.11.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 30 May 2015 07:11:02 -0700 (PDT) From: Dmitry Tunin To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Mathias Gottschlag , Hans de Goede , Benjamin Tissoires , Dmitry Tunin Subject: [PATCH v2] psmouse - focaltech report finger width to userspace Date: Sat, 30 May 2015 17:10:45 +0300 Message-Id: <1432995045-15969-1-git-send-email-hanipouspilot@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20150529233734.GA20962@dtor-ws> References: <20150529233734.GA20962@dtor-ws> 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=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 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. Signed-off-by: Dmitry Tunin --- drivers/input/mouse/focaltech.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c index 23d2594..ed2ec3b 100644 --- a/drivers/input/mouse/focaltech.c +++ b/drivers/input/mouse/focaltech.c @@ -105,6 +105,16 @@ struct focaltech_hw_state { /* True if the clickpad has been pressed. */ bool pressed; + + /* + * Finger width 0-7 and 15 for a very big contact area. + * 15 value stays until the finger is released. + * Width is reported only in absolute packets. + * Since hardware reports width only for last touching finger, + * there is no need to store width for every specific finger, so + * we keep only last value reported. + */ + unsigned int width; }; struct focaltech_data { @@ -137,6 +147,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); + input_report_abs(dev, ABS_TOOL_WIDTH, state->width); } } input_mt_report_pointer_emulation(dev, true); @@ -187,6 +198,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->width = packet[5] >> 4; state->fingers[finger].valid = true; } @@ -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); }