Patchwork [09/16] HID: add pressure support for the Stantum multitouch panel

login
register
mail settings
Submitter Andy Whitcroft
Date March 30, 2010, 7:40 p.m.
Message ID <1269978023-3602-10-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/49023/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Andy Whitcroft - March 30, 2010, 7:40 p.m.
From: Stephane Chatty <chatty@lii-enac.fr>

Added pressure handling for Stantum multitouch panels

Signed-off-by: Stephane Chatty <chatty@enac.fr>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit 580363db92572cccbe6226bf83321e50a9ea50ea)

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 drivers/hid/hid-stantum.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

Patch

diff --git a/drivers/hid/hid-stantum.c b/drivers/hid/hid-stantum.c
index 1b7b165..04b0b98 100644
--- a/drivers/hid/hid-stantum.c
+++ b/drivers/hid/hid-stantum.c
@@ -66,7 +66,6 @@  static int stantum_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 		case HID_DG_DEVICEINDEX:
 		case HID_DG_CONTACTCOUNT:
 		case HID_DG_CONTACTMAX:
-		case HID_DG_TIPPRESSURE:
 			return -1;
 
 		case HID_DG_TIPSWITCH:
@@ -84,6 +83,11 @@  static int stantum_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 			input_set_abs_params(hi->input, ABS_MT_ORIENTATION,
 					1, 1, 0, 0);
 			return 1;
+		case HID_DG_TIPPRESSURE:
+			hid_map_usage(hi, usage, bit, max,
+					EV_ABS, ABS_MT_PRESSURE);
+			return 1;
+
 		case HID_DG_CONTACTID:
 			hid_map_usage(hi, usage, bit, max,
 					EV_ABS, ABS_MT_TRACKING_ID);
@@ -140,10 +144,7 @@  static void stantum_filter_event(struct stantum_data *sd,
 	input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR, wide ? sd->w : sd->h);
 	input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR, wide ? sd->h : sd->w);
 
-#if 0
-	/* MT_PRESSURE does not exist yet */
 	input_event(input, EV_ABS, ABS_MT_PRESSURE, sd->z);
-#endif
 
 	input_mt_sync(input);
 	sd->valid = false;