Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f660f12 authored by Ping Cheng's avatar Ping Cheng Committed by Dmitry Torokhov
Browse files

Input: wacom - add support for Intuos4 tablets 



Signed-oof-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 9b771ac4

drivers/input/tablet/wacom.h

+4 −1
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
 *      v1.48 (pc) - Added support for Bamboo1, BambooFun, and Cintiq 12WX

 *      v1.49 (pc) - Added support for USB Tablet PC (0x90, 0x93, and 0x9A)

 *      v1.50 (pc) - Fixed a TabletPC touch bug in 2.6.28

 *      v1.51 (pc) - Added support for Intuos4

 */



/*
@@ -88,7 +89,7 @@ 
/*

 * Version Information

 */

#define DRIVER_VERSION "v1.50"

#define DRIVER_VERSION "v1.51"

#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"

#define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver"

#define DRIVER_LICENSE "GPL"
@@ -128,6 +129,8 @@ extern void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac 
extern void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_i4s(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_i4(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

drivers/input/tablet/wacom_sys.c

+13 −0
Original line number Diff line number Diff line
@@ -229,6 +229,19 @@ void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac) 
	input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);

}



void input_dev_i4s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);

	input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_0) | BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3);

	input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_4) | BIT_MASK(BTN_5) | BIT_MASK(BTN_6);

	input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);

}



void input_dev_i4(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_7) | BIT_MASK(BTN_8);

}



void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_8) | BIT_MASK(BTN_9);

drivers/input/tablet/wacom_wac.c

+128 −40
Original line number Diff line number Diff line
@@ -283,9 +283,10 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo) 
static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo)

{

	unsigned char *data = wacom->data;

	int idx;

	int idx = 0;



	/* tool number */

	if (wacom->features->type == INTUOS)

		idx = data[1] & 0x01;



	/* Enter report */
@@ -299,6 +300,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo) 
		switch (wacom->id[idx]) {

			case 0x812: /* Inking pen */

			case 0x801: /* Intuos3 Inking pen */

			case 0x20802: /* Intuos4 Classic Pen */

			case 0x012:

				wacom->tool[idx] = BTN_TOOL_PENCIL;

				break;
@@ -308,6 +310,9 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo) 
			case 0x823: /* Intuos3 Grip Pen */

			case 0x813: /* Intuos3 Classic Pen */

			case 0x885: /* Intuos3 Marker Pen */

			case 0x802: /* Intuos4 Grip Pen Eraser */

			case 0x804: /* Intuos4 Marker Pen */

			case 0x40802: /* Intuos4 Classic Pen */

			case 0x022:

				wacom->tool[idx] = BTN_TOOL_PEN;

				break;
@@ -319,10 +324,12 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo) 
		        case 0x09c:

			case 0x094:

			case 0x017: /* Intuos3 2D Mouse */

			case 0x806: /* Intuos4 Mouse */

				wacom->tool[idx] = BTN_TOOL_MOUSE;

				break;

			case 0x096: /* Lens cursor */

			case 0x097: /* Intuos3 Lens cursor */

			case 0x006: /* Intuos4 Lens cursor */

				wacom->tool[idx] = BTN_TOOL_LENS;

				break;

			case 0x82a: /* Eraser */
@@ -333,12 +340,17 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo) 
			case 0x82b: /* Intuos3 Grip Pen Eraser */

			case 0x81b: /* Intuos3 Classic Pen Eraser */

			case 0x91b: /* Intuos3 Airbrush Eraser */

			case 0x80c: /* Intuos4 Marker Pen Eraser */

			case 0x80a: /* Intuos4 Grip Pen Eraser */

			case 0x4080a: /* Intuos4 Classic Pen Eraser */

			case 0x90a: /* Intuos4 Airbrush Eraser */

				wacom->tool[idx] = BTN_TOOL_RUBBER;

				break;

			case 0xd12:

			case 0x912:

			case 0x112:

			case 0x913: /* Intuos3 Airbrush */

			case 0x902: /* Intuos4 Airbrush */

				wacom->tool[idx] = BTN_TOOL_AIRBRUSH;

				break;

			default: /* Unknown tool */
