From patchwork Tue Nov 13 14:30:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 1734331 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 35793DF280 for ; Tue, 13 Nov 2012 14:30:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755102Ab2KMOau (ORCPT ); Tue, 13 Nov 2012 09:30:50 -0500 Received: from mail-la0-f46.google.com ([209.85.215.46]:57831 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754778Ab2KMOat (ORCPT ); Tue, 13 Nov 2012 09:30:49 -0500 Received: by mail-la0-f46.google.com with SMTP id h6so5467579lag.19 for ; Tue, 13 Nov 2012 06:30:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=z9z6BWy0s43HULuYEN54EQ0WKVjEbmlgGyfElUNLRz8=; b=kTW9wFVXXpWjz3wZTb0PQHayScFSBs8vSx/IuU/mG2sE3gV8mnpgQjB9ZU6SvOD8gM Yx5sFwcwNAs3V05e0CsNhhznlPF75bzQ5o/YT7NA9xhfsJhtb9BD+OuQBYyLZJiAe65h cbHvKCIUh3YcCx7Jf6sP7uFca9n+d+9Ltzd9Go6Q5S643q9y6Ih4C8bv4sqhi3/yj5a5 tIJa+x9KwCLbaFolB76YO1h/N7qWjn+ysv1qmuqVkFJejJVGsDzLm79avqJJSdOtjzdx eD40Iqn917fNLcDP5tkOfoOLm/G94HsIdelRsxNQhav/RrveBZ8cJpLdbTeP5L2Pyil1 06GQ== Received: by 10.112.45.200 with SMTP id p8mr9273956lbm.27.1352817047503; Tue, 13 Nov 2012 06:30:47 -0800 (PST) Received: from localhost.localdomain (lan31-8-82-247-176-67.fbx.proxad.net. [82.247.176.67]) by mx.google.com with ESMTPS id pz9sm3860192lab.11.2012.11.13.06.30.42 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 06:30:46 -0800 (PST) Message-ID: <50A25990.6040302@gmail.com> Date: Tue, 13 Nov 2012 15:30:40 +0100 From: Benjamin Tissoires User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121016 Thunderbird/16.0.1 MIME-Version: 1.0 To: Benjamin Tissoires CC: Dmitry Torokhov , Henrik Rydberg , Jiri Kosina , Stephane Chatty , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 13/13] HID: hid-multitouch: forwards ABS_SCAN_TIME References: <1352306256-12180-1-git-send-email-benjamin.tissoires@gmail.com> <1352306256-12180-14-git-send-email-benjamin.tissoires@gmail.com> In-Reply-To: <1352306256-12180-14-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 On 11/07/2012 05:37 PM, Benjamin Tissoires wrote: > Computes the scan time according to the specification. > It also ensures that if the time between two events is greater > than MAX_SCAN_INTERVAL, the scan time will be reset. > > Signed-off-by: Benjamin Tissoires > --- > drivers/hid/hid-multitouch.c | 45 ++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 43 insertions(+), 2 deletions(-) > [snipped] > /* > * Includes multi-packet support where subsequent > Since ABS_SCAN_TIME has been replaced by MSC_TIMESTAMP, this patch is modified as this: From: Benjamin Tissoires Date: Tue, 13 Nov 2012 15:12:17 +0100 Subject: [PATCH v4] HID: hid-multitouch: forwards MSC_TIMESTAMP Computes the device timestamp according to the specification. It also ensures that if the time between two events is greater than MAX_TIMESTAMP_INTERVAL, the timestamp will be reset. Signed-off-by: Benjamin Tissoires --- drivers/hid/hid-multitouch.c | 46 +++++++++++++++++++++++++++++++++++++++++--- include/linux/hid.h | 1 + 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index caf0f0b..3f8432d 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "usbhid/usbhid.h" @@ -98,6 +99,9 @@ struct mt_device { bool serial_maybe; /* need to check for serial protocol */ bool curvalid; /* is the current contact valid? */ unsigned mt_flags; /* flags to pass to input-mt */ + __s32 dev_time; /* the scan time provided by the device */ + unsigned long jiffies; /* the frame's jiffies */ + unsigned timestamp; /* the timestamp to be sent */ }; /* classes of device behavior */ @@ -126,6 +130,8 @@ struct mt_device { #define MT_DEFAULT_MAXCONTACT 10 #define MT_MAX_MAXCONTACT 250 +#define MAX_TIMESTAMP_INTERVAL 500000 + #define MT_USB_DEVICE(v, p) HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH, v, p) #define MT_BT_DEVICE(v, p) HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_MULTITOUCH, v, p) @@ -451,12 +457,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_MSC, MSC_TIMESTAMP); + set_bit(MSC_TIMESTAMP, hi->input->mscbit); + 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; } @@ -485,7 +498,8 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, unsigned long **bit, int *max) { - if (usage->type == EV_KEY || usage->type == EV_ABS) + if (usage->type == EV_KEY || usage->type == EV_ABS || + usage->type == EV_MSC) set_bit(usage->type, hi->input->evbit); return -1; @@ -565,11 +579,34 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input) */ static void mt_sync_frame(struct mt_device *td, struct input_dev *input) { + input_event(input, EV_MSC, MSC_TIMESTAMP, td->timestamp); input_mt_sync_frame(input); input_sync(input); td->num_received = 0; } +static void mt_compute_timestamp(struct mt_device *td, struct hid_field *field, + __s32 value) +{ + long delta = value - td->dev_time; + unsigned long jdelta = jiffies_to_usecs(jiffies - td->jiffies); + + td->jiffies = jiffies; + td->dev_time = value; + + if (delta < 0) + delta += field->logical_maximum; + + /* HID_DG_SCANTIME is expressed in 100us, we want it in ms. */ + delta *= 100; + + if (abs(delta - jdelta) > MAX_TIMESTAMP_INTERVAL) + /* obviously wrong clock -> the device time has been reset */ + td->timestamp = 0; + else + td->timestamp += delta; +} + static int mt_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value) { @@ -617,6 +654,9 @@ static int mt_event(struct hid_device *hid, struct hid_field *field, case HID_DG_HEIGHT: td->curdata.h = value; break; + case HID_DG_SCANTIME: + mt_compute_timestamp(td, field, value); + break; case HID_DG_CONTACTCOUNT: /* * Includes multi-packet support where subsequent diff --git a/include/linux/hid.h b/include/linux/hid.h index 6b4f322..0337e50 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!