Commit 862cf553 authored by Jason Gerecke's avatar Jason Gerecke Committed by Jiri Kosina
Browse files

HID: wacom: Introduce a new WACOM_DEVICETYPE_PAD device_type 



Historically, both the touch and pad tools would have shared the
'BTN_TOOL_FINGER' type. Any time you needed to distinguish the two, you
had to use some other bit of knowledge (e.g. that the pad was on the same
interface as the pen, and thus 'touch_max' would be zero).

To make these checks more readable, we introduce WACOM_DEVICETYPE_PAD.
Although we still have to rely on other bits of knowledge to set this
bit on the right interface (since it cannot be detected from the HID
descriptor), it can be done just once inside 'wacom_setup_device_quirks'.

This patch introduces no functional changes.

Signed-off-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent aa86b18c

drivers/hid/wacom_sys.c

+35 −30
Original line number Original line Diff line number Diff line
@@ -859,6 +859,9 @@ static int wacom_initialize_leds(struct wacom *wacom) 
{

{

	int error;

	int error;





	if (!(wacom->wacom_wac.features.device_type & WACOM_DEVICETYPE_PAD))

		return 0;



	/* Initialize default values */

	/* Initialize default values */

	switch (wacom->wacom_wac.features.type) {

	switch (wacom->wacom_wac.features.type) {

	case INTUOS4S:

	case INTUOS4S:
@@ -892,7 +895,6 @@ static int wacom_initialize_leds(struct wacom *wacom) 
	case INTUOSPS:

	case INTUOSPS:

	case INTUOSPM:

	case INTUOSPM:

	case INTUOSPL:

	case INTUOSPL:

		if (wacom->wacom_wac.features.device_type & WACOM_DEVICETYPE_PEN) {

		wacom->led.select[0] = 0;

		wacom->led.select[0] = 0;

		wacom->led.select[1] = 0;

		wacom->led.select[1] = 0;

		wacom->led.llv = 32;

		wacom->led.llv = 32;
@@ -901,8 +903,6 @@ static int wacom_initialize_leds(struct wacom *wacom) 




		error = sysfs_create_group(&wacom->hdev->dev.kobj,

		error = sysfs_create_group(&wacom->hdev->dev.kobj,

					  &intuos5_led_attr_group);

					  &intuos5_led_attr_group);

		} else

			return 0;

		break;

		break;





	default:

	default:
@@ -925,6 +925,9 @@ static void wacom_destroy_leds(struct wacom *wacom) 
	if (!wacom->led_initialized)

	if (!wacom->led_initialized)

		return;

		return;





	if (!(wacom->wacom_wac.features.device_type & WACOM_DEVICETYPE_PAD))

		return;



	wacom->led_initialized = false;

	wacom->led_initialized = false;





	switch (wacom->wacom_wac.features.type) {

	switch (wacom->wacom_wac.features.type) {
@@ -948,7 +951,6 @@ static void wacom_destroy_leds(struct wacom *wacom) 
	case INTUOSPS:

	case INTUOSPS:

	case INTUOSPM:

	case INTUOSPM:

	case INTUOSPL:

	case INTUOSPL:

		if (wacom->wacom_wac.features.device_type & WACOM_DEVICETYPE_PEN)

		sysfs_remove_group(&wacom->hdev->dev.kobj,

		sysfs_remove_group(&wacom->hdev->dev.kobj,

				   &intuos5_led_attr_group);

				   &intuos5_led_attr_group);

		break;

		break;
@@ -1297,6 +1299,9 @@ static void wacom_wireless_work(struct work_struct *work) 
		wacom_wac1->features =

		wacom_wac1->features =

			*((struct wacom_features *)id->driver_data);

			*((struct wacom_features *)id->driver_data);

		wacom_wac1->features.device_type |= WACOM_DEVICETYPE_PEN;

		wacom_wac1->features.device_type |= WACOM_DEVICETYPE_PEN;

		if (wacom_wac1->features.type != INTUOSHT &&

		    wacom_wac1->features.type != BAMBOO_PT)

			wacom_wac1->features.device_type |= WACOM_DEVICETYPE_PAD;

		snprintf(wacom_wac1->name, WACOM_NAME_MAX, "%s (WL) Pen",

		snprintf(wacom_wac1->name, WACOM_NAME_MAX, "%s (WL) Pen",

			 wacom_wac1->features.name);

			 wacom_wac1->features.name);

		snprintf(wacom_wac1->pad_name, WACOM_NAME_MAX, "%s (WL) Pad",

		snprintf(wacom_wac1->pad_name, WACOM_NAME_MAX, "%s (WL) Pad",
@@ -1315,16 +1320,16 @@ static void wacom_wireless_work(struct work_struct *work) 
			wacom_wac2->features =

			wacom_wac2->features =

				*((struct wacom_features *)id->driver_data);

				*((struct wacom_features *)id->driver_data);

			wacom_wac2->features.pktlen = WACOM_PKGLEN_BBTOUCH3;

			wacom_wac2->features.pktlen = WACOM_PKGLEN_BBTOUCH3;

			wacom_wac2->features.device_type |= WACOM_DEVICETYPE_TOUCH;

			wacom_wac2->features.x_max = wacom_wac2->features.y_max = 4096;

			wacom_wac2->features.x_max = wacom_wac2->features.y_max = 4096;

			if (wacom_wac2->features.touch_max)

			snprintf(wacom_wac2->name, WACOM_NAME_MAX,

			snprintf(wacom_wac2->name, WACOM_NAME_MAX,

				 "%s (WL) Finger",wacom_wac2->features.name);

				 "%s (WL) Finger",wacom_wac2->features.name);

			else

				snprintf(wacom_wac2->name, WACOM_NAME_MAX,

					 "%s (WL) Pad",wacom_wac2->features.name);

			snprintf(wacom_wac2->pad_name, WACOM_NAME_MAX,

			snprintf(wacom_wac2->pad_name, WACOM_NAME_MAX,

				 "%s (WL) Pad",wacom_wac2->features.name);

				 "%s (WL) Pad",wacom_wac2->features.name);

			if (wacom_wac1->features.touch_max)

				wacom_wac2->features.device_type |= WACOM_DEVICETYPE_TOUCH;

			if (wacom_wac1->features.type == INTUOSHT ||

			    wacom_wac1->features.type == BAMBOO_PT)

				wacom_wac2->features.device_type |= WACOM_DEVICETYPE_PAD;

			wacom_wac2->pid = wacom_wac->pid;

			wacom_wac2->pid = wacom_wac->pid;

			error = wacom_allocate_inputs(wacom2) ||

			error = wacom_allocate_inputs(wacom2) ||

				wacom_register_inputs(wacom2);

				wacom_register_inputs(wacom2);
@@ -1456,10 +1461,10 @@ static void wacom_update_name(struct wacom *wacom) 
			"%s Pen", name);

			"%s Pen", name);

	}

	}

	else if (features->device_type & WACOM_DEVICETYPE_TOUCH) {

	else if (features->device_type & WACOM_DEVICETYPE_TOUCH) {

		if (features->touch_max)

		snprintf(wacom_wac->name, sizeof(wacom_wac->name),

		snprintf(wacom_wac->name, sizeof(wacom_wac->name),

			"%s Finger", name);

			"%s Finger", name);

		else

	}

	else if (features->device_type & WACOM_DEVICETYPE_PAD) {

		snprintf(wacom_wac->name, sizeof(wacom_wac->name),

		snprintf(wacom_wac->name, sizeof(wacom_wac->name),

			"%s Pad", name);

			"%s Pad", name);

	}

	}
@@ -1604,8 +1609,8 @@ static int wacom_probe(struct hid_device *hdev, 
	if (features->quirks & WACOM_QUIRK_MONITOR)

	if (features->quirks & WACOM_QUIRK_MONITOR)

		error = hid_hw_open(hdev);

		error = hid_hw_open(hdev);





	if (wacom_wac->features.type == INTUOSHT && wacom_wac->features.touch_max) {

	if (wacom_wac->features.type == INTUOSHT && 

		if (wacom_wac->features.device_type & WACOM_DEVICETYPE_TOUCH)

	    wacom_wac->features.device_type & WACOM_DEVICETYPE_TOUCH) {

			wacom_wac->shared->touch_input = wacom_wac->input;

			wacom_wac->shared->touch_input = wacom_wac->input;

	}

	}

drivers/hid/wacom_wac.c

+37 −34
Original line number Original line Diff line number Diff line
@@ -2167,6 +2167,15 @@ void wacom_setup_device_quirks(struct wacom *wacom) 
{

{

	struct wacom_features *features = &wacom->wacom_wac.features;

	struct wacom_features *features = &wacom->wacom_wac.features;





	/* The pen and pad share the same interface on most devices */

	if (features->type == GRAPHIRE_BT || features->type == WACOM_G4 ||

	    features->type == DTUS || features->type == WACOM_MO ||

	    (features->type >= INTUOS3S && features->type <= WACOM_13HD && 

	     features->type != INTUOSHT)) {

		if (features->device_type & WACOM_DEVICETYPE_PEN)

			features->device_type |= WACOM_DEVICETYPE_PAD;

	}



	/* touch device found but size is not defined. use default */

	/* touch device found but size is not defined. use default */

	if (features->device_type & WACOM_DEVICETYPE_TOUCH && !features->x_max) {

	if (features->device_type & WACOM_DEVICETYPE_TOUCH && !features->x_max) {

		features->x_max = 1023;

		features->x_max = 1023;
@@ -2182,7 +2191,10 @@ void wacom_setup_device_quirks(struct wacom *wacom) 
	if ((features->type >= INTUOS5S && features->type <= INTUOSHT) ||

	if ((features->type >= INTUOS5S && features->type <= INTUOSHT) ||

		(features->type == BAMBOO_PT)) {

		(features->type == BAMBOO_PT)) {

		if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) {

		if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) {

			if (features->touch_max)

				features->device_type |= WACOM_DEVICETYPE_TOUCH;

				features->device_type |= WACOM_DEVICETYPE_TOUCH;

			if (features->type == BAMBOO_PT || features->type == INTUOSHT)

				features->device_type |= WACOM_DEVICETYPE_PAD;





			features->x_max = 4096;

			features->x_max = 4096;

			features->y_max = 4096;

			features->y_max = 4096;
@@ -2241,7 +2253,7 @@ static void wacom_abs_set_axis(struct input_dev *input_dev, 
		/* penabled devices have fixed resolution for each model */

		/* penabled devices have fixed resolution for each model */

		input_abs_set_res(input_dev, ABS_X, features->x_resolution);

		input_abs_set_res(input_dev, ABS_X, features->x_resolution);

		input_abs_set_res(input_dev, ABS_Y, features->y_resolution);

		input_abs_set_res(input_dev, ABS_Y, features->y_resolution);

	} else {

	} else if (features->device_type & WACOM_DEVICETYPE_TOUCH) {

		if (features->touch_max == 1) {

		if (features->touch_max == 1) {

			input_set_abs_params(input_dev, ABS_X, 0,

			input_set_abs_params(input_dev, ABS_X, 0,

				features->x_max, features->x_fuzz, 0);

				features->x_max, features->x_fuzz, 0);
@@ -2423,8 +2435,7 @@ int wacom_setup_pentouch_input_capabilities(struct input_dev *input_dev, 
		break;

		break;





	case INTUOSHT:

	case INTUOSHT:

		if (features->touch_max &&

		if (features->device_type & WACOM_DEVICETYPE_TOUCH) {

		    features->device_type & WACOM_DEVICETYPE_TOUCH) {

			input_dev->evbit[0] |= BIT_MASK(EV_SW);

			input_dev->evbit[0] |= BIT_MASK(EV_SW);

			__set_bit(SW_MUTE_DEVICE, input_dev->swbit);

			__set_bit(SW_MUTE_DEVICE, input_dev->swbit);

		}

		}
@@ -2434,8 +2445,6 @@ int wacom_setup_pentouch_input_capabilities(struct input_dev *input_dev, 
		__clear_bit(ABS_MISC, input_dev->absbit);

		__clear_bit(ABS_MISC, input_dev->absbit);





		if (features->device_type & WACOM_DEVICETYPE_TOUCH) {

		if (features->device_type & WACOM_DEVICETYPE_TOUCH) {



			if (features->touch_max) {

			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,
@@ -2445,7 +2454,8 @@ int wacom_setup_pentouch_input_capabilities(struct input_dev *input_dev, 
					     0, features->y_max, 0, 0);

					     0, features->y_max, 0, 0);

			}

			}

			input_mt_init_slots(input_dev, features->touch_max, INPUT_MT_POINTER);

			input_mt_init_slots(input_dev, features->touch_max, INPUT_MT_POINTER);

			} else {

		}

		if (features->device_type & WACOM_DEVICETYPE_PAD) {

			/* buttons/keys only interface */

			/* buttons/keys only interface */

			__clear_bit(ABS_X, input_dev->absbit);

			__clear_bit(ABS_X, input_dev->absbit);

			__clear_bit(ABS_Y, input_dev->absbit);

			__clear_bit(ABS_Y, input_dev->absbit);
@@ -2454,7 +2464,7 @@ int wacom_setup_pentouch_input_capabilities(struct input_dev *input_dev, 
			/* PAD is setup by wacom_setup_pad_input_capabilities later */

			/* PAD is setup by wacom_setup_pad_input_capabilities later */

			return 1;

			return 1;

		}

		}

		} else if (features->device_type & WACOM_DEVICETYPE_PEN) {

		if (features->device_type & WACOM_DEVICETYPE_PEN) {

			__set_bit(INPUT_PROP_POINTER, input_dev->propbit);

			__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);
@@ -2482,6 +2492,9 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev, 
	struct wacom_features *features = &wacom_wac->features;

	struct wacom_features *features = &wacom_wac->features;

	int i;

	int i;





	if (!(features->device_type & WACOM_DEVICETYPE_PAD))

		return -ENODEV;



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

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





	/* kept for making legacy xf86-input-wacom working with the wheels */

	/* kept for making legacy xf86-input-wacom working with the wheels */
@@ -2618,10 +2631,6 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev, 




	case INTUOS5S:

	case INTUOS5S:

	case INTUOSPS:

	case INTUOSPS:

		/* touch interface does not have the pad device */

		if (!(features->device_type & WACOM_DEVICETYPE_PEN))

			return -ENODEV;



		for (i = 0; i < 7; i++)

		for (i = 0; i < 7; i++)

			__set_bit(BTN_0 + i, input_dev->keybit);

			__set_bit(BTN_0 + i, input_dev->keybit);
@@ -2663,12 +2672,6 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev, 




	case INTUOSHT:

	case INTUOSHT:

	case BAMBOO_PT:

	case BAMBOO_PT:

		/* pad device is on the touch interface */

		if (!(features->device_type & WACOM_DEVICETYPE_TOUCH) ||

		    /* Bamboo Pen only tablet does not have pad */

		    ((features->type == BAMBOO_PT) && !features->touch_max))

			return -ENODEV;



		__clear_bit(ABS_MISC, input_dev->absbit);

		__clear_bit(ABS_MISC, input_dev->absbit);





		__set_bit(BTN_LEFT, input_dev->keybit);

		__set_bit(BTN_LEFT, input_dev->keybit);

drivers/hid/wacom_wac.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -76,6 +76,7 @@ 
#define WACOM_DEVICETYPE_NONE           0x0000

#define WACOM_DEVICETYPE_NONE           0x0000

#define WACOM_DEVICETYPE_PEN            0x0001

#define WACOM_DEVICETYPE_PEN            0x0001

#define WACOM_DEVICETYPE_TOUCH          0x0002

#define WACOM_DEVICETYPE_TOUCH          0x0002

#define WACOM_DEVICETYPE_PAD            0x0004





#define WACOM_VENDORDEFINED_PEN		0xff0d0001

#define WACOM_VENDORDEFINED_PEN		0xff0d0001

CRA Git | Maintained and supported by SUSTech CRA and CCSE