@@ -349,9 +361,15 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo) 


	/* Exit report */

	if ((data[1] & 0xfe) == 0x80) {

		/*

		 * Reset all states otherwise we lose the initial states

		 * when in-prox next time

		 */

		wacom_report_abs(wcombo, ABS_X, 0);

		wacom_report_abs(wcombo, ABS_Y, 0);

		wacom_report_abs(wcombo, ABS_DISTANCE, 0);

		wacom_report_abs(wcombo, ABS_TILT_X, 0);

		wacom_report_abs(wcombo, ABS_TILT_Y, 0);

		if (wacom->tool[idx] >= BTN_TOOL_MOUSE) {

			wacom_report_key(wcombo, BTN_LEFT, 0);

			wacom_report_key(wcombo, BTN_MIDDLE, 0);
@@ -362,8 +380,6 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo) 
			wacom_report_abs(wcombo, ABS_RZ, 0);

		} else {

			wacom_report_abs(wcombo, ABS_PRESSURE, 0);

			wacom_report_abs(wcombo, ABS_TILT_X, 0);

			wacom_report_abs(wcombo, ABS_TILT_Y, 0);

			wacom_report_key(wcombo, BTN_STYLUS, 0);

			wacom_report_key(wcombo, BTN_STYLUS2, 0);

			wacom_report_key(wcombo, BTN_TOUCH, 0);
@@ -372,6 +388,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom, void *wcombo) 
		wacom_report_key(wcombo, wacom->tool[idx], 0);

		wacom_report_abs(wcombo, ABS_MISC, 0); /* reset tool id */

		wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, wacom->serial[idx]);

		wacom->id[idx] = 0;

		return 2;

	}

	return 0;
@@ -385,6 +402,8 @@ static void wacom_intuos_general(struct wacom_wac *wacom, void *wcombo) 
	/* general pen packet */

	if ((data[1] & 0xb8) == 0xa0) {

		t = (data[6] << 2) | ((data[7] >> 6) & 3);

		if (wacom->features->type >= INTUOS4S && wacom->features->type <= INTUOS4L)

			t = (t << 1) | (data[1] & 1);

		wacom_report_abs(wcombo, ABS_PRESSURE, t);

		wacom_report_abs(wcombo, ABS_TILT_X,

				((data[7] << 1) & 0x7e) | (data[8] >> 7));
@@ -409,7 +428,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo) 
{

	unsigned char *data = wacom->data;

	unsigned int t;

	int idx, result;

	int idx = 0, result;



	if (data[0] != 2 && data[0] != 5 && data[0] != 6 && data[0] != 12) {

		dbg("wacom_intuos_irq: received unknown report #%d", data[0]);
@@ -417,6 +436,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo) 
	}



	/* tool number */

	if (wacom->features->type == INTUOS)

		idx = data[1] & 0x01;



	/* pad packets. Works as a second tool and is always in prox */
