From: Benjamin Tissoires <benjamin.tissoires@gmail.com>
To: "benjamin.tissoires" <benjamin.tissoires@gmail.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Henrik Rydberg <rydberg@euromail.se>,
Jiri Kosina <jkosina@suse.cz>, Stephane Chatty <chatty@enac.fr>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 13/13] HID: hid-multitouch: forwards ABS_SCAN_TIME
Date: Wed, 7 Nov 2012 17:37:36 +0100 [thread overview]
Message-ID: <1352306256-12180-14-git-send-email-benjamin.tissoires@gmail.com> (raw)
In-Reply-To: <1352306256-12180-1-git-send-email-benjamin.tissoires@gmail.com>
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 <benjamin.tissoires@gmail.com>
---
drivers/hid/hid-multitouch.c | 45 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 43 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 1f3d1e0..5902567 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -32,6 +32,7 @@
#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/input/mt.h>
+#include <linux/jiffies.h>
#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 scan_time; /* the scan time to be sent */
};
/* classes of device behavior */
@@ -126,6 +130,9 @@ struct mt_device {
#define MT_DEFAULT_MAXCONTACT 10
#define MT_MAX_MAXCONTACT 250
+#define MAX_SCAN_TIME INT_MAX
+#define MAX_SCAN_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 +458,20 @@ 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);
+ input_set_abs_params(hi->input,
+ ABS_SCAN_TIME, 0, MAX_SCAN_TIME, 0, 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;
}
@@ -565,11 +580,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_ABS, ABS_SCAN_TIME, td->scan_time);
input_mt_sync_frame(input);
input_sync(input);
td->num_received = 0;
}
+static void mt_compute_scan_time(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_SCAN_INTERVAL)
+ /* obviously wrong clock -> the device time has been reset */
+ td->scan_time = 0;
+ else
+ td->scan_time += delta;
+}
+
static int mt_event(struct hid_device *hid, struct hid_field *field,
struct hid_usage *usage, __s32 value)
{
@@ -617,6 +655,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_scan_time(td, field, value);
+ break;
case HID_DG_CONTACTCOUNT:
/*
* Includes multi-packet support where subsequent
--
1.7.11.7
next prev parent reply other threads:[~2012-11-07 16:38 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-07 16:37 [PATCH v3 00/13] Win 8 support for digitizers Benjamin Tissoires
2012-11-07 16:37 ` [PATCH v3 01/13] HID: hid-input: export hidinput_calc_abs_res Benjamin Tissoires
2012-11-13 7:45 ` Jiri Kosina
2012-11-07 16:37 ` [PATCH v3 02/13] HID: hid-input: round return value of hidinput_calc_abs_res Benjamin Tissoires
2012-11-13 7:44 ` Jiri Kosina
2012-11-07 16:37 ` [PATCH v3 03/13] HID: core: fix unit exponent parsing Benjamin Tissoires
2012-11-13 7:43 ` Jiri Kosina
2012-11-07 16:37 ` [PATCH v3 04/13] HID: hid-input: add usage_index in struct hid_usage Benjamin Tissoires
2012-11-13 7:44 ` Jiri Kosina
2012-11-13 15:38 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 05/13] HID: hid-multitouch: support arrays for the split of the touches in a report Benjamin Tissoires
2012-11-13 15:44 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 06/13] HID: hid-multitouch: get maxcontacts also from logical_max value Benjamin Tissoires
2012-11-07 16:37 ` [PATCH v3 07/13] HID: hid-multitouch: support T and C for win8 devices Benjamin Tissoires
2012-11-13 15:56 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 08/13] HID: hid-multitouch: move ALWAYS_VALID quirk check Benjamin Tissoires
2012-11-13 15:57 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 09/13] HID: hid-multitouch: add MT_QUIRK_IGNORE_DUPLICATES Benjamin Tissoires
2012-11-13 16:25 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 10/13] HID: hid-multitouch: fix Win 8 protocol Benjamin Tissoires
2012-11-13 16:31 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 11/13] HID: hid-multitouch: support for hovering devices Benjamin Tissoires
2012-11-13 16:42 ` Henrik Rydberg
2012-11-13 17:29 ` Benjamin Tissoires
2012-11-13 18:04 ` Henrik Rydberg
2012-11-13 18:08 ` Benjamin Tissoires
2012-11-13 18:55 ` Henrik Rydberg
2012-11-07 16:37 ` [PATCH v3 12/13] HID: introduce Scan Time Benjamin Tissoires
2012-11-09 8:45 ` Dmitry Torokhov
2012-11-13 14:25 ` Benjamin Tissoires
2012-11-13 17:15 ` Henrik Rydberg
2012-11-07 16:37 ` Benjamin Tissoires [this message]
2012-11-13 14:30 ` [PATCH v3 13/13] HID: hid-multitouch: forwards ABS_SCAN_TIME Benjamin Tissoires
2012-11-13 17:27 ` Henrik Rydberg
2012-11-13 17:45 ` Benjamin Tissoires
2012-11-13 18:28 ` Henrik Rydberg
2012-11-13 18:43 ` Henrik Rydberg
2012-11-13 7:47 ` [PATCH v3 00/13] Win 8 support for digitizers Jiri Kosina
2012-11-13 8:12 ` Benjamin Tissoires
2012-11-13 17:33 ` Henrik Rydberg
2012-11-13 17:52 ` Benjamin Tissoires
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352306256-12180-14-git-send-email-benjamin.tissoires@gmail.com \
--to=benjamin.tissoires@gmail.com \
--cc=chatty@enac.fr \
--cc=dmitry.torokhov@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rydberg@euromail.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).