| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220812103519.2142290-1-tero.kristo@linux.intel.com>
Date: Fri, 12 Aug 2022 13:35:19 +0300
From: Tero Kristo <tero.kristo@...ux.intel.com>
To: linux-input@...r.kernel.org, benjamin.tissoires@...hat.com,
jikos@...nel.org
Cc: linux-kernel@...r.kernel.org, dmitry.torokhov@...il.com
Subject: [PATCH] HID: input: Add support for USI style events
Add support for Universal Stylus Interface (USI) style events to the HID
input layers. The events are mapped as follows:
type id event
---- -- -----
MSC(4) 6 Pen ID
MSC(4) 7 Pen Color
MSC(4) 8 Pen Line Style Ink
MSC(4) 9 Pen Line Style Pencil
MSC(4) 0xa Pen Line Style Highlighter
MSC(4) 0xb Pen Line Style Chisel Marker
MSC(4) 0xc Pen Line Style Brush
MSC(4) 0xd Pen No Preferred Line Style
ABS(3) 0x1c Pen Line Width
All the listed MSC events are new, the ABS one is mapped to an existing
event.
Signed-off-by: Tero Kristo <tero.kristo@...ux.intel.com>
---
drivers/hid/hid-debug.c | 9 ++++++-
drivers/hid/hid-input.c | 36 ++++++++++++++++++++++++++
include/linux/mod_devicetable.h | 2 +-
include/uapi/linux/input-event-codes.h | 10 ++++++-
4 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 81e7e404a5fc..1394370ec6d5 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -1028,7 +1028,14 @@ static const char *absolutes[ABS_CNT] = {
static const char *misc[MSC_MAX + 1] = {
[MSC_SERIAL] = "Serial", [MSC_PULSELED] = "Pulseled",
- [MSC_GESTURE] = "Gesture", [MSC_RAW] = "RawData"
+ [MSC_GESTURE] = "Gesture", [MSC_RAW] = "RawData",
+ [MSC_PEN_ID] = "PenID", [MSC_PEN_COLOR] = "PenColor",
+ [MSC_PEN_LINE_STYLE_INK] = "PenLineStyleInk",
+ [MSC_PEN_LINE_STYLE_PENCIL] = "PenLineStylePencil",
+ [MSC_PEN_LINE_STYLE_HIGHLIGHTER] = "PenLineStyleHighLighter",
+ [MSC_PEN_LINE_STYLE_CHISEL_MARKER] = "PenLineStyleChiselMarker",
+ [MSC_PEN_LINE_STYLE_BRUSH] = "PenLineStyleBrush",
+ [MSC_PEN_LINE_STYLE_NO_PREFERENCE] = "PenLineStyleNoPreference",
};
static const char *leds[LED_MAX + 1] = {
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index c6b27aab9041..54ff99453a44 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -925,6 +925,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
}
break;
+ case 0x38: /* Transducer Index */
+ map_msc(MSC_PEN_ID);
+ break;
+
case 0x3b: /* Battery Strength */
hidinput_setup_battery(device, HID_INPUT_REPORT, field, false);
usage->type = EV_PWR;
@@ -972,6 +976,38 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
map_msc(MSC_SERIAL);
break;
+ case 0x5c: /* USI Pen Color */
+ map_msc(MSC_PEN_COLOR);
+ break;
+
+ case 0x5e: /* USI Pen Line Width */
+ map_abs(ABS_TOOL_WIDTH);
+ break;
+
+ case 0x72: /* USI Pen preferred line style: Ink */
+ map_msc(MSC_PEN_LINE_STYLE_INK);
+ break;
+
+ case 0x73: /* USI Pen preferred line style: Pencil */
+ map_msc(MSC_PEN_LINE_STYLE_PENCIL);
+ break;
+
+ case 0x74: /* USI Pen preferred line style: Highlighter */
+ map_msc(MSC_PEN_LINE_STYLE_HIGHLIGHTER);
+ break;
+
+ case 0x75: /* USI Pen preferred line style: Chisel Marker */
+ map_msc(MSC_PEN_LINE_STYLE_CHISEL_MARKER);
+ break;
+
+ case 0x76: /* USI Pen preferred line style: Brush */
+ map_msc(MSC_PEN_LINE_STYLE_BRUSH);
+ break;
+
+ case 0x77: /* USI Pen no preferred line style */
+ map_msc(MSC_PEN_LINE_STYLE_NO_PREFERENCE);
+ break;
+
default: goto unknown;
}
break;
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 549590e9c644..db0d0ae27161 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -322,7 +322,7 @@ struct pcmcia_device_id {
#define INPUT_DEVICE_ID_KEY_MAX 0x2ff
#define INPUT_DEVICE_ID_REL_MAX 0x0f
#define INPUT_DEVICE_ID_ABS_MAX 0x3f
-#define INPUT_DEVICE_ID_MSC_MAX 0x07
+#define INPUT_DEVICE_ID_MSC_MAX 0x0d
#define INPUT_DEVICE_ID_LED_MAX 0x0f
#define INPUT_DEVICE_ID_SND_MAX 0x07
#define INPUT_DEVICE_ID_FF_MAX 0x7f
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index dff8e7f17074..486a1d6c9db1 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -930,7 +930,15 @@
#define MSC_RAW 0x03
#define MSC_SCAN 0x04
#define MSC_TIMESTAMP 0x05
-#define MSC_MAX 0x07
+#define MSC_PEN_ID 0x06
+#define MSC_PEN_COLOR 0x07
+#define MSC_PEN_LINE_STYLE_INK 0x08
+#define MSC_PEN_LINE_STYLE_PENCIL 0x09
+#define MSC_PEN_LINE_STYLE_HIGHLIGHTER 0x0a
+#define MSC_PEN_LINE_STYLE_CHISEL_MARKER 0x0b
+#define MSC_PEN_LINE_STYLE_BRUSH 0x0c
+#define MSC_PEN_LINE_STYLE_NO_PREFERENCE 0x0d
+#define MSC_MAX 0x0d
#define MSC_CNT (MSC_MAX+1)
/*
--
2.25.1
Powered by blists - more mailing lists