Input: wacom - split out the pad device for Intuos/Cintiq (10059cdc) · Commits · e / devices / android_kernel_teracube_2e

drivers/input/tablet/wacom_wac.c

+122 −86

Original line number	Original line	Diff line number	Diff line
	@@ -584,6 +584,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)

	/* pad packets. Works as a second tool and is always in prox */		/* pad packets. Works as a second tool and is always in prox */
	if (data[0] == WACOM_REPORT_INTUOSPAD \|\| data[0] == WACOM_REPORT_INTUOS5PAD) {		if (data[0] == WACOM_REPORT_INTUOSPAD \|\| data[0] == WACOM_REPORT_INTUOS5PAD) {
			input = wacom->pad_input;
	if (features->type >= INTUOS4S && features->type <= INTUOS4L) {		if (features->type >= INTUOS4S && features->type <= INTUOS4L) {
	input_report_key(input, BTN_0, (data[2] & 0x01));		input_report_key(input, BTN_0, (data[2] & 0x01));
	input_report_key(input, BTN_1, (data[3] & 0x01));		input_report_key(input, BTN_1, (data[3] & 0x01));
	@@ -773,7 +774,6 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
	input_report_abs(input, ABS_MISC, 0);		input_report_abs(input, ABS_MISC, 0);
	}		}
	}		}
	input_event(input, EV_MSC, MSC_SERIAL, 0xffffffff);
	return 1;		return 1;
	}		}

	@@ -1656,61 +1656,20 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
	break;		break;

	case WACOM_24HD:		case WACOM_24HD:
	__set_bit(BTN_A, input_dev->keybit);
	__set_bit(BTN_B, input_dev->keybit);
	__set_bit(BTN_C, input_dev->keybit);
	__set_bit(BTN_X, input_dev->keybit);
	__set_bit(BTN_Y, input_dev->keybit);
	__set_bit(BTN_Z, input_dev->keybit);

	for (i = 6; i < 10; i++)
	__set_bit(BTN_0 + i, input_dev->keybit);

	__set_bit(KEY_PROG1, input_dev->keybit);
	__set_bit(KEY_PROG2, input_dev->keybit);
	__set_bit(KEY_PROG3, input_dev->keybit);

	input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);		input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
	input_set_abs_params(input_dev, ABS_THROTTLE, 0, 71, 0, 0);		input_set_abs_params(input_dev, ABS_THROTTLE, 0, 71, 0, 0);
	/* fall through */		/* fall through */

	case DTK:		case DTK:
	for (i = 0; i < 6; i++)
	__set_bit(BTN_0 + i, input_dev->keybit);

	__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);		__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);

	wacom_setup_cintiq(wacom_wac);		wacom_setup_cintiq(wacom_wac);
	break;		break;

	case WACOM_22HD:		case WACOM_22HD:
	__set_bit(KEY_PROG1, input_dev->keybit);
	__set_bit(KEY_PROG2, input_dev->keybit);
	__set_bit(KEY_PROG3, input_dev->keybit);
	/* fall through */

	case WACOM_21UX2:		case WACOM_21UX2:
	__set_bit(BTN_A, input_dev->keybit);
	__set_bit(BTN_B, input_dev->keybit);
	__set_bit(BTN_C, input_dev->keybit);
	__set_bit(BTN_X, input_dev->keybit);
	__set_bit(BTN_Y, input_dev->keybit);
	__set_bit(BTN_Z, input_dev->keybit);
	__set_bit(BTN_BASE, input_dev->keybit);
	__set_bit(BTN_BASE2, input_dev->keybit);
	/* fall through */

	case WACOM_BEE:		case WACOM_BEE:
	__set_bit(BTN_8, input_dev->keybit);
	__set_bit(BTN_9, input_dev->keybit);
	/* fall through */

	case CINTIQ:		case CINTIQ:
	for (i = 0; i < 8; i++)
	__set_bit(BTN_0 + i, input_dev->keybit);

	input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
	input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
	input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);		input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);

	__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);		__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);
	@@ -1719,9 +1678,6 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
	break;		break;

	case WACOM_13HD:		case WACOM_13HD:
	for (i = 0; i < 9; i++)
	__set_bit(BTN_0 + i, input_dev->keybit);

	input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);		input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
	__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);		__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);
	wacom_setup_cintiq(wacom_wac);		wacom_setup_cintiq(wacom_wac);
	@@ -1729,21 +1685,7 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,

	case INTUOS3:		case INTUOS3:
	case INTUOS3L:		case INTUOS3L:
	__set_bit(BTN_4, input_dev->keybit);
	__set_bit(BTN_5, input_dev->keybit);
	__set_bit(BTN_6, input_dev->keybit);
	__set_bit(BTN_7, input_dev->keybit);

	input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
	/* fall through */

	case INTUOS3S:		case INTUOS3S:
	__set_bit(BTN_0, input_dev->keybit);
	__set_bit(BTN_1, input_dev->keybit);
	__set_bit(BTN_2, input_dev->keybit);
	__set_bit(BTN_3, input_dev->keybit);

	input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
	input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);		input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
	/* fall through */		/* fall through */

	@@ -1757,20 +1699,11 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
	case INTUOS5L:		case INTUOS5L:
	case INTUOSPM:		case INTUOSPM:
	case INTUOSPL:		case INTUOSPL:
	if (features->device_type == BTN_TOOL_PEN) {
	__set_bit(BTN_7, input_dev->keybit);
	__set_bit(BTN_8, input_dev->keybit);
	}
	/* fall through */

	case INTUOS5S:		case INTUOS5S:
	case INTUOSPS:		case INTUOSPS:
	__set_bit(INPUT_PROP_POINTER, input_dev->propbit);		__set_bit(INPUT_PROP_POINTER, input_dev->propbit);

	if (features->device_type == BTN_TOOL_PEN) {		if (features->device_type == BTN_TOOL_PEN) {
	for (i = 0; i < 7; i++)
	__set_bit(BTN_0 + i, input_dev->keybit);

	input_set_abs_params(input_dev, ABS_DISTANCE, 0,		input_set_abs_params(input_dev, ABS_DISTANCE, 0,
	features->distance_max,		features->distance_max,
	0, 0);		0, 0);
	@@ -1791,14 +1724,7 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,

	case INTUOS4:		case INTUOS4:
	case INTUOS4L:		case INTUOS4L:
	__set_bit(BTN_7, input_dev->keybit);
	__set_bit(BTN_8, input_dev->keybit);
	/* fall through */

	case INTUOS4S:		case INTUOS4S:
	for (i = 0; i < 7; i++)
	__set_bit(BTN_0 + i, input_dev->keybit);

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

	@@ -1922,17 +1848,6 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev,
	break;		break;

	case CINTIQ_HYBRID:		case CINTIQ_HYBRID:
	__set_bit(BTN_1, input_dev->keybit);
	__set_bit(BTN_2, input_dev->keybit);
	__set_bit(BTN_3, input_dev->keybit);
	__set_bit(BTN_4, input_dev->keybit);

	__set_bit(BTN_5, input_dev->keybit);
	__set_bit(BTN_6, input_dev->keybit);
	__set_bit(BTN_7, input_dev->keybit);
	__set_bit(BTN_8, input_dev->keybit);
	__set_bit(BTN_0, input_dev->keybit);

	input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);		input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
	__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);		__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);

	@@ -1946,6 +1861,7 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,
	struct wacom_wac *wacom_wac)		struct wacom_wac *wacom_wac)
	{		{
	struct wacom_features *features = &wacom_wac->features;		struct wacom_features *features = &wacom_wac->features;
			int i;

	input_dev->evbit[0] \|= BIT_MASK(EV_KEY) \| BIT_MASK(EV_ABS);		input_dev->evbit[0] \|= BIT_MASK(EV_KEY) \| BIT_MASK(EV_ABS);

	@@ -1957,6 +1873,126 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,
	input_set_abs_params(input_dev, ABS_Y, 0, 1, 0, 0);		input_set_abs_params(input_dev, ABS_Y, 0, 1, 0, 0);

	switch (features->type) {		switch (features->type) {
			case WACOM_24HD:
			__set_bit(BTN_A, input_dev->keybit);
			__set_bit(BTN_B, input_dev->keybit);
			__set_bit(BTN_C, input_dev->keybit);
			__set_bit(BTN_X, input_dev->keybit);
			__set_bit(BTN_Y, input_dev->keybit);
			__set_bit(BTN_Z, input_dev->keybit);

			for (i = 0; i < 10; i++)
			__set_bit(BTN_0 + i, input_dev->keybit);

			__set_bit(KEY_PROG1, input_dev->keybit);
			__set_bit(KEY_PROG2, input_dev->keybit);
			__set_bit(KEY_PROG3, input_dev->keybit);

			input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
			input_set_abs_params(input_dev, ABS_THROTTLE, 0, 71, 0, 0);
			break;

			case DTK:
			for (i = 0; i < 6; i++)
			__set_bit(BTN_0 + i, input_dev->keybit);

			break;

			case WACOM_22HD:
			__set_bit(KEY_PROG1, input_dev->keybit);
			__set_bit(KEY_PROG2, input_dev->keybit);
			__set_bit(KEY_PROG3, input_dev->keybit);
			/* fall through */

			case WACOM_21UX2:
			__set_bit(BTN_A, input_dev->keybit);
			__set_bit(BTN_B, input_dev->keybit);
			__set_bit(BTN_C, input_dev->keybit);
			__set_bit(BTN_X, input_dev->keybit);
			__set_bit(BTN_Y, input_dev->keybit);
			__set_bit(BTN_Z, input_dev->keybit);
			__set_bit(BTN_BASE, input_dev->keybit);
			__set_bit(BTN_BASE2, input_dev->keybit);
			/* fall through */

			case WACOM_BEE:
			__set_bit(BTN_8, input_dev->keybit);
			__set_bit(BTN_9, input_dev->keybit);
			/* fall through */

			case CINTIQ:
			for (i = 0; i < 8; i++)
			__set_bit(BTN_0 + i, input_dev->keybit);

			input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
			input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
			break;

			case WACOM_13HD:
			for (i = 0; i < 9; i++)
			__set_bit(BTN_0 + i, input_dev->keybit);

			input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
			break;

			case INTUOS3:
			case INTUOS3L:
			__set_bit(BTN_4, input_dev->keybit);
			__set_bit(BTN_5, input_dev->keybit);
			__set_bit(BTN_6, input_dev->keybit);
			__set_bit(BTN_7, input_dev->keybit);

			input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
			/* fall through */

			case INTUOS3S:
			__set_bit(BTN_0, input_dev->keybit);
			__set_bit(BTN_1, input_dev->keybit);
			__set_bit(BTN_2, input_dev->keybit);
			__set_bit(BTN_3, input_dev->keybit);

			input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
			break;

			case INTUOS5:
			case INTUOS5L:
			case INTUOSPM:
			case INTUOSPL:
			__set_bit(BTN_7, input_dev->keybit);
			__set_bit(BTN_8, input_dev->keybit);
			/* fall through */

			case INTUOS5S:
			case INTUOSPS:
			/* touch interface does not have the pad device */
			if (features->device_type != BTN_TOOL_PEN)
			return 1;

			for (i = 0; i < 7; i++)
			__set_bit(BTN_0 + i, input_dev->keybit);

			input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
			break;

			case INTUOS4:
			case INTUOS4L:
			__set_bit(BTN_7, input_dev->keybit);
			__set_bit(BTN_8, input_dev->keybit);
			/* fall through */

			case INTUOS4S:
			for (i = 0; i < 7; i++)
			__set_bit(BTN_0 + i, input_dev->keybit);

			input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
			break;

			case CINTIQ_HYBRID:
			for (i = 0; i < 9; i++)
			__set_bit(BTN_0 + i, input_dev->keybit);

			break;

	default:		default:
	/* no pad supported */		/* no pad supported */
	return 1;		return 1;