summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
Diffstat (limited to 'usr')
-rw-r--r--usr/src/dkms_source_tree/dkms.conf2
-rw-r--r--usr/src/dkms_source_tree/hid-3m-pct.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/dkms_source_tree/dkms.conf b/usr/src/dkms_source_tree/dkms.conf
index beb43ec..07fa228 100644
--- a/usr/src/dkms_source_tree/dkms.conf
+++ b/usr/src/dkms_source_tree/dkms.conf
@@ -1,5 +1,5 @@
1NAME=hid-3m-pct 1NAME=hid-3m-pct
2VERSION=1.0.2 2VERSION=1.0.4
3PACKAGE_NAME="$NAME" 3PACKAGE_NAME="$NAME"
4PACKAGE_VERSION="$VERSION" 4PACKAGE_VERSION="$VERSION"
5MAKE[0]="make -C ${kernel_source_dir} 5MAKE[0]="make -C ${kernel_source_dir}
diff --git a/usr/src/dkms_source_tree/hid-3m-pct.c b/usr/src/dkms_source_tree/hid-3m-pct.c
index cd4b125..02d8cd3 100644
--- a/usr/src/dkms_source_tree/hid-3m-pct.c
+++ b/usr/src/dkms_source_tree/hid-3m-pct.c
@@ -2,6 +2,8 @@
2 * HID driver for 3M PCT multitouch panels 2 * HID driver for 3M PCT multitouch panels
3 * 3 *
4 * Copyright (c) 2009-2010 Stephane Chatty <chatty@enac.fr> 4 * Copyright (c) 2009-2010 Stephane Chatty <chatty@enac.fr>
5 * Copyright (c) 2010 Henrik Rydberg <rydberg@euromail.se>
6 * Copyright (c) 2010 Canonical, Ltd.
5 * 7 *
6 */ 8 */
7 9
@@ -27,6 +29,8 @@ MODULE_LICENSE("GPL");
27#define MAX_SLOTS 60 29#define MAX_SLOTS 60
28#define MAX_TRKID USHRT_MAX 30#define MAX_TRKID USHRT_MAX
29#define MAX_EVENTS 360 31#define MAX_EVENTS 360
32
33/* estimated signal-to-noise ratios */
30#define SN_MOVE 2048 34#define SN_MOVE 2048
31#define SN_WIDTH 128 35#define SN_WIDTH 128
32 36
@@ -110,7 +114,7 @@ static int mmm_input_mapping(struct hid_device *hdev, struct hid_input *hi,
110 input_set_abs_params(hi->input, ABS_MT_TOUCH_MINOR, 114 input_set_abs_params(hi->input, ABS_MT_TOUCH_MINOR,
111 f1, f2, df / SN_WIDTH, 0); 115 f1, f2, df / SN_WIDTH, 0);
112 input_set_abs_params(hi->input, ABS_MT_ORIENTATION, 116 input_set_abs_params(hi->input, ABS_MT_ORIENTATION,
113 1, 1, 0, 0); 117 0, 1, 0, 0);
114 return 1; 118 return 1;
115 case HID_DG_CONTACTID: 119 case HID_DG_CONTACTID:
116 field->logical_maximum = MAX_TRKID; 120 field->logical_maximum = MAX_TRKID;