Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965440Ab2B1RUA (ORCPT ); Tue, 28 Feb 2012 12:20:00 -0500 Received: from stats.peacock.arvixe.com ([174.122.104.67]:50400 "EHLO peacock.arvixe.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756761Ab2B1RT5 (ORCPT ); Tue, 28 Feb 2012 12:19:57 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=firszt.eu; h=Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; b=ouXxQ5nzD8n+FtF5AI+banVpI0x+fsMUYETEw97bW8gNWpm1g+e9mgQ8b+n32GhiUk6wz2rkEv8gvdeDw4hKcMuZK+dZsk2UuRk1B5J/xNDRD8q25S7ZHrGmLXLrmj3b; From: Przemo Firszt To: jkosina@suse.cz, pinglinux@gmail.com, peter.hutterer@who-t.net Cc: linuxwacom-devel@lists.sourceforge.net, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Przemo Firszt Subject: [PATCH 2/2] HID: wacom: Add pad buttons reporting on Intuos4 WL Date: Tue, 28 Feb 2012 17:19:05 +0000 Message-Id: <1330449545-6217-2-git-send-email-przemo@firszt.eu> X-Mailer: git-send-email 1.7.6.4 In-Reply-To: <1330449545-6217-1-git-send-email-przemo@firszt.eu> References: <1330449545-6217-1-git-send-email-przemo@firszt.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - peacock.arvixe.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - firszt.eu Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3239 Lines: 89 This patch adds reporting of 1 wheel button and 8 strip buttons for Intuos4 WL. The buttons are reported as BTN_0 to BTN_9. The change of type butstate variable is required as the old type 'char' couldn't store state of 9 buttons. The change is not affecting Graphire tablet as it only uses first 2 bits of 'butstate'. Signed-off-by: Przemo Firszt Acked-by：Ping Cheng --- drivers/hid/hid-wacom.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index 5a58db2..58aedbc 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c @@ -31,9 +31,11 @@ #include "hid-ids.h" +#define PAD_DEVICE_ID 0x0F + struct wacom_data { __u16 tool; - unsigned char butstate; + __u16 butstate; __u8 features; __u32 id; __u32 serial; @@ -316,6 +318,30 @@ static int wacom_gr_parse_report(struct hid_device *hdev, return 1; } +static void wacom_i4_parse_button_report(struct wacom_data *wdata, + struct input_dev *input, unsigned char *data) +{ + __u16 new_butstate; + + new_butstate = (data[3] << 1) | (data[2] & 0x01); + if (new_butstate != wdata->butstate) { + wdata->butstate = new_butstate; + input_report_key(input, BTN_0, new_butstate & 0x001); + input_report_key(input, BTN_1, new_butstate & 0x002); + input_report_key(input, BTN_2, new_butstate & 0x004); + input_report_key(input, BTN_3, new_butstate & 0x008); + input_report_key(input, BTN_4, new_butstate & 0x010); + input_report_key(input, BTN_5, new_butstate & 0x020); + input_report_key(input, BTN_6, new_butstate & 0x040); + input_report_key(input, BTN_7, new_butstate & 0x080); + input_report_key(input, BTN_8, new_butstate & 0x100); + input_report_key(input, BTN_TOOL_FINGER, 1); + input_report_abs(input, ABS_MISC, PAD_DEVICE_ID); + input_event(input, EV_MSC, MSC_SERIAL, 0xffffffff); + input_sync(input); + } +} + static void wacom_i4_parse_pen_report(struct wacom_data *wdata, struct input_dev *input, unsigned char *data) { @@ -389,6 +415,7 @@ static void wacom_i4_parse_report(struct hid_device *hdev, wdata->features = data[2]; break; case 0x0C: /* Button report */ + wacom_i4_parse_button_report(wdata, input, data); break; default: hid_err(hdev, "Unknown report: %d,%d\n", data[0], data[1]); @@ -484,6 +511,13 @@ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi, break; case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH: __set_bit(ABS_MISC, input->absbit); + __set_bit(BTN_2, input->keybit); + __set_bit(BTN_3, input->keybit); + __set_bit(BTN_4, input->keybit); + __set_bit(BTN_5, input->keybit); + __set_bit(BTN_6, input->keybit); + __set_bit(BTN_7, input->keybit); + __set_bit(BTN_8, input->keybit); input_set_abs_params(input, ABS_X, 0, 40640, 4, 0); input_set_abs_params(input, ABS_Y, 0, 25400, 4, 0); input_set_abs_params(input, ABS_PRESSURE, 0, 2047, 0, 0); -- 1.7.6.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/