@@ -425,6 +445,29 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo) 
		if (wacom->tool[1] != BTN_TOOL_FINGER)

			wacom->tool[1] = BTN_TOOL_FINGER;



		if (wacom->features->type >= INTUOS4S && wacom->features->type <= INTUOS4L) {

			wacom_report_key(wcombo, BTN_0, (data[2] & 0x01));

			wacom_report_key(wcombo, BTN_1, (data[3] & 0x01));

			wacom_report_key(wcombo, BTN_2, (data[3] & 0x02));

			wacom_report_key(wcombo, BTN_3, (data[3] & 0x04));

			wacom_report_key(wcombo, BTN_4, (data[3] & 0x08));

			wacom_report_key(wcombo, BTN_5, (data[3] & 0x10));

			wacom_report_key(wcombo, BTN_6, (data[3] & 0x20));

			if (data[1] & 0x80) {

				wacom_report_abs(wcombo, ABS_WHEEL, (data[1] & 0x7f));

			}

			if (wacom->features->type != INTUOS4S) {

				wacom_report_key(wcombo, BTN_7, (data[3] & 0x40));

				wacom_report_key(wcombo, BTN_8, (data[3] & 0x80));

			}

			if (data[1] | (data[2] & 0x01) | data[3]) {

				wacom_report_key(wcombo, wacom->tool[1], 1);

				wacom_report_abs(wcombo, ABS_MISC, PAD_DEVICE_ID);

			} else {

				wacom_report_key(wcombo, wacom->tool[1], 0);

				wacom_report_abs(wcombo, ABS_MISC, 0);

			}

		} else {

			wacom_report_key(wcombo, BTN_0, (data[5] & 0x01));

			wacom_report_key(wcombo, BTN_1, (data[5] & 0x02));

			wacom_report_key(wcombo, BTN_2, (data[5] & 0x04));
@@ -439,11 +482,14 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo) 
			wacom_report_abs(wcombo, ABS_RY, ((data[3] & 0x1f) << 8) | data[4]);



			if ((data[5] & 0x1f) | (data[6] & 0x1f) | (data[1] & 0x1f) |

			data[2] | (data[3] & 0x1f) | data[4])

				data[2] | (data[3] & 0x1f) | data[4]) {

				wacom_report_key(wcombo, wacom->tool[1], 1);

		else

			wacom_report_key(wcombo, wacom->tool[1], 0);

				wacom_report_abs(wcombo, ABS_MISC, PAD_DEVICE_ID);

			} else {

				wacom_report_key(wcombo, wacom->tool[1], 0);

				wacom_report_abs(wcombo, ABS_MISC, 0);

			}

		}

		wacom_input_event(wcombo, EV_MSC, MSC_SERIAL, 0xffffffff);

                return 1;

	}
@@ -453,10 +499,16 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo) 
	if (result)

                return result-1;



	/* Only large I3 and I1 & I2 support Lense Cursor */

	/* don't proceed if we don't know the ID */

	if (!wacom->id[idx])

		return 0;



	/* Only large Intuos support Lense Cursor */

	if ((wacom->tool[idx] == BTN_TOOL_LENS)

			&& ((wacom->features->type == INTUOS3)

			|| (wacom->features->type == INTUOS3S)))

			|| (wacom->features->type == INTUOS3S)

			|| (wacom->features->type == INTUOS4)

			|| (wacom->features->type == INTUOS4S)))

		return 0;



	/* Cintiq doesn't send data when RDY bit isn't set */
