From patchwork Sat Jun 25 00:15:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 917862 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5P0DrMd022572 for ; Sat, 25 Jun 2011 00:14:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750896Ab1FYAOL (ORCPT ); Fri, 24 Jun 2011 20:14:11 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:50012 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750799Ab1FYAOL (ORCPT ); Fri, 24 Jun 2011 20:14:11 -0400 Received: by pwj7 with SMTP id 7so2074697pwj.19 for ; Fri, 24 Jun 2011 17:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=tHZ0XhPdnT47MPRD87hhfICp207rOdeahnw353nfolw=; b=Knt3Hp/84jpnwl7577rZTdpTeBB9cG6B6+3jUCEloFw9KH+HGbE27kyazkraBLaRcq HxMG+dokHIlndqAyeLQeTOFJXpWX3f2mkuxZbwcbSi4ftAZ6fMHpXxQLRtiJdrqAPP0X aAS/Ripb1dtU4eVrWiysXxBRmDCKM9OIOsa44= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=fuQXrdxjGDOyZYpx+p2+GeXVPrSP8t1SwGYuCsBRgeYAStUxsWir4pDEbDL3iNyndA Jz8gOO5fyV4CnE/YTFuKWmbGY9PIBpYwkAN3ZB96LWFGnES0GTmoBQEWyxd5kMOSkqy+ YZRnoVAYHLvBYp4uyjG6VBl/ElPPpOct1D8nQ= Received: by 10.142.136.18 with SMTP id j18mr770416wfd.284.1308960850548; Fri, 24 Jun 2011 17:14:10 -0700 (PDT) Received: from localhost.localdomain ([67.51.163.10]) by mx.google.com with ESMTPS id v6sm2423019pbh.6.2011.06.24.17.14.09 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Jun 2011 17:14:10 -0700 (PDT) From: Ping Cheng To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Ping Cheng , Ping Cheng Subject: [PATCH 3/4] input : wacom - Remove BTN_TOOL_FINGER for pad Date: Fri, 24 Jun 2011 17:15:39 -0700 Message-Id: <1308960939-20510-1-git-send-email-pinglinux@gmail.com> X-Mailer: git-send-email 1.7.5.4 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.6 (demeter2.kernel.org [140.211.167.43]); Sat, 25 Jun 2011 00:14:12 +0000 (UTC) BTN_TOOL_FINGER was designed to indicate a single finger touch. Remove the lines that borrowed this type for expresskeys and tablet buttons. Signed-off-by: Ping Cheng --- drivers/input/tablet/wacom_wac.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 0c302c9..7ce1294 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -278,7 +278,6 @@ static int wacom_graphire_irq(struct wacom_wac *wacom) input_report_key(input, BTN_4, (data[7] & 0x80)); rw = ((data[7] & 0x18) >> 3) - ((data[7] & 0x20) >> 3); input_report_rel(input, REL_WHEEL, rw); - input_report_key(input, BTN_TOOL_FINGER, 0xf0); if (!prox) wacom->id[1] = 0; input_report_abs(input, ABS_MISC, wacom->id[1]); @@ -296,7 +295,6 @@ static int wacom_graphire_irq(struct wacom_wac *wacom) input_report_key(input, BTN_4, (data[7] & 0x10)); input_report_key(input, BTN_5, (data[7] & 0x40)); input_report_abs(input, ABS_WHEEL, (data[8] & 0x7f)); - input_report_key(input, BTN_TOOL_FINGER, 0xf0); if (!prox) wacom->id[1] = 0; input_report_abs(input, ABS_MISC, wacom->id[1]); @@ -495,10 +493,6 @@ static int wacom_intuos_irq(struct wacom_wac *wacom) /* pad packets. Works as a second tool and is always in prox */ if (data[0] == WACOM_REPORT_INTUOSPAD) { - /* initiate the pad as a device */ - if (wacom->tool[1] != BTN_TOOL_FINGER) - wacom->tool[1] = BTN_TOOL_FINGER; - if (features->type >= INTUOS4S && features->type <= INTUOS4L) { input_report_key(input, BTN_0, (data[2] & 0x01)); input_report_key(input, BTN_1, (data[3] & 0x01)); @@ -1090,7 +1084,6 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, case WACOM_G4: input_set_capability(input_dev, EV_MSC, MSC_SERIAL); - __set_bit(BTN_TOOL_FINGER, input_dev->keybit); __set_bit(BTN_0, input_dev->keybit); __set_bit(BTN_4, input_dev->keybit); /* fall through */ @@ -1128,7 +1121,6 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, case CINTIQ: for (i = 0; i < 8; i++) __set_bit(BTN_0 + i, input_dev->keybit); - __set_bit(BTN_TOOL_FINGER, input_dev->keybit); if (wacom_wac->features.type != WACOM_21UX2) { input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0); @@ -1155,8 +1147,6 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, __set_bit(BTN_2, input_dev->keybit); __set_bit(BTN_3, input_dev->keybit); - __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 */ @@ -1174,7 +1164,6 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, case INTUOS4S: for (i = 0; i < 7; i++) __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); wacom_setup_intuos(wacom_wac);