Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

HID: wacom: Rename wacom ID report ID macros 



"INTUOSREAD" and "INTUOSWRITE" are poorly named. These are report IDs
for pen ID (proximity) packets. It should be noted that the latter is
only used on Intuos/Intuos2 for a second stylus when DualTrack is in use.

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

drivers/hid/wacom_wac.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -443,7 +443,7 @@ static void wacom_intuos_schedule_prox_event(struct wacom_wac *wacom_wac) 
	struct hid_report_enum *re;

	struct hid_report_enum *re;





	re = &(wacom->hdev->report_enum[HID_FEATURE_REPORT]);

	re = &(wacom->hdev->report_enum[HID_FEATURE_REPORT]);

	r = re->report_id_hash[WACOM_REPORT_INTUOSREAD];

	r = re->report_id_hash[WACOM_REPORT_INTUOS_ID1];

	if (r) {

	if (r) {

		hid_hw_request(wacom->hdev, r, HID_REQ_GET_REPORT);

		hid_hw_request(wacom->hdev, r, HID_REQ_GET_REPORT);

	}

	}
@@ -1027,8 +1027,8 @@ static int wacom_intuos_irq(struct wacom_wac *wacom) 
	int result;

	int result;





	if (data[0] != WACOM_REPORT_PENABLED &&

	if (data[0] != WACOM_REPORT_PENABLED &&

	    data[0] != WACOM_REPORT_INTUOSREAD &&

	    data[0] != WACOM_REPORT_INTUOS_ID1 &&

	    data[0] != WACOM_REPORT_INTUOSWRITE &&

	    data[0] != WACOM_REPORT_INTUOS_ID2 &&

	    data[0] != WACOM_REPORT_INTUOSPAD &&

	    data[0] != WACOM_REPORT_INTUOSPAD &&

	    data[0] != WACOM_REPORT_INTUOS_PEN &&

	    data[0] != WACOM_REPORT_INTUOS_PEN &&

	    data[0] != WACOM_REPORT_CINTIQ &&

	    data[0] != WACOM_REPORT_CINTIQ &&

drivers/hid/wacom_wac.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -47,8 +47,8 @@ 
/* wacom data packet report IDs */

/* wacom data packet report IDs */

#define WACOM_REPORT_PENABLED		2

#define WACOM_REPORT_PENABLED		2

#define WACOM_REPORT_PENABLED_BT	3

#define WACOM_REPORT_PENABLED_BT	3

#define WACOM_REPORT_INTUOSREAD		5

#define WACOM_REPORT_INTUOS_ID1		5

#define WACOM_REPORT_INTUOSWRITE	6

#define WACOM_REPORT_INTUOS_ID2		6

#define WACOM_REPORT_INTUOSPAD		12

#define WACOM_REPORT_INTUOSPAD		12

#define WACOM_REPORT_INTUOS5PAD		3

#define WACOM_REPORT_INTUOS5PAD		3

#define WACOM_REPORT_DTUSPAD		21

#define WACOM_REPORT_DTUSPAD		21