@@ -476,8 +528,8 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo) 
	/* process general packets */

	wacom_intuos_general(wacom, wcombo);



	/* 4D mouse, 2D mouse, marker pen rotation, or Lens cursor packets */

	if ((data[1] & 0xbc) == 0xa8 || (data[1] & 0xbe) == 0xb0) {

	/* 4D mouse, 2D mouse, marker pen rotation, tilt mouse, or Lens cursor packets */

	if ((data[1] & 0xbc) == 0xa8 || (data[1] & 0xbe) == 0xb0 || (data[1] & 0xbc) == 0xac) {



		if (data[1] & 0x02) {

			/* Rotation packet */
@@ -506,6 +558,20 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo) 
			wacom_report_abs(wcombo, ABS_THROTTLE, (data[8] & 0x08) ? -t : t);



		} else if (wacom->tool[idx] == BTN_TOOL_MOUSE) {

			/* I4 mouse */

			if (wacom->features->type >= INTUOS4S && wacom->features->type <= INTUOS4L) {

				wacom_report_key(wcombo, BTN_LEFT,   data[6] & 0x01);

				wacom_report_key(wcombo, BTN_MIDDLE, data[6] & 0x02);

				wacom_report_key(wcombo, BTN_RIGHT,  data[6] & 0x04);

				wacom_report_rel(wcombo, REL_WHEEL, ((data[7] & 0x80) >> 7)

						 - ((data[7] & 0x40) >> 6));

				wacom_report_key(wcombo, BTN_SIDE,   data[6] & 0x08);

				wacom_report_key(wcombo, BTN_EXTRA,  data[6] & 0x10);



				wacom_report_abs(wcombo, ABS_TILT_X,

					((data[7] << 1) & 0x7e) | (data[8] >> 7));

				wacom_report_abs(wcombo, ABS_TILT_Y, data[8] & 0x7f);

			} else {

				/* 2D mouse packet */

				wacom_report_key(wcombo, BTN_LEFT,   data[8] & 0x04);

				wacom_report_key(wcombo, BTN_MIDDLE, data[8] & 0x08);
@@ -518,8 +584,10 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo) 
					wacom_report_key(wcombo, BTN_SIDE,   data[8] & 0x40);

					wacom_report_key(wcombo, BTN_EXTRA,  data[8] & 0x20);

				}



		} else if (wacom->features->type < INTUOS3S || wacom->features->type == INTUOS3L) {

			}

		} else if ((wacom->features->type < INTUOS3S || wacom->features->type == INTUOS3L ||

				wacom->features->type == INTUOS4L) &&

			   wacom->tool[idx] == BTN_TOOL_LENS) {

			/* Lens cursor packets */

			wacom_report_key(wcombo, BTN_LEFT,   data[8] & 0x01);

			wacom_report_key(wcombo, BTN_MIDDLE, data[8] & 0x02);
@@ -581,6 +649,7 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, void *wcombo) 
			}

		} else if (touchOut || !prox) { /* force touch out-prox */

			wacom_report_abs(wcombo, ABS_MISC, TOUCH_DEVICE_ID);

			wacom_report_key(wcombo, wacom->tool[1], 0);

			wacom_report_key(wcombo, BTN_TOUCH, 0);

			touchOut = 0;

			touchInProx = 1;
@@ -669,6 +738,9 @@ int wacom_wac_irq(struct wacom_wac *wacom_wac, void *wcombo) 
		case INTUOS3S:

		case INTUOS3:

		case INTUOS3L:

		case INTUOS4S:

		case INTUOS4:

		case INTUOS4L:

		case CINTIQ:

		case WACOM_BEE:

			return wacom_intuos_irq(wacom_wac, wcombo);
@@ -706,6 +778,14 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w 
		case INTUOS:

			input_dev_i(input_dev, wacom_wac);

			break;

		case INTUOS4:

		case INTUOS4L:

			input_dev_i4(input_dev, wacom_wac);

			/* fall through */

		case INTUOS4S:

			input_dev_i4s(input_dev, wacom_wac);

			input_dev_i(input_dev, wacom_wac);

			break;

		case PL:

		case PTU:

		case TABLETPC:
@@ -766,6 +846,10 @@ static struct wacom_features wacom_features[] = { 
	{ "Wacom Intuos3 12x19", 10, 97536, 60960, 1023, 63, INTUOS3L },

	{ "Wacom Intuos3 6x11",  10, 54204, 31750, 1023, 63, INTUOS3 },

	{ "Wacom Intuos3 4x6",   10, 31496, 19685, 1023, 63, INTUOS3S },

	{ "Wacom Intuos4 4x6",   10, 31496, 19685, 2047, 63, INTUOS4S },

	{ "Wacom Intuos4 6x9",   10, 44704, 27940, 2047, 63, INTUOS4 },

	{ "Wacom Intuos4 8x13",  10, 65024, 40640, 2047, 63, INTUOS4L },

	{ "Wacom Intuos4 12x19", 10, 97536, 60960, 2047, 63, INTUOS4L },

	{ "Wacom Cintiq 21UX",   10, 87200, 65600, 1023, 63, CINTIQ },

	{ "Wacom Cintiq 20WSX",  10, 86680, 54180, 1023, 63, WACOM_BEE },

	{ "Wacom Cintiq 12WX",   10, 53020, 33440, 1023, 63, WACOM_BEE },
@@ -825,6 +909,10 @@ static struct usb_device_id wacom_ids[] = { 
	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB4) },

	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) },

	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7) },

	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB8) },

	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB9) },

	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xBA) },

	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xBB) },

	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) },

	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5) },

	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) },

drivers/input/tablet/wacom_wac.h

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ enum { 
	INTUOS3S,

	INTUOS3,

	INTUOS3L,

	INTUOS4S,

	INTUOS4,

	INTUOS4L,

	CINTIQ,

	WACOM_BEE,

	WACOM_MO,