The vendor-defined 0xFF0D01032 ("Distance") usage is nearly equivalent to
HID_GD_Z, except that the axis direction is inverted. Unlike HID_GD_Z which
increases in value as the pen-to-surface distance is decreased, this usage
decreases. Treat this usage as a special case to ensure we don't invert the
scale to be ABS_DISTANCE compatible like we do for HID_GD_Z.
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoi...@redhat.com>
[jason.gere...@wacom.com: Imported into input-wacom repository (b5c921e)]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
[jason.gere...@wacom.com: backported from input-wacom repository (8c3e162)]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
3.17/wacom_wac.c | 4 +++-
3.17/wacom_wac.h | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/3.17/wacom_wac.c b/3.17/wacom_wac.c
index 3a4eacd..9f92ea0 100644
--- a/3.17/wacom_wac.c
+++ b/3.17/wacom_wac.c
@@ -1449,7 +1449,8 @@ static int wacom_equivalent_usage(int usage)
int subusage = (usage & 0xFF);
if (subpage == WACOM_HID_SP_DIGITIZER ||
- subpage == WACOM_HID_SP_DIGITIZERINFO) {
+ subpage == WACOM_HID_SP_DIGITIZERINFO ||
+ usage == WACOM_HID_WD_DISTANCE) {
return usage;
}
@@ -1509,6 +1510,7 @@ static void wacom_wac_pen_usage_mapping(struct hid_device
*hdev,
case HID_GD_Y:
wacom_map_usage(input, usage, field, EV_ABS, ABS_Y, 4);
break;
+ case WACOM_HID_WD_DISTANCE:
case HID_GD_Z:
wacom_map_usage(input, usage, field, EV_ABS, ABS_DISTANCE, 0);
break;
diff --git a/3.17/wacom_wac.h b/3.17/wacom_wac.h
index f912cac..131b469 100644
--- a/3.17/wacom_wac.h
+++ b/3.17/wacom_wac.h
@@ -100,6 +100,7 @@
#define WACOM_HID_SP_DIGITIZER 0x000d0000
#define WACOM_HID_SP_DIGITIZERINFO 0x00100000
#define WACOM_HID_WD_DIGITIZER (WACOM_HID_UP_WACOMDIGITIZER | 0x01)
+#define WACOM_HID_WD_DISTANCE (WACOM_HID_UP_WACOMDIGITIZER | 0x0132)
#define WACOM_HID_WD_DATAMODE (WACOM_HID_UP_WACOMDIGITIZER | 0x1002)
#define WACOM_HID_UP_G9 0xff090000
#define WACOM_HID_G9_PEN (WACOM_HID_UP_G9 | 0x02)
--
2.10.2
------------------------------------------------------------------------------
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
