Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Input: wacom_i2c - implement hovering capability

Browse Source 
Although BTN_TOOL_PEN and BTN_TOOL_RUBBER functioned properly, the driver
didn't have hover functionality, so it's been added.

Also, "WACOM_RETRY_CNT" was not used, so it was removed.

Signed-off-by: Tatsunosuke Tobita <tobita.tatsunosuke@wacom.co.jp>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Tatsunosuke Tobita 2013-06-18 23:13:28 -07:00 committed by Dmitry Torokhov
parent 9eb521394e
commit 8855f30cd2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/input/touchscreen/wacom_i2c.c
View File

@ -1,7 +1,7 @@
/* /*
* Wacom Penabled Driver for I2C * Wacom Penabled Driver for I2C
* *
* Copyright (c) 2011 Tatsunosuke Tobita, Wacom. * Copyright (c) 2011 - 2013 Tatsunosuke Tobita, Wacom.
* <tobita.tatsunosuke@wacom.co.jp> * <tobita.tatsunosuke@wacom.co.jp>
* *
* This program is free software; you can redistribute it * This program is free software; you can redistribute it
@ -27,7 +27,6 @@
#define WACOM_CMD_THROW0 0x05 #define WACOM_CMD_THROW0 0x05
#define WACOM_CMD_THROW1 0x00 #define WACOM_CMD_THROW1 0x00
#define WACOM_QUERY_SIZE 19 #define WACOM_QUERY_SIZE 19
#define WACOM_RETRY_CNT 100
struct wacom_features { struct wacom_features {
int x_max; int x_max;
@ -40,6 +39,8 @@ struct wacom_i2c {
struct i2c_client *client; struct i2c_client *client;
struct input_dev *input; struct input_dev *input;
u8 data[WACOM_QUERY_SIZE]; u8 data[WACOM_QUERY_SIZE];
bool prox;
int tool;
}; };
static int wacom_query_device(struct i2c_client *client, static int wacom_query_device(struct i2c_client *client,
@ -112,9 +113,14 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
y = le16_to_cpup((__le16 *)&data[6]); y = le16_to_cpup((__le16 *)&data[6]);
pressure = le16_to_cpup((__le16 *)&data[8]); pressure = le16_to_cpup((__le16 *)&data[8]);
if (!wac_i2c->prox)
wac_i2c->tool = (data[3] & 0x0c) ?
BTN_TOOL_RUBBER : BTN_TOOL_PEN;
wac_i2c->prox = data[3] & 0x20;
input_report_key(input, BTN_TOUCH, tsw || ers); input_report_key(input, BTN_TOUCH, tsw || ers);
input_report_key(input, BTN_TOOL_PEN, tsw); input_report_key(input, wac_i2c->tool, wac_i2c->prox);
input_report_key(input, BTN_TOOL_RUBBER, ers);
input_report_key(input, BTN_STYLUS, f1); input_report_key(input, BTN_STYLUS, f1);
input_report_key(input, BTN_STYLUS2, f2); input_report_key(input, BTN_STYLUS2, f2);
input_report_abs(input, ABS_X, x); input_report_abs(input, ABS_X, x);