From: Henrik Rydberg <rydberg@euromail.se>

Date: Sun, 5 Sep 2010 19:53:16 +0000 (-0700)

Subject: Input: wacom - add support for the Bamboo Touch trackpad

X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdtor%2Finput.git;a=commitdiff_plain;h=cb734c03680eaaad64a20a666300eafd1ac260b2

Input: wacom - add support for the Bamboo Touch trackpad

Add support for the Bamboo Touch trackpad, and make it work with

both the Synaptics X Driver and the Multitouch X Driver. The device

uses MT slots internally, so the choice of protocol is a given.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

Acked-by: Ping Cheng <pingc@wacom.com>

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

---

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c

index 44b4a59..4e9b1dd 100644

--- a/drivers/input/tablet/wacom_wac.c

+++ b/drivers/input/tablet/wacom_wac.c

@@ -855,6 +855,53 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)

 	return retval;

 }

+static int wacom_bpt_irq(struct wacom_wac *wacom, size_t len)

+{

+	struct input_dev *input = wacom->input;

+	unsigned char *data = wacom->data;

+	int sp = 0, sx = 0, sy = 0, count = 0;

+	int i;

+

+	if (len != WACOM_PKGLEN_BBTOUCH)

+		return 0;

+

+	for (i = 0; i < 2; i++) {

+		int p = data[9 * i + 2];

+		input_mt_slot(input, i);

+		if (p) {

+			int x = get_unaligned_be16(&data[9 * i + 3]) & 0x7ff;

+			int y = get_unaligned_be16(&data[9 * i + 5]) & 0x7ff;

+			input_report_abs(input, ABS_MT_PRESSURE, p);

+			input_report_abs(input, ABS_MT_POSITION_X, x);

+			input_report_abs(input, ABS_MT_POSITION_Y, y);

+			if (wacom->id[i] < 0)

+				wacom->id[i] = wacom->trk_id++ & MAX_TRACKING_ID;

+			if (!count++)

+				sp = p, sx = x, sy = y;

+		} else {

+			wacom->id[i] = -1;

+		}

+		input_report_abs(input, ABS_MT_TRACKING_ID, wacom->id[i]);

+	}

+

+	input_report_key(input, BTN_TOUCH, count > 0);

+	input_report_key(input, BTN_TOOL_FINGER, count == 1);

+	input_report_key(input, BTN_TOOL_DOUBLETAP, count == 2);

+

+	input_report_abs(input, ABS_PRESSURE, sp);

+	input_report_abs(input, ABS_X, sx);

+	input_report_abs(input, ABS_Y, sy);

+

+	input_report_key(input, BTN_LEFT, (data[1] & 0x08) != 0);

+	input_report_key(input, BTN_FORWARD, (data[1] & 0x04) != 0);

+	input_report_key(input, BTN_BACK, (data[1] & 0x02) != 0);

+	input_report_key(input, BTN_RIGHT, (data[1] & 0x01) != 0);

+

+	input_sync(input);

+

+	return 0;

+}

+

 void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)

 {

 	bool sync;

@@ -900,6 +947,10 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)

 		sync = wacom_tpc_irq(wacom_wac, len);

 		break;

+	case BAMBOO_PT:

+		sync = wacom_bpt_irq(wacom_wac, len);

+		break;

+

 	default:

 		sync = false;

 		break;

@@ -955,6 +1006,13 @@ void wacom_setup_device_quirks(struct wacom_features *features)

 	if (features->type == TABLETPC || features->type == TABLETPC2FG ||

 	    features->type == BAMBOO_PT)

 		features->quirks |= WACOM_QUIRK_MULTI_INPUT;

+

+	/* quirks for bamboo touch */

+	if (features->type == BAMBOO_PT &&

+	    features->device_type == BTN_TOOL_TRIPLETAP) {

+		features->pressure_max = 256;

+		features->pressure_fuzz = 16;

+	}

 }

 void wacom_setup_input_capabilities(struct input_dev *input_dev,

@@ -1095,6 +1153,33 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,

 	case PENPARTNER:

 		__set_bit(BTN_TOOL_RUBBER, input_dev->keybit);

 		break;

+

+	case BAMBOO_PT:

+		__clear_bit(ABS_MISC, input_dev->absbit);

+

+		if (features->device_type == BTN_TOOL_TRIPLETAP) {

+			__set_bit(BTN_LEFT, input_dev->keybit);

+			__set_bit(BTN_FORWARD, input_dev->keybit);

+			__set_bit(BTN_BACK, input_dev->keybit);

+			__set_bit(BTN_RIGHT, input_dev->keybit);

+

+			__set_bit(BTN_TOOL_FINGER, input_dev->keybit);

+			__set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);

+

+			input_mt_create_slots(input_dev, 2);

+			input_set_abs_params(input_dev, ABS_MT_POSITION_X,

+					     0, features->x_max,

+					     features->x_fuzz, 0);

+			input_set_abs_params(input_dev, ABS_MT_POSITION_Y,

+					     0, features->y_max,

+					     features->y_fuzz, 0);

+			input_set_abs_params(input_dev, ABS_MT_PRESSURE,

+					     0, features->pressure_max,

+					     features->pressure_fuzz, 0);

+			input_set_abs_params(input_dev, ABS_MT_TRACKING_ID, 0,

+					     MAX_TRACKING_ID, 0, 0);

+		}

+		break;

 	}

 }

@@ -1232,6 +1317,8 @@ static const struct wacom_features wacom_features_0xE3 =

 	{ "Wacom ISDv4 E3",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG };

 static const struct wacom_features wacom_features_0x47 =

 	{ "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS };

+static struct wacom_features wacom_features_0xD0 =

+	{ "Wacom Bamboo 2FG",     WACOM_PKGLEN_BBFUN,     14720,  9200, 1023, 63, BAMBOO_PT };

 #define USB_DEVICE_WACOM(prod)					\

 	USB_DEVICE(USB_VENDOR_ID_WACOM, prod),			\

@@ -1296,6 +1383,7 @@ const struct usb_device_id wacom_ids[] = {

 	{ USB_DEVICE_WACOM(0xC6) },

 	{ USB_DEVICE_WACOM(0xC7) },

 	{ USB_DEVICE_WACOM(0xCE) },

+	{ USB_DEVICE_WACOM(0xD0) },

 	{ USB_DEVICE_WACOM(0xF0) },

 	{ USB_DEVICE_WACOM(0xCC) },

 	{ USB_DEVICE_WACOM(0x90) },

diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h

index 6a1ff10..a23d6a5 100644

--- a/drivers/input/tablet/wacom_wac.h

+++ b/drivers/input/tablet/wacom_wac.h

@@ -41,6 +41,9 @@

 /* device quirks */

 #define WACOM_QUIRK_MULTI_INPUT		0x0001

+/* largest reported tracking id */

+#define MAX_TRACKING_ID			0xfff

+

 enum {

 	PENPARTNER = 0,

 	GRAPHIRE,

@@ -96,6 +99,7 @@ struct wacom_wac {

 	int id[3];

 	__u32 serial[2];

 	int last_finger;

+	int trk_id;

 	struct wacom_features features;

 	struct wacom_shared *shared;

 	struct input_dev *input;