diff options
| author | Jason Gerecke | 2016-10-20 03:03:38 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2016-10-20 09:53:55 +0200 |
| commit | 1b18b75c7e2452fc6f4cd1bb701efc4438532a07 (patch) | |
| tree | 87dbfc50c64287bb39d9e889fa26365fe0c86e6c /drivers/hid/wacom_wac.h | |
| parent | HID: wacom: Update vendor-defined usage names to better match standards (diff) | |
| download | kernel-qcow2-linux-1b18b75c7e2452fc6f4cd1bb701efc4438532a07.tar.gz kernel-qcow2-linux-1b18b75c7e2452fc6f4cd1bb701efc4438532a07.tar.xz kernel-qcow2-linux-1b18b75c7e2452fc6f4cd1bb701efc4438532a07.zip | |
HID: wacom: Have WACOM_PEN_FIELD and WACOM_FINGER_FIELD recgonize more fields
We've defined several new usages (e.g. WACOM_G9_PEN and WACOM_G9_TOUCHSCREEN)
which aren't checked by the WACOM_PEN_FIELD and WACOM_FINGER_FIELD macros but
probably should be.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_wac.h')
| -rw-r--r-- | drivers/hid/wacom_wac.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index f58bbd18209c..d2629c81c51a 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -98,10 +98,14 @@ ((f)->physical == HID_DG_PEN) || \ ((f)->application == HID_DG_PEN) || \ ((f)->application == HID_DG_DIGITIZER) || \ - ((f)->application == WACOM_HID_WD_DIGITIZER)) + ((f)->application == WACOM_HID_WD_DIGITIZER) || \ + ((f)->application == WACOM_HID_G9_PEN) || \ + ((f)->application == WACOM_HID_G11_PEN)) #define WACOM_FINGER_FIELD(f) (((f)->logical == HID_DG_FINGER) || \ ((f)->physical == HID_DG_FINGER) || \ - ((f)->application == HID_DG_TOUCHSCREEN)) + ((f)->application == HID_DG_TOUCHSCREEN) || \ + ((f)->application == WACOM_HID_G9_TOUCHSCREEN) || \ + ((f)->application == WACOM_HID_G11_TOUCHSCREEN)) enum { PENPARTNER = 0, |