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 /drivers/hid | |
| parent | 4901b77517aca6fb0c99d3acfa4e44bc605f0b0f (diff) | |
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 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-debug.c | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-input.c | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index 53eaa0b6b1d1..436c774cc221 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c @@ -165,6 +165,8 @@ static const struct hid_usage_entry hid_usage_table[] = { {0, 0x53, "DeviceIndex"}, {0, 0x54, "ContactCount"}, {0, 0x55, "ContactMaximumNumber"}, + {0, 0x5A, "SecondaryBarrelSwitch"}, + {0, 0x5B, "TransducerSerialNumber"}, { 15, 0, "PhysicalInterfaceDevice" }, {0, 0x00, "Undefined"}, {0, 0x01, "Physical_Interface_Device"}, diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 40113e9db514..8c58c820488c 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -690,9 +690,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel break; case 0x46: /* TabletPick */ + case 0x5a: /* SecondaryBarrelSwitch */ map_key_clear(BTN_STYLUS2); break; + case 0x5b: /* TransducerSerialNumber */ + set_bit(MSC_SERIAL, input->mscbit); + break; + default: goto unknown; } break; |