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

Commit b1f466a9 authored by Aaron Armstrong Skomra's avatar Aaron Armstrong Skomra Committed by Jiri Kosina
Browse files

HID: wacom: generic: add the "Report Valid" usage 



Wacom Bluetooth reports contain multiple pen frames per report.
Each frame contains a flag indicating if the frame is valid.
Future Wacom devices with this type of report may contain HID
descriptors, add support for this usage to the generic codepath
of the Wacom driver.

Signed-off-by: default avatarAaron Armstrong Skomra <skomra@gmail.com>
Reviewed-by: default avatarPing Cheng <ping.cheng@wacom.com>
Reviewed-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent f8b6a747

drivers/hid/wacom_wac.c

+15 −1
Original line number Diff line number Diff line
@@ -1715,7 +1715,8 @@ int wacom_equivalent_usage(int usage) 
		    usage == WACOM_HID_WD_TOUCHSTRIP ||

		    usage == WACOM_HID_WD_TOUCHSTRIP2 ||

		    usage == WACOM_HID_WD_TOUCHRING ||

		    usage == WACOM_HID_WD_TOUCHRINGSTATUS) {

		    usage == WACOM_HID_WD_TOUCHRINGSTATUS ||

		    usage == WACOM_HID_WD_REPORT_VALID) {

			return usage;

		}
@@ -2199,6 +2200,9 @@ static void wacom_wac_pen_event(struct hid_device *hdev, struct hid_field *field 
	struct input_dev *input = wacom_wac->pen_input;

	unsigned equivalent_usage = wacom_equivalent_usage(usage->hid);



	if (wacom_wac->is_invalid_bt_frame)

		return;



	switch (equivalent_usage) {

	case HID_GD_Z:

		/*
@@ -2295,6 +2299,9 @@ static void wacom_wac_pen_event(struct hid_device *hdev, struct hid_field *field 
				 features->offset_bottom);

		features->offset_bottom = value;

		return;

	case WACOM_HID_WD_REPORT_VALID:

		wacom_wac->is_invalid_bt_frame = !value;

		return;

	}



	/* send pen events only when touch is up or forced out
@@ -2313,6 +2320,10 @@ static void wacom_wac_pen_event(struct hid_device *hdev, struct hid_field *field 
static void wacom_wac_pen_pre_report(struct hid_device *hdev,

		struct hid_report *report)

{

	struct wacom *wacom = hid_get_drvdata(hdev);

	struct wacom_wac *wacom_wac = &wacom->wacom_wac;



	wacom_wac->is_invalid_bt_frame = false;

	return;

}
@@ -2325,6 +2336,9 @@ static void wacom_wac_pen_report(struct hid_device *hdev, 
	bool range = wacom_wac->hid_data.inrange_state;

	bool sense = wacom_wac->hid_data.sense_state;



	if (wacom_wac->is_invalid_bt_frame)

		return;



	if (!wacom_wac->tool[0] && range) { /* first in range */

		/* Going into range select tool */

		if (wacom_wac->hid_data.invert_state)

drivers/hid/wacom_wac.h

+2 −1
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ 
#define WACOM_HID_WD_TOUCHSTRIP2        (WACOM_HID_UP_WACOMDIGITIZER | 0x0137)

#define WACOM_HID_WD_TOUCHRING          (WACOM_HID_UP_WACOMDIGITIZER | 0x0138)

#define WACOM_HID_WD_TOUCHRINGSTATUS    (WACOM_HID_UP_WACOMDIGITIZER | 0x0139)

#define WACOM_HID_WD_REPORT_VALID       (WACOM_HID_UP_WACOMDIGITIZER | 0x01d0)

#define WACOM_HID_WD_ACCELEROMETER_X    (WACOM_HID_UP_WACOMDIGITIZER | 0x0401)

#define WACOM_HID_WD_ACCELEROMETER_Y    (WACOM_HID_UP_WACOMDIGITIZER | 0x0402)

#define WACOM_HID_WD_ACCELEROMETER_Z    (WACOM_HID_UP_WACOMDIGITIZER | 0x0403)
@@ -353,7 +354,7 @@ struct wacom_wac { 
	bool has_mute_touch_switch;

	bool has_mode_change;

	bool is_direct_mode;



	bool is_invalid_bt_frame;

};



#endif