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 --- Makefile | 2 +- debian/changelog | 6 ++++++ debian/postinst | 2 +- debian/postrm | 2 +- debian/prerm | 2 +- debian/rules | 2 +- usr/src/dkms_source_tree/dkms.conf | 2 +- usr/src/dkms_source_tree/hid-3m-pct.c | 6 +++++- 8 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 71ce72a..55c3dfb 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = hid-3m-pct -VERSION = 1.0.3 +VERSION = 1.0.4 SRC = usr/src TARBALL = $(NAME)-$(VERSION).dkms.tar.gz diff --git a/debian/changelog b/debian/changelog index e78b89f..0ff0656 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hid-3m-pct-dkms (1.0.4) maverick; urgency=low + + * Sync with version applied upstream (jikos tree) + + -- Henrik Rydberg Thu, 23 Sep 2010 14:06:24 +0200 + hid-3m-pct-dkms (1.0.3) maverick; urgency=low * Adjust contact size to scale diff --git a/debian/postinst b/debian/postinst index e1b32f4..cff9255 100644 --- a/debian/postinst +++ b/debian/postinst @@ -3,7 +3,7 @@ set -e NAME=hid-3m-pct -VERSION=1.0.2 +VERSION=1.0.4 case "$1" in configure) diff --git a/debian/postrm b/debian/postrm index b92e2cf..e909220 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,7 +1,7 @@ #!/bin/sh NAME=hid-3m-pct -VERSION=1.0.2 +VERSION=1.0.4 set -e diff --git a/debian/prerm b/debian/prerm index 86f7e93..ea00d46 100644 --- a/debian/prerm +++ b/debian/prerm @@ -1,7 +1,7 @@ #!/bin/sh NAME=hid-3m-pct -VERSION=1.0.2 +VERSION=1.0.4 set -e diff --git a/debian/rules b/debian/rules index dc4366d..3a5bdf7 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ #export DH_VERBOSE=1 NAME=hid-3m-pct -VERSION=1.0.2 +VERSION=1.0.4 configure: configure-stamp configure-stamp: 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