Commit d97a5522 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: wacom: use WACOM_*_FIELD macros in wacom_usage_mapping() 



We introduced nice macros in wacom_wac.c to check whether a field is
a pen or a touch one.

wacom_usage_mapping() still uses it's own tests, which are not in sync with
the wacom_wac tests (.application is not checked).

That means that some legitimate fields might be filtered out from the
usage mapping, and thus will not be used properly while receiving the
events.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 0349678c

drivers/hid/wacom_sys.c

+2 −4
Original line number Diff line number Diff line
@@ -173,10 +173,8 @@ static void wacom_usage_mapping(struct hid_device *hdev, 
{

	struct wacom *wacom = hid_get_drvdata(hdev);

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

	bool finger = (field->logical == HID_DG_FINGER) ||

		      (field->physical == HID_DG_FINGER);

	bool pen = (field->logical == HID_DG_STYLUS) ||

		   (field->physical == HID_DG_STYLUS);

	bool finger = WACOM_FINGER_FIELD(field);

	bool pen = WACOM_PEN_FIELD(field);



	/*

	* Requiring Stylus Usage will ignore boot mouse

drivers/hid/wacom_wac.c

+0 −8
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "wacom_wac.h"

#include "wacom.h"

#include <linux/input/mt.h>

#include <linux/hid.h>



/* resolution for penabled devices */

#define WACOM_PL_RES		20
@@ -1514,13 +1513,6 @@ static void wacom_wac_finger_report(struct hid_device *hdev, 
	wacom_wac->shared->touch_down = wacom_wac_finger_count_touches(hdev);

}



#define WACOM_PEN_FIELD(f)	(((f)->logical == HID_DG_STYLUS) || \

				 ((f)->physical == HID_DG_STYLUS) || \

				 ((f)->application == HID_DG_PEN))

#define WACOM_FINGER_FIELD(f)	(((f)->logical == HID_DG_FINGER) || \

				 ((f)->physical == HID_DG_FINGER) || \

				 ((f)->application == HID_DG_TOUCHSCREEN))



void wacom_wac_usage_mapping(struct hid_device *hdev,

		struct hid_field *field, struct hid_usage *usage)

{

drivers/hid/wacom_wac.h

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define WACOM_WAC_H



#include <linux/types.h>

#include <linux/hid.h>



/* maximum packet length for USB devices */

#define WACOM_PKGLEN_MAX	68
@@ -71,6 +72,13 @@ 
#define WACOM_QUIRK_MONITOR		0x0008

#define WACOM_QUIRK_BATTERY		0x0010



#define WACOM_PEN_FIELD(f)	(((f)->logical == HID_DG_STYLUS) || \

				 ((f)->physical == HID_DG_STYLUS) || \

				 ((f)->application == HID_DG_PEN))

#define WACOM_FINGER_FIELD(f)	(((f)->logical == HID_DG_FINGER) || \

				 ((f)->physical == HID_DG_FINGER) || \

				 ((f)->application == HID_DG_TOUCHSCREEN))



enum {

	PENPARTNER = 0,

	GRAPHIRE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE