From patchwork Wed Nov 24 23:34:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 354932 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAONYGgr024635 for ; Wed, 24 Nov 2010 23:34:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756126Ab0KXXdw (ORCPT ); Wed, 24 Nov 2010 18:33:52 -0500 Received: from mail-gw0-f46.google.com ([74.125.83.46]:39247 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756042Ab0KXXdv (ORCPT ); Wed, 24 Nov 2010 18:33:51 -0500 Received: by mail-gw0-f46.google.com with SMTP id 20so177645gwj.19 for ; Wed, 24 Nov 2010 15:33:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=ZW5sYMwJ/L2qhz6fFQByordrLUwaVi6+vweG8az+QCo=; b=A4Sb8pMH5IKCLZeCuUScmskODJYLmiq1xxGm3s8K0S2Rfd17BaKjW60xzRchycB7F5 FOJ7csvzLniO0a6HRmEw+om+8Xc0sWk7sviy4qV/Lihp8rYVJNyICNgwgaM5SqsxG/Cn 86rQdXTsB1rSMSDugDiGVweLcUzgDcNj1LZ9k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=LvExWrQbZuX/Ur69caIc54+5mpoEd2G1y9kxLsDn7rHfk2pp5ldM7culeU6DGhewhh RcbPwsVQgMmTgTloOVAky7TfepDGQpBko0jSxIpOZm4Mxy8+YOVDbYiUp8utMn9C/gP9 grQMgcdPsQRzK4BrVSgqnuc+k/pDBu5rImW7Q= Received: by 10.90.253.6 with SMTP id a6mr1687124agi.41.1290641630172; Wed, 24 Nov 2010 15:33:50 -0800 (PST) Received: from localhost.localdomain ([204.119.25.150]) by mx.google.com with ESMTPS id e24sm57935ana.22.2010.11.24.15.33.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 24 Nov 2010 15:33:49 -0800 (PST) From: Ping Cheng To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Ping Cheng , Ping Cheng Subject: [PATCH] Update attributes defined on the tablet Date: Wed, 24 Nov 2010 15:34:10 -0800 Message-Id: <1290641650-4624-1-git-send-email-pinglinux@gmail.com> X-Mailer: git-send-email 1.7.2.3 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 24 Nov 2010 23:34:18 +0000 (UTC) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index b3252ef..9be6bc7 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -1059,6 +1059,7 @@ static void wacom_setup_cintiq(struct wacom_wac *wacom_wac) input_set_abs_params(input_dev, ABS_DISTANCE, 0, wacom_wac->features.distance_max, 0, 0); + input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0); input_set_abs_params(input_dev, ABS_WHEEL, 0, 1023, 0, 0); input_set_abs_params(input_dev, ABS_TILT_X, 0, 127, 0, 0); input_set_abs_params(input_dev, ABS_TILT_Y, 0, 127, 0, 0); @@ -1134,11 +1135,11 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, case WACOM_MO: __set_bit(BTN_1, input_dev->keybit); __set_bit(BTN_5, input_dev->keybit); - - input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0); + input_set_abs_params(input_dev, ABS_HAT0X, 0, 71, 0, 0); /* fall through */ case WACOM_G4: + input_set_capability(input_dev, EV_REL, REL_HWHEEL); input_set_capability(input_dev, EV_MSC, MSC_SERIAL); __set_bit(BTN_TOOL_FINGER, input_dev->keybit); @@ -1169,6 +1170,7 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, __set_bit(BTN_Z, input_dev->keybit); __set_bit(BTN_BASE, input_dev->keybit); __set_bit(BTN_BASE2, input_dev->keybit); + input_set_abs_params(input_dev, ABS_HAT0X, 0, 71, 0, 0); /* fall through */ case WACOM_BEE: @@ -1183,7 +1185,6 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0); input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0); - input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0); wacom_setup_cintiq(wacom_wac); break; @@ -1206,7 +1207,6 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, __set_bit(BTN_TOOL_FINGER, input_dev->keybit); input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0); - input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0); /* fall through */ case INTUOS: @@ -1224,7 +1224,7 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, __set_bit(BTN_0 + i, input_dev->keybit); __set_bit(BTN_TOOL_FINGER, input_dev->keybit); - input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0); + input_set_abs_params(input_dev, ABS_HAT0X, 0, 71, 0, 0); wacom_setup_intuos(wacom_wac); break;