HID-over-I2C requires data at the first two bytes for describing
the input report length, but the current wacom.ko doesn't have
such space and this makes the input outcome messed.
Also, another report ID for Wacom AES type device is defined.
Signed-off-by: Tatsunosuke Tobita <tobita.tatsunosuke@xxxxxxxxxxx>
---
drivers/hid/wacom_sys.c | 6 +++++-
drivers/hid/wacom_wac.c | 28 ++++++++++++++++------------
drivers/hid/wacom_wac.h | 2 ++
3 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 499cc82..95be318 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -1886,7 +1886,11 @@ static int wacom_probe(struct hid_device *hdev,
hid_warn(hdev,
"can't create sysfs speed attribute err: %d\n",
error);
- }
+
+ /*HID Over I2C spec requires 2 bytes at the head of*/
+ /*Input report for length description*/
+ } else if (hdev->bus == BUS_I2C)
+ wacom_wac->data_head = 2;
return 0;
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 1eae13c..c352d40 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -1229,8 +1229,9 @@ static int wacom_mt_touch(struct wacom_wac *wacom)
{
struct input_dev *input = wacom->touch_input;
unsigned char *data = wacom->data;
+ unsigned char data_head = wacom->data_head;
int i;
- int current_num_contacts = data[2];
+ int current_num_contacts = data[data_head + 2];
int contacts_to_send = 0;
int x_offset = 0;
@@ -1249,7 +1250,8 @@ static int wacom_mt_touch(struct wacom_wac *wacom)
contacts_to_send = min(5, wacom->num_contacts_left);
for (i = 0; i < contacts_to_send; i++) {
- int offset = (WACOM_BYTES_PER_MT_PACKET + x_offset) * i + 3;
+ int offset = (WACOM_BYTES_PER_MT_PACKET
+ + x_offset) * (data_head + i) + 3;
bool touch = (data[offset] & 0x1) && !wacom->shared->stylus_in_proximity;
int id = get_unaligned_le16(&data[offset + 1]);
int slot = input_mt_get_slot_by_key(input, id);
@@ -1343,25 +1344,31 @@ static int wacom_tpc_single_touch(struct wacom_wac *wacom, size_t len)
static int wacom_tpc_pen(struct wacom_wac *wacom)
{
unsigned char *data = wacom->data;
+ unsigned char data_head = wacom->data_head;
struct input_dev *input = wacom->pen_input;
- bool prox = data[1] & 0x20;
+ bool prox = data[data_head + 1] & 0x20;
if (!wacom->shared->stylus_in_proximity) /* first in prox */
/* Going into proximity select tool */
- wacom->tool[0] = (data[1] & 0x0c) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
+ wacom->tool[data_head]
+ = (data[data_head + 1] & 0x0c) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
/* keep pen state for touch events */
wacom->shared->stylus_in_proximity = prox;
/* send pen events only when touch is up or forced out */
if (!wacom->shared->touch_down) {
- input_report_key(input, BTN_STYLUS, data[1] & 0x02);
- input_report_key(input, BTN_STYLUS2, data[1] & 0x10);
- input_report_abs(input, ABS_X, le16_to_cpup((__le16 *)&data[2]));
- input_report_abs(input, ABS_Y, le16_to_cpup((__le16 *)&data[4]));
- input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x07) << 8) | data[6]);
- input_report_key(input, BTN_TOUCH, data[1] & 0x05);
- input_report_key(input, wacom->tool[0], prox);
+ input_report_key(input, BTN_STYLUS, data[data_head + 1] & 0x02);
+ input_report_key(input, BTN_STYLUS2,
+ data[data_head + 1] & 0x10);
+ input_report_abs(input, ABS_X,
+ le16_to_cpup((__le16 *)&data[data_head + 2]));
+ input_report_abs(input, ABS_Y,
+ le16_to_cpup((__le16 *)&data[data_head + 4]));
+ input_report_abs(input, ABS_PRESSURE, ((data[data_head + 7]
+ & 0x07) << 8) | data[data_head + 6]);
+ input_report_key(input, BTN_TOUCH, data[data_head + 1] & 0x05);
+ input_report_key(input, wacom->tool[data_head], prox);
return 1;
}
@@ -1371,6 +1373,7 @@ static int wacom_tpc_pen(struct wacom_wac *wacom)
static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)
{
unsigned char *data = wacom->data;
+ unsigned char data_head = wacom->data_head;
if (wacom->pen_input)
dev_dbg(wacom->pen_input->dev.parent,
@@ -1390,7 +1393,7 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)
return wacom_tpc_pen(wacom);
default:
- switch (data[0]) {
+ switch (data[data_head]) {
case WACOM_REPORT_TPC1FG:
case WACOM_REPORT_TPCHID:
case WACOM_REPORT_TPCST:
@@ -1399,6 +1402,7 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)
case WACOM_REPORT_TPCMT:
case WACOM_REPORT_TPCMT2:
+ case WACOM_REPORT_TPCMTHID:
return wacom_mt_touch(wacom);
case WACOM_REPORT_PENABLED:
diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index 53d1653..c992c2c 100644
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -71,6 +71,7 @@
#define WACOM_REPORT_INTUOS_PEN 16
#define WACOM_REPORT_REMOTE 17
#define WACOM_REPORT_INTUOSHT2_ID 8
+#define WACOM_REPORT_TPCMTHID 12
/* device quirks */
#define WACOM_QUIRK_BBTOUCH_LOWRES 0x0001
@@ -248,6 +249,7 @@ struct wacom_wac {
int mode_report;
int mode_value;
struct hid_data hid_data;
+ unsigned char data_head;
};
#endif
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
