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

Input: wacom - rearrange type enum 



So we can simplify a few type related if statements

Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Acked-by: default avatarChris Bagwell <chris@cnpbagwell.com>
Reviewed-by: default avatarJason Gerecke <killertofu@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 03ecd229

drivers/input/tablet/wacom_sys.c

+3 −7
Original line number Diff line number Diff line
@@ -440,8 +440,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat 
	/* ask to report Wacom data */

	if (features->device_type == BTN_TOOL_FINGER) {

		/* if it is an MT Tablet PC touch */

		if (features->type == TABLETPC2FG ||

		    features->type == MTSCREEN) {

		if (features->type > TABLETPC) {

			do {

				rep_data[0] = 3;

				rep_data[1] = 4;
@@ -460,7 +459,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat 
			} while ((error < 0 || rep_data[1] != 4) &&

				 limit++ < WAC_MSG_RETRIES);

		}

	} else if (features->type != TABLETPC &&

	} else if (features->type <= BAMBOO_PT &&

		   features->type != WIRELESS &&

		   features->device_type == BTN_TOOL_PEN) {

		do {
@@ -510,10 +509,7 @@ static int wacom_retrieve_hid_descriptor(struct usb_interface *intf, 
	}



	/* only devices that support touch need to retrieve the info */

	if (features->type != TABLETPC &&

	    features->type != TABLETPC2FG &&

	    features->type != BAMBOO_PT &&

	    features->type != MTSCREEN) {

	if (features->type < BAMBOO_PT) {

		goto out;

	}

drivers/input/tablet/wacom_wac.c

+2 −4
Original line number Diff line number Diff line
@@ -1317,10 +1317,8 @@ void wacom_setup_device_quirks(struct wacom_features *features) 
	}



	/* these device have multiple inputs */

	if (features->type == TABLETPC || features->type == TABLETPC2FG ||

	    features->type == BAMBOO_PT || features->type == WIRELESS ||

	    (features->type >= INTUOS5S && features->type <= INTUOS5L) ||

	    features->type == MTSCREEN)

	if (features->type >= WIRELESS ||

	    (features->type >= INTUOS5S && features->type <= INTUOS5L))

		features->quirks |= WACOM_QUIRK_MULTI_INPUT;



	/* quirk for bamboo touch with 2 low res touches */

drivers/input/tablet/wacom_wac.h

+3 −3
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ enum { 
	PTU,

	PL,

	DTU,

	BAMBOO_PT,

	WIRELESS,

	INTUOS,

	INTUOS3S,

	INTUOS3,
@@ -79,7 +77,9 @@ enum { 
	CINTIQ,

	WACOM_BEE,

	WACOM_MO,

	TABLETPC,

	WIRELESS,

	BAMBOO_PT,

	TABLETPC,   /* add new TPC below */

	TABLETPC2FG,

	MTSCREEN,

	MAX_TYPE

CRA Git | Maintained and supported by SUSTech CRA and CCSE