From b90dbef8feab747b28bbd7a7cb282b22a6deb4b4 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Thu, 23 Sep 2010 14:06:43 +0200 Subject: Sync with Upstream version applied to jikos tree Signed-off-by: Henrik Rydberg --- usr/src/dkms_source_tree/dkms.conf | 2 +- usr/src/dkms_source_tree/hid-3m-pct.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'usr/src/dkms_source_tree') 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 @@ NAME=hid-3m-pct -VERSION=1.0.2 +VERSION=1.0.4 PACKAGE_NAME="$NAME" PACKAGE_VERSION="$VERSION" MAKE[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 @@ * HID driver for 3M PCT multitouch panels * * Copyright (c) 2009-2010 Stephane Chatty + * Copyright (c) 2010 Henrik Rydberg + * Copyright (c) 2010 Canonical, Ltd. * */ @@ -27,6 +29,8 @@ MODULE_LICENSE("GPL"); #define MAX_SLOTS 60 #define MAX_TRKID USHRT_MAX #define MAX_EVENTS 360 + +/* estimated signal-to-noise ratios */ #define SN_MOVE 2048 #define SN_WIDTH 128 @@ -110,7 +114,7 @@ static int mmm_input_mapping(struct hid_device *hdev, struct hid_input *hi, input_set_abs_params(hi->input, ABS_MT_TOUCH_MINOR, f1, f2, df / SN_WIDTH, 0); input_set_abs_params(hi->input, ABS_MT_ORIENTATION, - 1, 1, 0, 0); + 0, 1, 0, 0); return 1; case HID_DG_CONTACTID: field->logical_maximum = MAX_TRKID; -- cgit v1.2.3