From patchwork Sat Apr 18 12:37:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Tunin X-Patchwork-Id: 6237001 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 043A09F2EC for ; Sat, 18 Apr 2015 12:37:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2BB2820268 for ; Sat, 18 Apr 2015 12:37:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 477CF20259 for ; Sat, 18 Apr 2015 12:37:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752025AbbDRMhy (ORCPT ); Sat, 18 Apr 2015 08:37:54 -0400 Received: from mail-la0-f43.google.com ([209.85.215.43]:36540 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752033AbbDRMhx (ORCPT ); Sat, 18 Apr 2015 08:37:53 -0400 Received: by lagv1 with SMTP id v1so97870377lag.3 for ; Sat, 18 Apr 2015 05:37:52 -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; bh=mWhEVvvucSzhBW0ECvAv1nkzocjOMPSFqvVkrTZm1nk=; b=RvKUnPYDRLzVdsQdjcEwnqKfEQgOkUBwSHMZjtTWfYb2AdWx4NsEijVXAXWq9iSH4w jwLlHNT1wbJf5OhDdtAcp79poi5hZFwgjbnicFvEUbkPqH0NE8tafGVg6zgG/lPQVI3W wkSW3R6HzmszGKkm419Nv268f53eK5bZ1NEDkizdavpc77gvB8f18fKU0YU8/ikMj6OS D2x1ForEz4G4BRbUKtPfJMJx6kfbhlgtqaCrXQMHm3VqJctY3PXa5v6qfulKupwfIBqF ZxK5gDem3w8+EZHFby8puS+99KYxeBQ911DNNamF8feNIiZAZtAS/khxGbhwbsFeY6D0 K4EQ== X-Received: by 10.112.159.162 with SMTP id xd2mr8154555lbb.67.1429360672577; Sat, 18 Apr 2015 05:37:52 -0700 (PDT) Received: from localhost.localdomain ([2.92.165.225]) by mx.google.com with ESMTPSA id jf5sm283113lbc.44.2015.04.18.05.37.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Apr 2015 05:37:52 -0700 (PDT) From: Dmitry Tunin To: linux-input@vger.kernel.org Cc: Mathias Gottschlag , Dmitry Tunin Subject: [PATCH] psmouse - pass finger width to userspace Date: Sat, 18 Apr 2015 15:37:18 +0300 Message-Id: <1429360638-12742-1-git-send-email-hanipouspilot@gmail.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.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]. Range for width in raw format is 0x10 - 0x70. Second 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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c index 23d2594..42f73cd 100644 --- a/drivers/input/mouse/focaltech.c +++ b/drivers/input/mouse/focaltech.c @@ -90,6 +90,11 @@ struct focaltech_finger_state { */ unsigned int x; unsigned int y; + + /* + * Finger width 0-7 and 15 for 'latching' + */ + unsigned int width; }; /* @@ -137,6 +142,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, finger->width); } } input_mt_report_pointer_emulation(dev, true); @@ -187,6 +193,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; } @@ -331,6 +338,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); }