Skip to contentSkip to conversation

HID: input - Add two new usages for digitizer

PATCH Applied Ping Cheng 2 participants 2 messages Jun 3, 2014 HID

lore
Share & tools
lore

Ping Cheng

author
#0 lore raw

PATCH 1/1 HID: input - Add two new usages for digitizer

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 <[email protected]>
Reviewed-by Benjamin Tissoires <[email protected]>
---
 drivers/hid/hid-debug.c | 2 ++
 drivers/hid/hid-input.c | 5 +++++
 include/linux/hid.h     | 7 ++-----
 3 files changed, 9 insertions(+), 5 deletions(-)
drivers/hid/hid-debug.c +2 -0
index 53b771d..f299f42 100644
@@ -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"},
drivers/hid/hid-input.c +5 -0
index e7e8b19..da0267e 100644
@@ -684,9 +684,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;
include/linux/hid.h +2 -5
index 720e3a1..a468ec8 100644
@@ -233,11 +233,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

@@ -246,6 +241,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!
Signature · 1 line
1.9.1
Applied
#1 lore raw
Quoted 11 lines · Ping Cheng

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 <[email protected]>
Reviewed-by Benjamin Tissoires <[email protected]>

Applied, thanks.

Signature · 2 lines
Jiri Kosina
SUSE Labs