summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-uclogic-params.h
diff options
context:
space:
mode:
authorNikolai Kondrashov <spbnick@gmail.com>2022-05-08 18:01:42 +0200
committerJiri Kosina <jkosina@suse.cz>2022-05-11 14:19:27 +0200
commitcaf7e93479c73374a9fcad29f90477280444584e (patch)
tree60b48b94a083b106b656db8658086d3fdbe1254e /drivers/hid/hid-uclogic-params.h
parent945d5dd5a5f88b99c090d80948f589416e2ceb37 (diff)
HID: uclogic: Do not focus on touch ring only
Accommodate both touch ring and touch strip in naming throughout hid-uclogic by talking about abstract "touch" instead of "touch ring", wherever possible. Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com> Signed-off-by: José Expósito <jose.exposito89@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-uclogic-params.h')
-rw-r--r--drivers/hid/hid-uclogic-params.h27
1 files changed, 14 insertions, 13 deletions
diff --git a/drivers/hid/hid-uclogic-params.h b/drivers/hid/hid-uclogic-params.h
index c7573f70d35c..5bef8daaa607 100644
--- a/drivers/hid/hid-uclogic-params.h
+++ b/drivers/hid/hid-uclogic-params.h
@@ -128,31 +128,32 @@ struct uclogic_params_frame {
* Offset of the Wacom-style device ID byte in the report, to be set
* to pad device ID (0xf), for compatibility with Wacom drivers. Zero
* if no changes to the report should be made. The ID byte will be set
- * to zero whenever the byte pointed by "touch_ring_byte" is zero, if
+ * to zero whenever the byte pointed by "touch_byte" is zero, if
* the latter is valid. Only valid if "id" is not zero.
*/
unsigned int dev_id_byte;
/*
- * Offset of the touch ring state byte, in the report.
+ * Offset of the touch ring/strip state byte, in the report.
* Zero if not present. If dev_id_byte is also valid and non-zero,
* then the device ID byte will be cleared when the byte pointed to by
* this offset is zero. Only valid if "id" is not zero.
*/
- unsigned int touch_ring_byte;
-
- /*
- * Maximum value of the touch ring report.
- * The minimum valid value is considered to be one,
- * with zero being out-of-proximity (finger lift) value.
- */
- __s8 touch_ring_max;
-
+ unsigned int touch_byte;
/*
- * The value to anchor the reversed reports at.
+ * The value to anchor the reversed touch ring/strip reports at.
* I.e. one, if the reports should be flipped without offset.
* Zero if no reversal should be done.
+ * Only valid if "touch_byte" is valid and not zero.
+ */
+ __s8 touch_flip_at;
+ /*
+ * Maximum value of the touch ring/strip report around which the value
+ * should be wrapped when flipping according to "touch_flip_at".
+ * The minimum valid value is considered to be one, with zero being
+ * out-of-proximity (finger lift) value.
+ * Only valid if "touch_flip_at" is valid and not zero.
*/
- __s8 touch_ring_flip_at;
+ __s8 touch_max;
/*
* Offset of the bitmap dial byte, in the report. Zero if not present.
* Only valid if "id" is not zero. A bitmap dial sends reports with a