lkml.org 
[lkml]   [2012]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/2] HID: wacom: Add reporting of wheel for Intuos4 WL
Date
This patch adds reporting of ABS_WHEEL event. Raported walues are 0..71
and are related to absolute location of the finger on the wheel.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
---
drivers/hid/hid-wacom.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 5c25036..6f65514 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -36,6 +36,7 @@
struct wacom_data {
__u16 tool;
__u16 butstate;
+ __u8 whlstate;
__u8 features;
__u32 id;
__u32 serial;
@@ -322,6 +323,16 @@ static void wacom_i4_parse_button_report(struct wacom_data *wdata,
struct input_dev *input, unsigned char *data)
{
__u16 new_butstate;
+ __u8 new_whlstate;
+ __u8 sync = 0;
+
+ new_whlstate = data[1] & 0x7f;
+ if (new_whlstate != wdata->whlstate) {
+ wdata->whlstate = new_whlstate;
+ input_report_key(input, BTN_TOUCH, 1);
+ input_report_abs(input, ABS_WHEEL, new_whlstate);
+ sync = 1;
+ }

new_butstate = (data[3] << 1) | (data[2] & 0x01);
if (new_butstate != wdata->butstate) {
@@ -335,6 +346,10 @@ static void wacom_i4_parse_button_report(struct wacom_data *wdata,
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);
+ sync = 1;
+ }
+
+ if (sync) {
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);
@@ -354,6 +369,7 @@ static void wacom_i4_parse_pen_report(struct wacom_data *wdata,
input_report_abs(input, ABS_PRESSURE, 0);
input_report_key(input, BTN_STYLUS, 0);
input_report_key(input, BTN_STYLUS2, 0);
+ input_report_abs(input, ABS_WHEEL, 0);
input_report_key(input, wdata->tool, 0);
input_report_abs(input, ABS_MISC, 0);
input_event(input, EV_MSC, MSC_SERIAL, wdata->serial);
@@ -512,6 +528,9 @@ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi,
input_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);
break;
case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH:
+ __set_bit(ABS_WHEEL, input->absbit);
+ input_set_abs_params(input, ABS_WHEEL, 0, 71, 0, 0);
+ input_set_capability(input, EV_MSC, MSC_SERIAL);
__set_bit(ABS_MISC, input->absbit);
__set_bit(BTN_2, input->keybit);
__set_bit(BTN_3, input->keybit);
--
1.7.6.4


\
 
 \ /
  Last update: 2012-03-09 14:23    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site