Commit 3512069e authored by Jason Gerecke's avatar Jason Gerecke Committed by Dmitry Torokhov
Browse files

Input: wacom - add POINTER and DIRECT device properties 



Adds INPUT_PROP_POINTER or INPUT_PROP_DIRECT as necessary to the
hardware supported by the Wacom driver. The DIRECT property is
assigned to devices with an embedded screen (i.e. touchscreens
and display tablets). The POINTER property is assigned to those
without embedded screens.

Signed-off-by: default avatarJason Gerecke <killertofu@gmail.com>
Reviewed-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 8c675660

drivers/hid/hid-wacom.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -383,6 +383,8 @@ move_on: 
	hidinput = list_entry(hdev->inputs.next, struct hid_input, list);

	hidinput = list_entry(hdev->inputs.next, struct hid_input, list);

	input = hidinput->input;

	input = hidinput->input;





	__set_bit(INPUT_PROP_POINTER, input->propbit);



	/* Basics */

	/* Basics */

	input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL);

	input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL);

drivers/input/tablet/wacom_wac.c

+24 −1
Original line number Original line Diff line number Diff line
@@ -1098,6 +1098,8 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, 
		__set_bit(BTN_TOOL_MOUSE, input_dev->keybit);

		__set_bit(BTN_TOOL_MOUSE, input_dev->keybit);

		__set_bit(BTN_STYLUS, input_dev->keybit);

		__set_bit(BTN_STYLUS, input_dev->keybit);

		__set_bit(BTN_STYLUS2, input_dev->keybit);

		__set_bit(BTN_STYLUS2, input_dev->keybit);



		__set_bit(INPUT_PROP_POINTER, input_dev->propbit);

		break;

		break;





	case WACOM_21UX2:

	case WACOM_21UX2:
@@ -1126,6 +1128,9 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, 
		}

		}





		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);



		wacom_setup_cintiq(wacom_wac);

		wacom_setup_cintiq(wacom_wac);

		break;

		break;
@@ -1150,6 +1155,8 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, 
		/* fall through */

		/* fall through */





	case INTUOS:

	case INTUOS:

		__set_bit(INPUT_PROP_POINTER, input_dev->propbit);



		wacom_setup_intuos(wacom_wac);

		wacom_setup_intuos(wacom_wac);

		break;

		break;
@@ -1165,6 +1172,8 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, 




		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);



		__set_bit(INPUT_PROP_POINTER, input_dev->propbit);

		break;

		break;





	case TABLETPC2FG:

	case TABLETPC2FG:
@@ -1183,14 +1192,24 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, 
	case TABLETPC:

	case TABLETPC:

		__clear_bit(ABS_MISC, input_dev->absbit);

		__clear_bit(ABS_MISC, input_dev->absbit);





		__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);



		if (features->device_type != BTN_TOOL_PEN)

		if (features->device_type != BTN_TOOL_PEN)

			break;  /* no need to process stylus stuff */

			break;  /* no need to process stylus stuff */





		/* fall through */

		/* fall through */





	case PL:

	case PL:

	case PTU:

	case DTU:

	case DTU:

		__set_bit(BTN_TOOL_PEN, input_dev->keybit);

		__set_bit(BTN_TOOL_RUBBER, input_dev->keybit);

		__set_bit(BTN_STYLUS, input_dev->keybit);

		__set_bit(BTN_STYLUS2, input_dev->keybit);



		__set_bit(INPUT_PROP_DIRECT, input_dev->propbit);

		break;



	case PTU:

		__set_bit(BTN_STYLUS2, input_dev->keybit);

		__set_bit(BTN_STYLUS2, input_dev->keybit);

		/* fall through */

		/* fall through */
@@ -1198,11 +1217,15 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, 
		__set_bit(BTN_TOOL_PEN, input_dev->keybit);

		__set_bit(BTN_TOOL_PEN, input_dev->keybit);

		__set_bit(BTN_TOOL_RUBBER, input_dev->keybit);

		__set_bit(BTN_TOOL_RUBBER, input_dev->keybit);

		__set_bit(BTN_STYLUS, input_dev->keybit);

		__set_bit(BTN_STYLUS, input_dev->keybit);



		__set_bit(INPUT_PROP_POINTER, input_dev->propbit);

		break;

		break;





	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_DOUBLETAP) {

		if (features->device_type == BTN_TOOL_DOUBLETAP) {

			__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);

drivers/input/touchscreen/wacom_w8001.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -383,6 +383,8 @@ static int w8001_setup(struct w8001 *w8001) 
	dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);

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

	strlcat(w8001->name, "Wacom Serial", sizeof(w8001->name));

	strlcat(w8001->name, "Wacom Serial", sizeof(w8001->name));





	__set_bit(INPUT_PROP_DIRECT, dev->propbit);



	/* penabled? */

	/* penabled? */

	error = w8001_command(w8001, W8001_CMD_QUERY, true);

	error = w8001_command(w8001, W8001_CMD_QUERY, true);

	if (!error) {

	if (!error) {