diff options
| author | Ping Cheng <pinglinux@gmail.com> | 2014-06-02 17:19:52 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-07-30 14:10:57 +0200 |
| commit | 706733db1391fbf31e6eb734d5bc7c5378183060 (patch) | |
| tree | 0eaf7d29ef47005625700c523c2a652dd90e792a /include | |
| parent | 4901b77517aca6fb0c99d3acfa4e44bc605f0b0f (diff) | |
| download | linux-stable-706733db1391fbf31e6eb734d5bc7c5378183060.tar.gz linux-stable-706733db1391fbf31e6eb734d5bc7c5378183060.tar.bz2 linux-stable-706733db1391fbf31e6eb734d5bc7c5378183060.zip | |
HID: core: add two new usages for digitizer
commit 368c96640d10a145da5f258f2d2833668d4f3629 upstream.
On Feb 17, 2014, two new usages are approved to HID usage Table 18 -
Digitizer Page:
5A Secondary Barrel Switch MC 16.4
5B Transducer Serial Number SV 16.3.1
This patch adds relevant definitions to hid/input. It also removes
outdated comments in hid.h.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Cc: Oliver Neukum <ONeukum@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 00c88fccd162..2cd43971c297 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -230,11 +230,6 @@ struct hid_item { #define HID_DG_BARRELSWITCH 0x000d0044 #define HID_DG_ERASER 0x000d0045 #define HID_DG_TABLETPICK 0x000d0046 -/* - * as of May 20, 2009 the usages below are not yet in the official USB spec - * but are being pushed by Microsft as described in their paper "Digitizer - * Drivers for Windows Touch and Pen-Based Computers" - */ #define HID_DG_CONFIDENCE 0x000d0047 #define HID_DG_WIDTH 0x000d0048 #define HID_DG_HEIGHT 0x000d0049 @@ -243,6 +238,8 @@ struct hid_item { #define HID_DG_DEVICEINDEX 0x000d0053 #define HID_DG_CONTACTCOUNT 0x000d0054 #define HID_DG_CONTACTMAX 0x000d0055 +#define HID_DG_BARRELSWITCH2 0x000d005a +#define HID_DG_TOOLSERIALNUMBER 0x000d005b /* * HID report types --- Ouch! HID spec says 1 2 3! |