Input: wacom - add support for three new Intuos devices (b5fd2a3e) · Commits · 戴 / test

drivers/input/tablet/wacom_sys.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1198,7 +1198,8 @@ static void wacom_wireless_work(struct work_struct *work)
	goto fail;		goto fail;

	/* Touch interface */		/* Touch interface */
	if (wacom_wac1->features.touch_max) {		if (wacom_wac1->features.touch_max \|\|
			wacom_wac1->features.type == INTUOSHT) {
	wacom_wac2->features =		wacom_wac2->features =
	((struct wacom_features )id->driver_info);		((struct wacom_features )id->driver_info);
	wacom_wac2->features.pktlen = WACOM_PKGLEN_BBTOUCH3;		wacom_wac2->features.pktlen = WACOM_PKGLEN_BBTOUCH3;
	@@ -1321,7 +1322,7 @@ static int wacom_probe(struct usb_interface intf, const struct usb_device_id i
	* HID descriptor. If this is the touch interface (wMaxPacketSize		* HID descriptor. If this is the touch interface (wMaxPacketSize
	* of WACOM_PKGLEN_BBTOUCH3), override the table values.		* of WACOM_PKGLEN_BBTOUCH3), override the table values.
	*/		*/
	if (features->type >= INTUOS5S && features->type <= INTUOSPL) {		if (features->type >= INTUOS5S && features->type <= INTUOSHT) {
	if (endpoint->wMaxPacketSize == WACOM_PKGLEN_BBTOUCH3) {		if (endpoint->wMaxPacketSize == WACOM_PKGLEN_BBTOUCH3) {
	features->device_type = BTN_TOOL_FINGER;		features->device_type = BTN_TOOL_FINGER;
	features->pktlen = WACOM_PKGLEN_BBTOUCH3;		features->pktlen = WACOM_PKGLEN_BBTOUCH3;
	@@ -1391,7 +1392,6 @@ static int wacom_probe(struct usb_interface intf, const struct usb_device_id i
	goto fail5;		goto fail5;
	}		}
	}		}

	return 0;		return 0;

	fail5: wacom_destroy_leds(wacom);		fail5: wacom_destroy_leds(wacom);

drivers/input/tablet/wacom_wac.c

+46 −15

Original line number	Original line	Diff line number	Diff line
	@@ -1176,10 +1176,16 @@ static void wacom_bpt3_touch_msg(struct wacom_wac wacom, unsigned char data)
	static void wacom_bpt3_button_msg(struct wacom_wac wacom, unsigned char data)		static void wacom_bpt3_button_msg(struct wacom_wac wacom, unsigned char data)
	{		{
	struct input_dev *input = wacom->input;		struct input_dev *input = wacom->input;
			struct wacom_features *features = &wacom->features;

			if (features->type == INTUOSHT) {
			input_report_key(input, BTN_LEFT, (data[1] & 0x02) != 0);
			input_report_key(input, BTN_BACK, (data[1] & 0x08) != 0);
			} else {
			input_report_key(input, BTN_BACK, (data[1] & 0x02) != 0);
	input_report_key(input, BTN_LEFT, (data[1] & 0x08) != 0);		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_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_report_key(input, BTN_RIGHT, (data[1] & 0x01) != 0);
	}		}

	@@ -1217,7 +1223,7 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
	unsigned char *data = wacom->data;		unsigned char *data = wacom->data;
	int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0;		int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0;

	if (data[0] != 0x02)		if (data[0] != WACOM_REPORT_PENABLED)
	return 0;		return 0;

	prox = (data[1] & 0x20) == 0x20;		prox = (data[1] & 0x20) == 0x20;
	@@ -1297,7 +1303,7 @@ static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
	unsigned char *data = wacom->data;		unsigned char *data = wacom->data;
	int connected;		int connected;

	if (len != WACOM_PKGLEN_WIRELESS \|\| data[0] != 0x80)		if (len != WACOM_PKGLEN_WIRELESS \|\| data[0] != WACOM_REPORT_WL)
	return 0;		return 0;

	connected = data[1] & 0x01;		connected = data[1] & 0x01;
	@@ -1391,6 +1397,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
	break;		break;

	case BAMBOO_PT:		case BAMBOO_PT:
			case INTUOSHT:
	sync = wacom_bpt_irq(wacom_wac, len);		sync = wacom_bpt_irq(wacom_wac, len);
	break;		break;

	@@ -1459,7 +1466,7 @@ void wacom_setup_device_quirks(struct wacom_features *features)

	/* these device have multiple inputs */		/* these device have multiple inputs */
	if (features->type >= WIRELESS \|\|		if (features->type >= WIRELESS \|\|
	(features->type >= INTUOS5S && features->type <= INTUOSPL) \|\|		(features->type >= INTUOS5S && features->type <= INTUOSHT) \|\|
	(features->oVid && features->oPid))		(features->oVid && features->oPid))
	features->quirks \|= WACOM_QUIRK_MULTI_INPUT;		features->quirks \|= WACOM_QUIRK_MULTI_INPUT;

	@@ -1771,19 +1778,22 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
	__set_bit(INPUT_PROP_POINTER, input_dev->propbit);		__set_bit(INPUT_PROP_POINTER, input_dev->propbit);
	break;		break;

			case INTUOSHT:
	case BAMBOO_PT:		case BAMBOO_PT:
	__clear_bit(ABS_MISC, input_dev->absbit);		__clear_bit(ABS_MISC, input_dev->absbit);

	__set_bit(INPUT_PROP_POINTER, input_dev->propbit);

	if (features->device_type == BTN_TOOL_FINGER) {		if (features->device_type == BTN_TOOL_FINGER) {
	unsigned int flags = INPUT_MT_POINTER;

	__set_bit(BTN_LEFT, input_dev->keybit);		__set_bit(BTN_LEFT, input_dev->keybit);
	__set_bit(BTN_FORWARD, input_dev->keybit);		__set_bit(BTN_FORWARD, input_dev->keybit);
	__set_bit(BTN_BACK, input_dev->keybit);		__set_bit(BTN_BACK, input_dev->keybit);
	__set_bit(BTN_RIGHT, input_dev->keybit);		__set_bit(BTN_RIGHT, input_dev->keybit);

			if (features->touch_max) {
			/* touch interface */
			unsigned int flags = INPUT_MT_POINTER;

			__set_bit(INPUT_PROP_POINTER, input_dev->propbit);
	if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) {		if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) {
	input_set_abs_params(input_dev,		input_set_abs_params(input_dev,
	ABS_MT_TOUCH_MAJOR,		ABS_MT_TOUCH_MAJOR,
	@@ -1797,7 +1807,14 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
	flags = 0;		flags = 0;
	}		}
	input_mt_init_slots(input_dev, features->touch_max, flags);		input_mt_init_slots(input_dev, features->touch_max, flags);
			} else {
			/* buttons/keys only interface */
			__clear_bit(ABS_X, input_dev->absbit);
			__clear_bit(ABS_Y, input_dev->absbit);
			__clear_bit(BTN_TOUCH, input_dev->keybit);
			}
	} else if (features->device_type == BTN_TOOL_PEN) {		} else if (features->device_type == BTN_TOOL_PEN) {
			__set_bit(INPUT_PROP_POINTER, input_dev->propbit);
	__set_bit(BTN_TOOL_RUBBER, input_dev->keybit);		__set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
	__set_bit(BTN_TOOL_PEN, input_dev->keybit);		__set_bit(BTN_TOOL_PEN, input_dev->keybit);
	__set_bit(BTN_STYLUS, input_dev->keybit);		__set_bit(BTN_STYLUS, input_dev->keybit);
	@@ -2194,6 +2211,17 @@ static const struct wacom_features wacom_features_0x300 =
	static const struct wacom_features wacom_features_0x301 =		static const struct wacom_features wacom_features_0x301 =
	{ "Wacom Bamboo One M", WACOM_PKGLEN_BBPEN, 21648, 13530, 1023,		{ "Wacom Bamboo One M", WACOM_PKGLEN_BBPEN, 21648, 13530, 1023,
	31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };		31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
			static const struct wacom_features wacom_features_0x302 =
			{ "Wacom Intuos PT S", WACOM_PKGLEN_BBPEN, 15200, 9500, 1023,
			31, INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
			.touch_max = 16 };
			static const struct wacom_features wacom_features_0x303 =
			{ "Wacom Intuos PT M", WACOM_PKGLEN_BBPEN, 21600, 13500, 1023,
			31, INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
			.touch_max = 16 };
			static const struct wacom_features wacom_features_0x30E =
			{ "Wacom Intuos S", WACOM_PKGLEN_BBPEN, 15200, 9500, 1023,
			31, INTUOSHT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
	static const struct wacom_features wacom_features_0x6004 =		static const struct wacom_features wacom_features_0x6004 =
	{ "ISD-V4", WACOM_PKGLEN_GRAPHIRE, 12800, 8000, 255,		{ "ISD-V4", WACOM_PKGLEN_GRAPHIRE, 12800, 8000, 255,
	0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };		0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
	@@ -2329,6 +2357,9 @@ const struct usb_device_id wacom_ids[] = {
	{ USB_DEVICE_WACOM(0x10D) },		{ USB_DEVICE_WACOM(0x10D) },
	{ USB_DEVICE_WACOM(0x300) },		{ USB_DEVICE_WACOM(0x300) },
	{ USB_DEVICE_WACOM(0x301) },		{ USB_DEVICE_WACOM(0x301) },
			{ USB_DEVICE_DETAILED(0x302, USB_CLASS_HID, 0, 0) },
			{ USB_DEVICE_DETAILED(0x303, USB_CLASS_HID, 0, 0) },
			{ USB_DEVICE_DETAILED(0x30E, USB_CLASS_HID, 0, 0) },
	{ USB_DEVICE_WACOM(0x304) },		{ USB_DEVICE_WACOM(0x304) },
	{ USB_DEVICE_DETAILED(0x314, USB_CLASS_HID, 0, 0) },		{ USB_DEVICE_DETAILED(0x314, USB_CLASS_HID, 0, 0) },
	{ USB_DEVICE_DETAILED(0x315, USB_CLASS_HID, 0, 0) },		{ USB_DEVICE_DETAILED(0x315, USB_CLASS_HID, 0, 0) },

drivers/input/tablet/wacom_wac.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,7 @@
	#define WACOM_REPORT_TPCST 16		#define WACOM_REPORT_TPCST 16
	#define WACOM_REPORT_TPC1FGE 18		#define WACOM_REPORT_TPC1FGE 18
	#define WACOM_REPORT_24HDT 1		#define WACOM_REPORT_24HDT 1
			#define WACOM_REPORT_WL 128

	/* device quirks */		/* device quirks */
	#define WACOM_QUIRK_MULTI_INPUT 0x0001		#define WACOM_QUIRK_MULTI_INPUT 0x0001
	@@ -81,6 +82,7 @@ enum {
	INTUOSPS,		INTUOSPS,
	INTUOSPM,		INTUOSPM,
	INTUOSPL,		INTUOSPL,
			INTUOSHT,
	WACOM_21UX2,		WACOM_21UX2,
	WACOM_22HD,		WACOM_22HD,
	DTK,		DTK,

Admin message