Skip to contentSkip to conversation

HID: wacom: generic: Recognize WACOM_HID_WD_PEN as a type of pen collection

PATCH Applied Jason Gerecke 3 participants 5 messages Oct 18, 2017 – Nov 10, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 HID: wacom: generic: Recognize WACOM_HID_WD_PEN as a type of pen collection

The WACOM_PEN_FIELD macro is used to determine if a given HID field should be associated with pen input. This field includes several known collection types that Wacom pen data is contained in, but the WACOM_HID_WD_PEN application collection type is notably missing. This can result in fields within this kind of collection being completely ignored by the wacom_usage_mapping function, preventing the later '*_event' functions from being notified about changes to their value.

Fixes c9c095874a ("HID: wacom: generic: Support and use 'Custom HID' mode and usages")
Fixes ac2423c975 ("HID: wacom: generic: add vendor defined touch")
---
 drivers/hid/wacom_wac.h | 1 +
 1 file changed, 1 insertion(+)
drivers/hid/wacom_wac.h +1 -0
index 8a03654048bf..feb62fd4dfc3 100644
@@ -166,6 +166,7 @@
 				 ((f)->physical == HID_DG_PEN) || \
 				 ((f)->application == HID_DG_PEN) || \
 				 ((f)->application == HID_DG_DIGITIZER) || \
+				 ((f)->application == WACOM_HID_WD_PEN) || \
 				 ((f)->application == WACOM_HID_WD_DIGITIZER) || \
 				 ((f)->application == WACOM_HID_G9_PEN) || \
 				 ((f)->application == WACOM_HID_G11_PEN))
Signature · 1 line
2.14.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Jason Gerecke

The WACOM_PEN_FIELD macro is used to determine if a given HID field should be associated with pen input. This field includes several known collection types that Wacom pen data is contained in, but the WACOM_HID_WD_PEN application collection type is notably missing. This can result in fields within this kind of collection being completely ignored by the wacom_usage_mapping function, preventing the later '*_event' functions from being notified about changes to their value.

Quoted 5 lines
Fixes c9c095874a ("HID: wacom: generic: Support and use 'Custom HID' mode and usages")
Fixes ac2423c975 ("HID: wacom: generic: add vendor defined touch")

---

Looks good:

Quoted 18 lines
 drivers/hid/wacom_wac.h | 1 +
 1 file changed, 1 insertion(+)
drivers/hid/wacom_wac.h +1 -0
index 8a03654048bf..feb62fd4dfc3 100644
@@ -166,6 +166,7 @@
 				 ((f)->physical == HID_DG_PEN) || \
 				 ((f)->application == HID_DG_PEN) || \
 				 ((f)->application == HID_DG_DIGITIZER) || \
+				 ((f)->application == WACOM_HID_WD_PEN) || \
 				 ((f)->application == WACOM_HID_WD_DIGITIZER) || \
 				 ((f)->application == WACOM_HID_G9_PEN) || \
 				 ((f)->application == WACOM_HID_G11_PEN))
Signature · 1 line
2.14.2
maintainer Applied
#2 lore raw
In reply to Jason Gerecke
Quoted 8 lines · Jason Gerecke

The WACOM_PEN_FIELD macro is used to determine if a given HID field should be associated with pen input. This field includes several known collection types that Wacom pen data is contained in, but the WACOM_HID_WD_PEN application collection type is notably missing. This can result in fields within this kind of collection being completely ignored by the wacom_usage_mapping function, preventing the later '*_event' functions from being notified about changes to their value.

Quoted 4 lines
Fixes c9c095874a ("HID: wacom: generic: Support and use 'Custom HID' mode and usages")
Fixes ac2423c975 ("HID: wacom: generic: add vendor defined touch")

Applied to for-4.14/upstream-fixes

Signature · 2 lines
Jiri Kosina
SUSE Labs
#3 lore raw
Quoted 15 lines · Jiri Kosina
Quoted 8 lines · Jason Gerecke

The WACOM_PEN_FIELD macro is used to determine if a given HID field should be associated with pen input. This field includes several known collection types that Wacom pen data is contained in, but the WACOM_HID_WD_PEN application collection type is notably missing. This can result in fields within this kind of collection being completely ignored by the wacom_usage_mapping function, preventing the later '*_event' functions from being notified about changes to their value.

Quoted 4 lines
Fixes c9c095874a ("HID: wacom: generic: Support and use 'Custom HID' mode and usages")
Fixes ac2423c975 ("HID: wacom: generic: add vendor defined touch")
Quoted 6 lines

Applied to for-4.14/upstream-fixes

--
Jiri Kosina
SUSE Labs

Was this branch ever sent to Linus? I don't see any mention of it (or this patch) in the 4.14-rc8 history...

Jason
---
Now instead of four in the eights place /
you’ve got three, ‘Cause you added one /
(That is to say, eight) to the two, /
But you can’t take seven from three, /
So you look at the sixty-fours....

maintainer
#4 lore raw
Quoted 2 lines · Jason Gerecke

Was this branch ever sent to Linus? I don't see any mention of it (or this patch) in the 4.14-rc8 history...

I take the blame here; last few weeks were a bit crazy for me, and this slipped through cracks.

I'll be submitting the whole lot for stable, so that it gets included everywhere properly.

Signature · 2 lines
Jiri Kosina
SUSE Labs