From patchwork Fri Oct 26 08:44:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 1650241 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0C30640135 for ; Fri, 26 Oct 2012 08:47:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757509Ab2JZIpI (ORCPT ); Fri, 26 Oct 2012 04:45:08 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:36011 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757422Ab2JZIot (ORCPT ); Fri, 26 Oct 2012 04:44:49 -0400 Received: by mail-we0-f174.google.com with SMTP id t9so1288398wey.19 for ; Fri, 26 Oct 2012 01:44:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; bh=N90NvXLt7ofP3VDZIi/aEcXKMMy3WUBJ2MJjqQknv3I=; b=yjR45Xw77YibnAyXxR81oPhTi3SBHkkwofPoVAZZafLY9XgSSYebDC8cUoWuYkKymF 2zievxleM7zgPumkuyl77PLjOOTmrd50m/BxsYO3fCvcvNgQ6obn3g64719rRTxEt1oU y6SumfDzxKalFjWRUaHOGgsXh+Rqrt/55dotUzejFkhgeiH55hZg+H6b5V7kP0rqhTEc gIb21bEwxZ0b7+4P5Ktnj3aZuyRHE8xNtugpIdFegP4oJg4cJf3+sF6W0k0X46gIDGju +XVOmBP9nn/3nDcUJlA08kioTpQT6aWUdmT7RVNxR/lUEKJC76ubv0IBVtpNS5VRKuGB nOJA== Received: by 10.180.105.168 with SMTP id gn8mr3555522wib.10.1351241089119; Fri, 26 Oct 2012 01:44:49 -0700 (PDT) Received: from miniplouf.lan (lan31-8-82-247-176-67.fbx.proxad.net. [82.247.176.67]) by mx.google.com with ESMTPS id dq6sm14151586wib.5.2012.10.26.01.44.47 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Oct 2012 01:44:48 -0700 (PDT) From: Benjamin Tissoires To: "benjamin.tissoires" , Dmitry Torokhov , Henrik Rydberg , Jiri Kosina , Stephane Chatty , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 10/11] HID: introduce Scan Time Date: Fri, 26 Oct 2012 10:44:26 +0200 Message-Id: <1351241067-9521-11-git-send-email-benjamin.tissoires@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351241067-9521-1-git-send-email-benjamin.tissoires@gmail.com> References: <1351241067-9521-1-git-send-email-benjamin.tissoires@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Win 8 digitizer devices provides the actual scan time computed by the hardware itself. The value is global to the frame and is not specific to the multitouch protocol (though only touch, not pen, should use it according to the specification). Signed-off-by: Benjamin Tissoires --- Documentation/input/event-codes.txt | 7 +++++++ drivers/hid/hid-input.c | 4 ++++ drivers/hid/hid-multitouch.c | 11 +++++++++-- include/linux/hid.h | 1 + include/linux/input.h | 1 + 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Documentation/input/event-codes.txt b/Documentation/input/event-codes.txt index 53305bd..8f8c908 100644 --- a/Documentation/input/event-codes.txt +++ b/Documentation/input/event-codes.txt @@ -174,6 +174,13 @@ A few EV_ABS codes have special meanings: the input device may be used freely in three dimensions, consider ABS_Z instead. +* ABS_SCAN_TIME: + - Used when the device provides a timestamp for each frame. The unit must be + 100us, and may be reset when the device don't send any events for a + period of time. The values increment at each frame and thus, it can roll + back to 0 when reach logical_max. If the device does not provide this + information, the driver must not provide it to the user space. + * ABS_MT_: - Used to describe multitouch input events. Please see multi-touch-protocol.txt for details. diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 16cc89a..5fe7bd3 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -675,6 +675,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel map_key_clear(BTN_STYLUS2); break; + case 0x56: /* Scan Time */ + map_abs(ABS_SCAN_TIME); + break; + default: goto unknown; } break; diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index c0ab1c6..21a120b 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -447,12 +447,19 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi, mt_store_field(usage, td, hi); td->last_field_index = field->index; return 1; + case HID_DG_SCANTIME: + hid_map_usage(hi, usage, bit, max, + EV_ABS, ABS_SCAN_TIME); + set_abs(hi->input, ABS_SCAN_TIME, field, 0); + td->last_field_index = field->index; + return 1; case HID_DG_CONTACTCOUNT: td->last_field_index = field->index; return 1; case HID_DG_CONTACTMAX: - /* we don't set td->last_slot_field as contactcount and - * contact max are global to the report */ + /* we don't set td->last_slot_field as scan time, + * contactcount and contact max are global to the + * report */ td->last_field_index = field->index; return -1; case HID_DG_TOUCH: diff --git a/include/linux/hid.h b/include/linux/hid.h index 6216529..99a6418 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -279,6 +279,7 @@ struct hid_item { #define HID_DG_DEVICEINDEX 0x000d0053 #define HID_DG_CONTACTCOUNT 0x000d0054 #define HID_DG_CONTACTMAX 0x000d0055 +#define HID_DG_SCANTIME 0x000d0056 /* * HID report types --- Ouch! HID spec says 1 2 3! diff --git a/include/linux/input.h b/include/linux/input.h index ba48743..73c3a96 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -796,6 +796,7 @@ struct input_keymap_entry { #define ABS_TILT_X 0x1a #define ABS_TILT_Y 0x1b #define ABS_TOOL_WIDTH 0x1c +#define ABS_SCAN_TIME 0x1d #define ABS_VOLUME 0x20