linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v4 01/14] HID: hid-input: export hidinput_calc_abs_res
Date: Wed, 14 Nov 2012 16:59:13 +0100	[thread overview]
Message-ID: <1352908766-4492-2-git-send-email-benjamin.tissoires@gmail.com> (raw)
In-Reply-To: <1352908766-4492-1-git-send-email-benjamin.tissoires@gmail.com>

Exporting the function allows us to calculate the resolution in third
party drivers like hid-multitouch.
This patch also complete the function with additional valid axes.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
---
 drivers/hid/hid-input.c      | 9 ++++++++-
 drivers/hid/hid-multitouch.c | 1 +
 include/linux/hid.h          | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 10248cf..f5b1d57 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -208,7 +208,7 @@ static int hidinput_setkeycode(struct input_dev *dev,
  * Only exponent 1 length units are processed. Centimeters and inches are
  * converted to millimeters. Degrees are converted to radians.
  */
-static __s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code)
+__s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code)
 {
 	__s32 unit_exponent = field->unit_exponent;
 	__s32 logical_extents = field->logical_maximum -
@@ -229,6 +229,12 @@ static __s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code)
 	case ABS_X:
 	case ABS_Y:
 	case ABS_Z:
+	case ABS_MT_POSITION_X:
+	case ABS_MT_POSITION_Y:
+	case ABS_MT_TOOL_X:
+	case ABS_MT_TOOL_Y:
+	case ABS_MT_TOUCH_MAJOR:
+	case ABS_MT_TOUCH_MINOR:
 		if (field->unit == 0x11) {		/* If centimeters */
 			/* Convert to millimeters */
 			unit_exponent += 1;
@@ -283,6 +289,7 @@ static __s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code)
 	/* Calculate resolution */
 	return logical_extents / physical_extents;
 }
+EXPORT_SYMBOL_GPL(hidinput_calc_abs_res);
 
 #ifdef CONFIG_HID_BATTERY_STRENGTH
 static enum power_supply_property hidinput_battery_props[] = {
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 3eb02b9..9f64e36 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -298,6 +298,7 @@ static void set_abs(struct input_dev *input, unsigned int code,
 	int fmax = field->logical_maximum;
 	int fuzz = snratio ? (fmax - fmin) / snratio : 0;
 	input_set_abs_params(input, code, fmin, fmax, fuzz, 0);
+	input_abs_set_res(input, code, hidinput_calc_abs_res(field, code));
 }
 
 static void mt_store_field(struct hid_usage *usage, struct mt_device *td,
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 7e1f37d..9edb06c 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -743,6 +743,7 @@ int hid_input_report(struct hid_device *, int type, u8 *, int, int);
 int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field);
 struct hid_field *hidinput_get_led_field(struct hid_device *hid);
 unsigned int hidinput_count_leds(struct hid_device *hid);
+__s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code);
 void hid_output_report(struct hid_report *report, __u8 *data);
 struct hid_device *hid_allocate_device(void);
 struct hid_report *hid_register_report(struct hid_device *device, unsigned type, unsigned id);
-- 
1.8.0

  reply	other threads:[~2012-11-14 15:59 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-14 15:59 [PATCH v4 00/14] Win 8 support for digitizers Benjamin Tissoires
2012-11-14 15:59 ` Benjamin Tissoires [this message]
2012-11-14 15:59 ` [PATCH v4 02/14] HID: hid-input: round return value of hidinput_calc_abs_res Benjamin Tissoires
2012-11-14 15:59 ` [PATCH v4 03/14] HID: core: fix unit exponent parsing Benjamin Tissoires
2012-11-14 15:59 ` [PATCH v4 04/14] HID: hid-input: add usage_index in struct hid_usage Benjamin Tissoires
2012-11-14 15:59 ` [PATCH v4 05/14] HID: hid-multitouch: support arrays for the split of the touches in a report Benjamin Tissoires
2012-11-14 15:59 ` [PATCH v4 06/14] HID: hid-multitouch: get maxcontacts also from logical_max value Benjamin Tissoires
2012-11-14 15:59 ` [PATCH v4 07/14] HID: hid-multitouch: support T and C for win8 devices Benjamin Tissoires
2012-11-14 15:59 ` [PATCH v4 08/14] HID: hid-multitouch: move ALWAYS_VALID quirk check Benjamin Tissoires
2012-11-14 15:59 ` [PATCH v4 09/14] Input: introduce EV_MSC Timestamp Benjamin Tissoires
2012-11-14 16:33   ` Dmitry Torokhov
2012-11-15  9:14     ` Jiri Kosina
2012-11-14 17:53   ` Henrik Rydberg
2012-11-14 15:59 ` [PATCH v4 10/14] Input: mt: add input_mt_is_used Benjamin Tissoires
2012-11-14 17:16   ` Henrik Rydberg
2012-11-14 15:59 ` [PATCH v4 11/14] HID: hid-multitouch: add MT_QUIRK_IGNORE_DUPLICATES Benjamin Tissoires
2012-11-14 18:08   ` Henrik Rydberg
2012-11-14 15:59 ` [PATCH v4 12/14] HID: hid-multitouch: support for hovering devices Benjamin Tissoires
2012-11-14 18:43   ` Henrik Rydberg
2012-11-14 15:59 ` [PATCH v4 13/14] HID: hid-multitouch: fix Win 8 protocol Benjamin Tissoires
2012-11-14 18:47   ` Henrik Rydberg
2012-11-14 15:59 ` [PATCH v4 14/14] HID: hid-multitouch: forwards MSC_TIMESTAMP Benjamin Tissoires
2012-11-14 19:58   ` Henrik Rydberg
2012-11-14 21:27     ` Benjamin Tissoires
2012-11-16 20:09       ` Henrik Rydberg
2012-11-19 14:50         ` Benjamin Tissoires
2012-11-20 20:51           ` Henrik Rydberg
2012-11-20 20:54             ` Henrik Rydberg
2012-11-22 20:12               ` Benjamin Tissoires
2012-11-22 21:03                 ` Henrik Rydberg
2012-11-14 20:01 ` [PATCH v4 00/14] Win 8 support for digitizers Henrik Rydberg
2012-11-15  9:33   ` Jiri Kosina
2012-11-15 11:11     ` 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=1352908766-4492-2-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).