* [PATCH v2 01/16] HID: add haptics page defines
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 02/16] Input: add FF_HID effect type Angela Czubak
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
Introduce haptic usages as defined in HID Usage Tables specification.
Add HID units for newton and gram.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
include/linux/hid.h | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 7487b0586fe6..4584ce744d02 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -153,6 +153,7 @@ struct hid_item {
#define HID_UP_TELEPHONY 0x000b0000
#define HID_UP_CONSUMER 0x000c0000
#define HID_UP_DIGITIZER 0x000d0000
+#define HID_UP_HAPTIC 0x000e0000
#define HID_UP_PID 0x000f0000
#define HID_UP_BATTERY 0x00850000
#define HID_UP_HPVENDOR 0xff7f0000
@@ -311,6 +312,28 @@ struct hid_item {
#define HID_DG_TOOLSERIALNUMBER 0x000d005b
#define HID_DG_LATENCYMODE 0x000d0060
+#define HID_HP_SIMPLECONTROLLER 0x000e0001
+#define HID_HP_WAVEFORMLIST 0x000e0010
+#define HID_HP_DURATIONLIST 0x000e0011
+#define HID_HP_AUTOTRIGGER 0x000e0020
+#define HID_HP_MANUALTRIGGER 0x000e0021
+#define HID_HP_AUTOTRIGGERASSOCIATEDCONTROL 0x000e0022
+#define HID_HP_INTENSITY 0x000e0023
+#define HID_HP_REPEATCOUNT 0x000e0024
+#define HID_HP_RETRIGGERPERIOD 0x000e0025
+#define HID_HP_WAVEFORMVENDORPAGE 0x000e0026
+#define HID_HP_WAVEFORMVENDORID 0x000e0027
+#define HID_HP_WAVEFORMCUTOFFTIME 0x000e0028
+#define HID_HP_WAVEFORMNONE 0x000e1001
+#define HID_HP_WAVEFORMSTOP 0x000e1002
+#define HID_HP_WAVEFORMCLICK 0x000e1003
+#define HID_HP_WAVEFORMBUZZCONTINUOUS 0x000e1004
+#define HID_HP_WAVEFORMRUMBLECONTINUOUS 0x000e1005
+#define HID_HP_WAVEFORMPRESS 0x000e1006
+#define HID_HP_WAVEFORMRELEASE 0x000e1007
+#define HID_HP_VENDORWAVEFORMMIN 0x000e2001
+#define HID_HP_VENDORWAVEFORMMAX 0x000e2fff
+
#define HID_BAT_ABSOLUTESTATEOFCHARGE 0x00850065
#define HID_VD_ASUS_CUSTOM_MEDIA_KEYS 0xff310076
@@ -398,6 +421,12 @@ struct hid_item {
#define HID_REPORT_PROTOCOL 1
#define HID_BOOT_PROTOCOL 0
+/*
+ * HID units
+ */
+#define HID_UNIT_GRAM 0x0101
+#define HID_UNIT_NEWTON 0xe111
+
/*
* This is the global environment of the parser. This information is
* persistent for main-items. The global environment can be saved and
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 02/16] Input: add FF_HID effect type
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
2022-01-14 18:31 ` [PATCH v2 01/16] HID: add haptics page defines Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 03/16] Input: add INPUT_PROP_HAPTIC_TOUCHPAD Angela Czubak
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
FF_HID effect type can be used to trigger haptic feedback with HID simple
haptic usages.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
include/uapi/linux/input.h | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index ee3127461ee0..ccf43a21d43d 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -424,6 +424,24 @@ struct ff_rumble_effect {
__u16 weak_magnitude;
};
+/**
+ * struct ff_hid_effect
+ * @hid_usage: hid_usage according to Haptics page (WAVEFORM_CLICK, etc.)
+ * @vendor_id: the waveform vendor ID if hid_usage is in the vendor-defined range
+ * @vendor_waveform_page: the vendor waveform page if hid_usage is in the vendor-defined range
+ * @intensity: strength of the effect as percentage
+ * @repeat_count: number of times to retrigger effect
+ * @retrigger_period: time before effect is retriggered (in ms)
+ */
+struct ff_hid_effect {
+ __u16 hid_usage;
+ __u16 vendor_id;
+ __u8 vendor_waveform_page;
+ __u16 intensity;
+ __u16 repeat_count;
+ __u16 retrigger_period;
+};
+
/**
* struct ff_effect - defines force feedback effect
* @type: type of the effect (FF_CONSTANT, FF_PERIODIC, FF_RAMP, FF_SPRING,
@@ -460,6 +478,7 @@ struct ff_effect {
struct ff_periodic_effect periodic;
struct ff_condition_effect condition[2]; /* One for each axis */
struct ff_rumble_effect rumble;
+ struct ff_hid_effect hid;
} u;
};
@@ -467,6 +486,7 @@ struct ff_effect {
* Force feedback effect types
*/
+#define FF_HID 0x4f
#define FF_RUMBLE 0x50
#define FF_PERIODIC 0x51
#define FF_CONSTANT 0x52
@@ -476,7 +496,7 @@ struct ff_effect {
#define FF_INERTIA 0x56
#define FF_RAMP 0x57
-#define FF_EFFECT_MIN FF_RUMBLE
+#define FF_EFFECT_MIN FF_HID
#define FF_EFFECT_MAX FF_RAMP
/*
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 03/16] Input: add INPUT_PROP_HAPTIC_TOUCHPAD
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
2022-01-14 18:31 ` [PATCH v2 01/16] HID: add haptics page defines Angela Czubak
2022-01-14 18:31 ` [PATCH v2 02/16] Input: add FF_HID effect type Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 04/16] HID: haptic: introduce hid_haptic_device Angela Czubak
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
INPUT_PROP_HAPTIC_TOUCHPAD property is to be set for a device with simple
haptic capabilities.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
Documentation/input/event-codes.rst | 14 ++++++++++++++
include/uapi/linux/input-event-codes.h | 1 +
2 files changed, 15 insertions(+)
diff --git a/Documentation/input/event-codes.rst b/Documentation/input/event-codes.rst
index b24ae7d292cc..bbf2510c2b1a 100644
--- a/Documentation/input/event-codes.rst
+++ b/Documentation/input/event-codes.rst
@@ -390,6 +390,20 @@ can report through the rotational axes (absolute and/or relative rx, ry, rz).
All other axes retain their meaning. A device must not mix
regular directional axes and accelerometer axes on the same event node.
+INPUT_PROP_HAPTIC_TOUCHPAD
+--------------------------
+
+The INPUT_PROP_HAPTIC_TOUCHPAD property indicates that device:
+- supports simple haptic auto and manual triggering
+- can differentiate between at least 5 fingers
+- uses correct resolution for the X/Y (units and value)
+- report correct force per touch, and correct units for them (newtons or grams)
+- follows the MT protocol type B
+
+Summing up, such devices follow the MS spec for input devices in
+Win8 and Win8.1, and in addition support the Simple haptic controller HID table,
+and report correct units for the pressure.
+
Guidelines
==========
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 225ec87d4f22..df2ba5da4eaa 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -27,6 +27,7 @@
#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */
#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */
#define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */
+#define INPUT_PROP_HAPTIC_TOUCHPAD 0x07 /* is a haptic touchpad */
#define INPUT_PROP_MAX 0x1f
#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 04/16] HID: haptic: introduce hid_haptic_device
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (2 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 03/16] Input: add INPUT_PROP_HAPTIC_TOUCHPAD Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 05/16] HID: input: allow mapping of haptic output Angela Czubak
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
Define a new structure that contains simple haptic device configuration
as well as current state.
Add functions that recognize auto trigger and manual trigger reports
as well as save their addresses.
Verify that the pressure unit is either grams or newtons.
Mark the input device as a haptic touchpad if the unit is correct and
the reports are found.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
drivers/hid/Kconfig | 3 ++
drivers/hid/Makefile | 1 +
drivers/hid/hid-haptic.c | 72 +++++++++++++++++++++++++
drivers/hid/hid-haptic.h | 114 +++++++++++++++++++++++++++++++++++++++
4 files changed, 190 insertions(+)
create mode 100644 drivers/hid/hid-haptic.c
create mode 100644 drivers/hid/hid-haptic.h
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index f5544157576c..3e7555b868e7 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -89,6 +89,9 @@ config HID_GENERIC
If unsure, say Y.
+config HID_HAPTIC
+ bool
+
menu "Special HID drivers"
depends on HID
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 6d3e630e81af..f21338e142ef 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -4,6 +4,7 @@
#
hid-y := hid-core.o hid-input.o hid-quirks.o
hid-$(CONFIG_DEBUG_FS) += hid-debug.o
+hid-$(CONFIG_HID_HAPTIC) += hid-haptic.o
obj-$(CONFIG_HID) += hid.o
obj-$(CONFIG_UHID) += uhid.o
diff --git a/drivers/hid/hid-haptic.c b/drivers/hid/hid-haptic.c
new file mode 100644
index 000000000000..d659a430c1a6
--- /dev/null
+++ b/drivers/hid/hid-haptic.c
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * HID Haptic support for Linux
+ *
+ * Copyright (c) 2021 Angela Czubak <acz@semihalf.com>
+ */
+
+#include "hid-haptic.h"
+
+void hid_haptic_feature_mapping(struct hid_device *hdev,
+ struct hid_haptic_device *haptic,
+ struct hid_field *field, struct hid_usage *usage)
+{
+ if (usage->hid == HID_HP_AUTOTRIGGER) {
+ if (usage->usage_index >= field->report_count) {
+ dev_err(&hdev->dev,
+ "HID_HP_AUTOTRIGGER out of range\n");
+ return;
+ }
+
+ hid_device_io_start(hdev);
+ hid_hw_request(hdev, field->report, HID_REQ_GET_REPORT);
+ hid_hw_wait(hdev);
+ hid_device_io_stop(hdev);
+ haptic->default_auto_trigger =
+ field->value[usage->usage_index];
+ haptic->auto_trigger_report = field->report;
+ }
+}
+EXPORT_SYMBOL_GPL(hid_haptic_feature_mapping);
+
+bool hid_haptic_check_pressure_unit(struct hid_haptic_device *haptic,
+ struct hid_input *hi, struct hid_field *field)
+{
+ if (field->unit == HID_UNIT_GRAM || field->unit == HID_UNIT_NEWTON)
+ return true;
+ return false;
+}
+EXPORT_SYMBOL_GPL(hid_haptic_check_pressure_unit);
+
+int hid_haptic_input_mapping(struct hid_device *hdev,
+ struct hid_haptic_device *haptic,
+ struct hid_input *hi,
+ struct hid_field *field, struct hid_usage *usage,
+ unsigned long **bit, int *max)
+{
+ if (usage->hid == HID_HP_MANUALTRIGGER) {
+ haptic->manual_trigger_report = field->report;
+ /* we don't really want to map these fields */
+ return -1;
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(hid_haptic_input_mapping);
+
+int hid_haptic_input_configured(struct hid_device *hdev,
+ struct hid_haptic_device *haptic,
+ struct hid_input *hi)
+{
+
+ if (hi->application == HID_DG_TOUCHPAD) {
+ if (haptic->auto_trigger_report &&
+ haptic->manual_trigger_report) {
+ __set_bit(INPUT_PROP_HAPTIC_TOUCHPAD, hi->input->propbit);
+ return 1;
+ }
+ return 0;
+ }
+ return -1;
+}
+EXPORT_SYMBOL_GPL(hid_haptic_input_configured);
diff --git a/drivers/hid/hid-haptic.h b/drivers/hid/hid-haptic.h
new file mode 100644
index 000000000000..601630e7049f
--- /dev/null
+++ b/drivers/hid/hid-haptic.h
@@ -0,0 +1,114 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * HID Haptic support for Linux
+ *
+ * Copyright (c) 2021 Angela Czubak <acz@semihalf.com>
+ */
+
+/*
+ */
+
+
+#include <linux/hid.h>
+
+#define HID_HAPTIC_ORDINAL_WAVEFORMNONE 1
+#define HID_HAPTIC_ORDINAL_WAVEFORMSTOP 2
+
+#define HID_HAPTIC_PRESS_THRESH 200
+#define HID_HAPTIC_RELEASE_THRESH 180
+
+#define HID_HAPTIC_MODE_DEVICE 0
+#define HID_HAPTIC_MODE_KERNEL 1
+
+struct hid_haptic_effect {
+ u8 *report_buf;
+ struct input_dev *input_dev;
+ struct work_struct work;
+ struct list_head control;
+ struct mutex control_mutex;
+};
+
+struct hid_haptic_effect_node {
+ struct list_head node;
+ struct file *file;
+};
+
+struct hid_haptic_device {
+ struct input_dev *input_dev;
+ struct hid_device *hdev;
+ struct hid_report *auto_trigger_report;
+ struct mutex auto_trigger_mutex;
+ struct workqueue_struct *wq;
+ struct hid_report *manual_trigger_report;
+ struct mutex manual_trigger_mutex;
+ size_t manual_trigger_report_len;
+ int pressed_state;
+ s32 pressure_sum;
+ s32 force_logical_minimum;
+ s32 force_physical_minimum;
+ s32 force_resolution;
+ u32 press_threshold;
+ u32 release_threshold;
+ u32 mode;
+ u32 default_auto_trigger;
+ u32 vendor_page;
+ u32 vendor_id;
+ u32 max_waveform_id;
+ u32 max_duration_id;
+ u16 *hid_usage_map;
+ u32 *duration_map;
+ u16 press_ordinal_orig;
+ u16 press_ordinal_cur;
+ u16 release_ordinal_orig;
+ u16 release_ordinal_cur;
+#define HID_HAPTIC_RELEASE_EFFECT_ID 0
+#define HID_HAPTIC_PRESS_EFFECT_ID 1
+ struct hid_haptic_effect *effect;
+ struct hid_haptic_effect stop_effect;
+};
+
+#ifdef CONFIG_MULTITOUCH_HAPTIC
+void hid_haptic_feature_mapping(struct hid_device *hdev,
+ struct hid_haptic_device *haptic,
+ struct hid_field *field, struct hid_usage
+ *usage);
+bool hid_haptic_check_pressure_unit(struct hid_haptic_device *haptic,
+ struct hid_input *hi, struct hid_field *field);
+int hid_haptic_input_mapping(struct hid_device *hdev,
+ struct hid_haptic_device *haptic,
+ struct hid_input *hi,
+ struct hid_field *field, struct hid_usage *usage,
+ unsigned long **bit, int *max);
+int hid_haptic_input_configured(struct hid_device *hdev,
+ struct hid_haptic_device *haptic,
+ struct hid_input *hi);
+#else
+static inline
+void hid_haptic_feature_mapping(struct hid_device *hdev,
+ struct hid_haptic_device *haptic,
+ struct hid_field *field, struct hid_usage
+ *usage)
+{}
+static inline
+bool hid_haptic_check_pressure_unit(struct hid_haptic_device *haptic,
+ struct hid_input *hi, struct hid_field *field)
+{
+ return false;
+}
+static inline
+int hid_haptic_input_mapping(struct hid_device *hdev,
+ struct hid_haptic_device *haptic,
+ struct hid_input *hi,
+ struct hid_field *field, struct hid_usage *usage,
+ unsigned long **bit, int *max)
+{
+ return 0;
+}
+static inline
+int hid_haptic_input_configured(struct hid_device *hdev,
+ struct hid_haptic_device *haptic,
+ struct hid_input *hi)
+{
+ return 0;
+}
+#endif
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 05/16] HID: input: allow mapping of haptic output
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (3 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 04/16] HID: haptic: introduce hid_haptic_device Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 06/16] HID: haptic: initialize haptic device Angela Czubak
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
This change makes it possible to parse output reports by input mapping
functions by HID drivers.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
drivers/hid/hid-input.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 1ce75e8b49d5..9dd4a146576a 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -600,9 +600,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
if (field->report_count < 1)
goto ignore;
- /* only LED usages are supported in output fields */
+ /* only LED and HAPTIC usages are supported in output fields */
if (field->report_type == HID_OUTPUT_REPORT &&
- (usage->hid & HID_USAGE_PAGE) != HID_UP_LED) {
+ (usage->hid & HID_USAGE_PAGE) != HID_UP_LED &&
+ (usage->hid & HID_USAGE_PAGE) != HID_UP_HAPTIC) {
goto ignore;
}
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 06/16] HID: haptic: initialize haptic device
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (4 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 05/16] HID: input: allow mapping of haptic output Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 07/16] Input: add shared effects Angela Czubak
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
Add hid_haptic_init(). Parse autotrigger report to retrieve ordinals for
press and release waveforms.
Implement force feedback functions.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
drivers/hid/hid-haptic.c | 444 +++++++++++++++++++++++++++++++++++++++
drivers/hid/hid-haptic.h | 6 +
2 files changed, 450 insertions(+)
diff --git a/drivers/hid/hid-haptic.c b/drivers/hid/hid-haptic.c
index d659a430c1a6..7dffd0fa68c6 100644
--- a/drivers/hid/hid-haptic.c
+++ b/drivers/hid/hid-haptic.c
@@ -5,12 +5,16 @@
* Copyright (c) 2021 Angela Czubak <acz@semihalf.com>
*/
+#include <linux/module.h>
+
#include "hid-haptic.h"
void hid_haptic_feature_mapping(struct hid_device *hdev,
struct hid_haptic_device *haptic,
struct hid_field *field, struct hid_usage *usage)
{
+ u16 usage_hid;
+
if (usage->hid == HID_HP_AUTOTRIGGER) {
if (usage->usage_index >= field->report_count) {
dev_err(&hdev->dev,
@@ -25,6 +29,20 @@ void hid_haptic_feature_mapping(struct hid_device *hdev,
haptic->default_auto_trigger =
field->value[usage->usage_index];
haptic->auto_trigger_report = field->report;
+ } else if ((usage->hid & HID_USAGE_PAGE) == HID_UP_ORDINAL) {
+ usage_hid = usage->hid & HID_USAGE;
+ switch (field->logical) {
+ case HID_HP_WAVEFORMLIST:
+ if (usage_hid > haptic->max_waveform_id)
+ haptic->max_waveform_id = usage_hid;
+ break;
+ case HID_HP_DURATIONLIST:
+ if (usage_hid > haptic->max_duration_id)
+ haptic->max_duration_id = usage_hid;
+ break;
+ default:
+ break;
+ }
}
}
EXPORT_SYMBOL_GPL(hid_haptic_feature_mapping);
@@ -70,3 +88,429 @@ int hid_haptic_input_configured(struct hid_device *hdev,
return -1;
}
EXPORT_SYMBOL_GPL(hid_haptic_input_configured);
+
+static void parse_auto_trigger_field(struct hid_haptic_device *haptic,
+ struct hid_field *field)
+{
+ int count = field->report_count;
+ int n;
+ u16 usage_hid;
+
+ for (n = 0; n < count; n++) {
+ switch (field->usage[n].hid & HID_USAGE_PAGE) {
+ case HID_UP_ORDINAL:
+ usage_hid = field->usage[n].hid & HID_USAGE;
+ switch (field->logical) {
+ case HID_HP_WAVEFORMLIST:
+ haptic->hid_usage_map[usage_hid] = field->value[n];
+ if (field->value[n] ==
+ (HID_HP_WAVEFORMPRESS & HID_USAGE)) {
+ haptic->press_ordinal_orig = usage_hid;
+ haptic->press_ordinal_cur = usage_hid;
+ } else if (field->value[n] ==
+ (HID_HP_WAVEFORMRELEASE & HID_USAGE)) {
+ haptic->release_ordinal_orig = usage_hid;
+ haptic->release_ordinal_cur = usage_hid;
+ }
+ break;
+ case HID_HP_DURATIONLIST:
+ haptic->duration_map[usage_hid] =
+ field->value[n];
+ break;
+ default:
+ break;
+ }
+ break;
+ case HID_UP_HAPTIC:
+ switch (field->usage[n].hid) {
+ case HID_HP_WAVEFORMVENDORID:
+ haptic->vendor_id = field->value[n];
+ break;
+ case HID_HP_WAVEFORMVENDORPAGE:
+ haptic->vendor_page = field->value[n];
+ break;
+ default:
+ break;
+ }
+ break;
+ default:
+ /* Should not really happen */
+ break;
+ }
+ }
+}
+
+static void fill_effect_buf(struct hid_haptic_device *haptic,
+ struct ff_hid_effect *effect,
+ struct hid_haptic_effect *haptic_effect,
+ int waveform_ordinal)
+{
+ struct hid_report *rep = haptic->manual_trigger_report;
+ struct hid_usage *usage;
+ struct hid_field *field;
+ s32 value;
+ int i, j;
+ u8 *buf = haptic_effect->report_buf;
+
+ mutex_lock(&haptic->manual_trigger_mutex);
+ for (i = 0; i < rep->maxfield; i++) {
+ field = rep->field[i];
+ /* Ignore if report count is out of bounds. */
+ if (field->report_count < 1)
+ continue;
+
+ for (j = 0; j < field->maxusage; j++) {
+ usage = &field->usage[j];
+
+ switch (usage->hid) {
+ case HID_HP_INTENSITY:
+ if (effect->intensity > 100) {
+ value = field->logical_maximum;
+ } else {
+ value = field->logical_minimum +
+ effect->intensity *
+ (field->logical_maximum -
+ field->logical_minimum) / 100;
+ }
+ break;
+ case HID_HP_REPEATCOUNT:
+ value = effect->repeat_count;
+ break;
+ case HID_HP_RETRIGGERPERIOD:
+ value = effect->retrigger_period;
+ break;
+ case HID_HP_MANUALTRIGGER:
+ value = waveform_ordinal;
+ break;
+ default:
+ break;
+ }
+
+ field->value[j] = value;
+ }
+ }
+
+ hid_output_report(rep, buf);
+ mutex_unlock(&haptic->manual_trigger_mutex);
+}
+
+static int hid_haptic_upload_effect(struct input_dev *dev, struct ff_effect *effect,
+ struct ff_effect *old)
+{
+ struct ff_device *ff = dev->ff;
+ struct hid_haptic_device *haptic = ff->private;
+ int i, ordinal = 0;
+
+ /* If vendor range, check vendor id and page */
+ if (effect->u.hid.hid_usage >= (HID_HP_VENDORWAVEFORMMIN & HID_USAGE) &&
+ effect->u.hid.hid_usage <= (HID_HP_VENDORWAVEFORMMAX & HID_USAGE) &&
+ (effect->u.hid.vendor_id != haptic->vendor_id ||
+ effect->u.hid.vendor_waveform_page != haptic->vendor_page))
+ return -EINVAL;
+
+ /* Check hid_usage */
+ for (i = 1; i < haptic->max_waveform_id; i++) {
+ if (haptic->hid_usage_map[i] == effect->u.hid.hid_usage) {
+ ordinal = i;
+ break;
+ }
+ }
+ if (ordinal < 1)
+ return -EINVAL;
+
+ /* Fill the buffer for the efect id */
+ fill_effect_buf(haptic, &effect->u.hid, &haptic->effect[effect->id],
+ ordinal);
+
+ return 0;
+}
+
+static int play_effect(struct hid_device *hdev, struct hid_haptic_device *haptic,
+ struct hid_haptic_effect *effect)
+{
+ int ret;
+
+ ret = hid_hw_output_report(hdev, effect->report_buf,
+ haptic->manual_trigger_report_len);
+ if (ret < 0) {
+ ret = hid_hw_raw_request(hdev,
+ haptic->manual_trigger_report->id,
+ effect->report_buf,
+ haptic->manual_trigger_report_len,
+ HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
+ }
+
+ return ret;
+}
+
+static void haptic_work_handler(struct work_struct *work)
+{
+
+ struct hid_haptic_effect *effect = container_of(work,
+ struct hid_haptic_effect,
+ work);
+ struct input_dev *dev = effect->input_dev;
+ struct hid_device *hdev = input_get_drvdata(dev);
+ struct hid_haptic_device *haptic = dev->ff->private;
+
+ mutex_lock(&haptic->manual_trigger_mutex);
+ if (effect != &haptic->stop_effect)
+ play_effect(hdev, haptic, &haptic->stop_effect);
+
+ play_effect(hdev, haptic, effect);
+ mutex_unlock(&haptic->manual_trigger_mutex);
+
+}
+
+static int hid_haptic_playback(struct input_dev *dev, int effect_id, int value)
+{
+ struct hid_haptic_device *haptic = dev->ff->private;
+
+ if (value)
+ queue_work(haptic->wq, &haptic->effect[effect_id].work);
+ else
+ queue_work(haptic->wq, &haptic->stop_effect.work);
+
+ return 0;
+}
+
+static void effect_set_default(struct ff_effect *effect)
+{
+ effect->type = FF_HID;
+ effect->id = -1;
+ effect->u.hid.hid_usage = HID_HP_WAVEFORMNONE & HID_USAGE;
+ effect->u.hid.intensity = 100;
+ effect->u.hid.retrigger_period = 0;
+ effect->u.hid.repeat_count = 0;
+}
+
+static int hid_haptic_erase(struct input_dev *dev, int effect_id)
+{
+ struct hid_haptic_device *haptic = dev->ff->private;
+ struct ff_effect effect;
+ int ordinal;
+
+ effect_set_default(&effect);
+ switch (effect_id) {
+ case HID_HAPTIC_RELEASE_EFFECT_ID:
+ ordinal = haptic->release_ordinal_orig;
+ if (!ordinal)
+ ordinal = HID_HAPTIC_ORDINAL_WAVEFORMNONE;
+ else
+ effect.u.hid.hid_usage = HID_HP_WAVEFORMRELEASE &
+ HID_USAGE;
+ fill_effect_buf(haptic, &effect.u.hid, &haptic->effect[effect_id],
+ ordinal);
+ break;
+ case HID_HAPTIC_PRESS_EFFECT_ID:
+ ordinal = haptic->press_ordinal_orig;
+ if (!ordinal)
+ ordinal = HID_HAPTIC_ORDINAL_WAVEFORMNONE;
+ else
+ effect.u.hid.hid_usage = HID_HP_WAVEFORMPRESS &
+ HID_USAGE;
+ fill_effect_buf(haptic, &effect.u.hid, &haptic->effect[effect_id],
+ ordinal);
+ break;
+ default:
+ break;
+ }
+
+ return 0;
+}
+
+static void hid_haptic_destroy(struct ff_device *ff)
+{
+ struct hid_haptic_device *haptic = ff->private;
+ struct hid_device *hdev = haptic->hdev;
+ int r;
+
+ if (hdev)
+ put_device(&hdev->dev);
+
+ kfree(haptic->stop_effect.report_buf);
+ haptic->stop_effect.report_buf = NULL;
+
+ if (haptic->effect) {
+ for (r = 0; r < ff->max_effects; r++)
+ kfree(haptic->effect[r].report_buf);
+ kfree(haptic->effect);
+ }
+ haptic->effect = NULL;
+
+ destroy_workqueue(haptic->wq);
+ haptic->wq = NULL;
+
+ kfree(haptic->duration_map);
+ haptic->duration_map = NULL;
+
+ kfree(haptic->hid_usage_map);
+ haptic->hid_usage_map = NULL;
+
+ module_put(THIS_MODULE);
+}
+
+int hid_haptic_init(struct hid_device *hdev,
+ struct hid_haptic_device **haptic_ptr)
+{
+ struct hid_haptic_device *haptic = *haptic_ptr;
+ struct input_dev *dev = NULL;
+ struct hid_input *hidinput;
+ struct ff_device *ff;
+ int ret = 0, r;
+ struct ff_hid_effect stop_effect = {
+ .hid_usage = HID_HP_WAVEFORMSTOP & HID_USAGE,
+ };
+ const char *prefix = "hid-haptic";
+ char *name;
+ int (*flush)(struct input_dev *dev, struct file *file);
+ int (*event)(struct input_dev *dev, unsigned int type, unsigned int code, int value);
+
+ haptic->hdev = hdev;
+ haptic->max_waveform_id = max(2u, haptic->max_waveform_id);
+ haptic->max_duration_id = max(2u, haptic->max_duration_id);
+
+ haptic->hid_usage_map = kcalloc(haptic->max_waveform_id + 1,
+ sizeof(u16), GFP_KERNEL);
+ if (!haptic->hid_usage_map) {
+ ret = -ENOMEM;
+ goto exit;
+ }
+ haptic->duration_map = kcalloc(haptic->max_duration_id + 1,
+ sizeof(u32), GFP_KERNEL);
+ if (!haptic->duration_map) {
+ ret = -ENOMEM;
+ goto usage_map;
+ }
+
+ if (haptic->max_waveform_id != haptic->max_duration_id)
+ dev_warn(&hdev->dev,
+ "Haptic duration and waveform lists have different max id (%u and %u).\n",
+ haptic->max_duration_id, haptic->max_waveform_id);
+
+ haptic->hid_usage_map[HID_HAPTIC_ORDINAL_WAVEFORMNONE] =
+ HID_HP_WAVEFORMNONE & HID_USAGE;
+ haptic->hid_usage_map[HID_HAPTIC_ORDINAL_WAVEFORMSTOP] =
+ HID_HP_WAVEFORMSTOP & HID_USAGE;
+
+ for (r = 0; r < haptic->auto_trigger_report->maxfield; r++)
+ parse_auto_trigger_field(haptic, haptic->auto_trigger_report->field[r]);
+
+ list_for_each_entry(hidinput, &hdev->inputs, list) {
+ if (hidinput->application == HID_DG_TOUCHPAD) {
+ dev = hidinput->input;
+ break;
+ }
+ }
+
+ if (!dev) {
+ dev_err(&hdev->dev, "Failed to find the input device\n");
+ ret = -ENODEV;
+ goto duration_map;
+ }
+
+ haptic->input_dev = dev;
+ haptic->manual_trigger_report_len =
+ hid_report_len(haptic->manual_trigger_report);
+ mutex_init(&haptic->manual_trigger_mutex);
+ name = kmalloc(strlen(prefix) + strlen(hdev->name) + 2, GFP_KERNEL);
+ if (name) {
+ sprintf(name, "%s %s", prefix, hdev->name);
+ haptic->wq = create_singlethread_workqueue(name);
+ kfree(name);
+ }
+ if (!haptic->wq) {
+ ret = -ENOMEM;
+ goto duration_map;
+ }
+ haptic->effect = kcalloc(FF_MAX_EFFECTS,
+ sizeof(struct hid_haptic_effect), GFP_KERNEL);
+ if (!haptic->effect) {
+ ret = -ENOMEM;
+ goto output_queue;
+ }
+ for (r = 0; r < FF_MAX_EFFECTS; r++) {
+ haptic->effect[r].report_buf =
+ hid_alloc_report_buf(haptic->manual_trigger_report,
+ GFP_KERNEL);
+ if (!haptic->effect[r].report_buf) {
+ dev_err(&hdev->dev,
+ "Failed to allocate a buffer for an effect.\n");
+ ret = -ENOMEM;
+ goto buffer_free;
+ }
+ haptic->effect[r].input_dev = dev;
+ INIT_WORK(&haptic->effect[r].work, haptic_work_handler);
+ }
+ haptic->stop_effect.report_buf =
+ hid_alloc_report_buf(haptic->manual_trigger_report,
+ GFP_KERNEL);
+ if (!haptic->stop_effect.report_buf) {
+ dev_err(&hdev->dev,
+ "Failed to allocate a buffer for stop effect.\n");
+ ret = -ENOMEM;
+ goto buffer_free;
+ }
+ haptic->stop_effect.input_dev = dev;
+ INIT_WORK(&haptic->stop_effect.work, haptic_work_handler);
+ fill_effect_buf(haptic, &stop_effect, &haptic->stop_effect,
+ HID_HAPTIC_ORDINAL_WAVEFORMSTOP);
+
+ input_set_capability(dev, EV_FF, FF_HID);
+
+ flush = dev->flush;
+ event = dev->event;
+ ret = input_ff_create(dev, FF_MAX_EFFECTS);
+ if (ret) {
+ dev_err(&hdev->dev, "Failed to create ff device.\n");
+ goto stop_buffer_free;
+ }
+
+ ff = dev->ff;
+ ff->private = haptic;
+ ff->upload = hid_haptic_upload_effect;
+ ff->playback = hid_haptic_playback;
+ ff->erase = hid_haptic_erase;
+ ff->destroy = hid_haptic_destroy;
+ if (!try_module_get(THIS_MODULE)) {
+ dev_err(&hdev->dev, "Failed to increase module count.\n");
+ goto input_free;
+ }
+ if (!get_device(&hdev->dev)) {
+ dev_err(&hdev->dev, "Failed to get hdev device.\n");
+ module_put(THIS_MODULE);
+ goto input_free;
+ }
+ return 0;
+
+input_free:
+ input_ff_destroy(dev);
+ /* Do not let double free happen, input_ff_destroy will call
+ * hid_haptic_destroy.
+ */
+ *haptic_ptr = NULL;
+ /* Restore dev flush and event */
+ dev->flush = flush;
+ dev->event = event;
+ return ret;
+stop_buffer_free:
+ kfree(haptic->stop_effect.report_buf);
+ haptic->stop_effect.report_buf = NULL;
+buffer_free:
+ while (--r >= 0)
+ kfree(haptic->effect[r].report_buf);
+ kfree(haptic->effect);
+ haptic->effect = NULL;
+output_queue:
+ destroy_workqueue(haptic->wq);
+ haptic->wq = NULL;
+duration_map:
+ kfree(haptic->duration_map);
+ haptic->duration_map = NULL;
+usage_map:
+ kfree(haptic->hid_usage_map);
+ haptic->hid_usage_map = NULL;
+exit:
+ return ret;
+}
+EXPORT_SYMBOL_GPL(hid_haptic_init);
diff --git a/drivers/hid/hid-haptic.h b/drivers/hid/hid-haptic.h
index 601630e7049f..e686f7ec42b9 100644
--- a/drivers/hid/hid-haptic.h
+++ b/drivers/hid/hid-haptic.h
@@ -82,6 +82,7 @@ int hid_haptic_input_mapping(struct hid_device *hdev,
int hid_haptic_input_configured(struct hid_device *hdev,
struct hid_haptic_device *haptic,
struct hid_input *hi);
+int hid_haptic_init(struct hid_device *hdev, struct hid_haptic_device **haptic_ptr);
#else
static inline
void hid_haptic_feature_mapping(struct hid_device *hdev,
@@ -111,4 +112,9 @@ int hid_haptic_input_configured(struct hid_device *hdev,
{
return 0;
}
+static inline
+int hid_haptic_init(struct hid_device *hdev, struct hid_haptic_device **haptic_ptr)
+{
+ return 0;
+}
#endif
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 07/16] Input: add shared effects
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (5 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 06/16] HID: haptic: initialize haptic device Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 08/16] HID: haptic: implement release and press effects Angela Czubak
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
If an effect is uploaded with file handle equal UINTPTR_MAX assume this
effect should be shared and so may be modified using different file
handles.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
drivers/input/ff-core.c | 40 ++++++++++++++++++++++++++++++++++------
1 file changed, 34 insertions(+), 6 deletions(-)
diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c
index 1cf5deda06e1..960ae0e29348 100644
--- a/drivers/input/ff-core.c
+++ b/drivers/input/ff-core.c
@@ -34,6 +34,23 @@ static int check_effect_access(struct ff_device *ff, int effect_id,
return 0;
}
+/*
+ * Check that the effect_id is a valid effect and whether the effect
+ * is shared
+ */
+static int check_effect_shared(struct ff_device *ff, int effect_id)
+{
+ if (effect_id < 0 || effect_id >= ff->max_effects ||
+ !ff->effect_owners[effect_id])
+ return -EINVAL;
+
+ /* Shared effect */
+ if (ff->effect_owners[effect_id] == (struct file *)UINTPTR_MAX)
+ return 0;
+
+ return -EACCES;
+}
+
/*
* Checks whether 2 effects can be combined together
*/
@@ -139,8 +156,11 @@ int input_ff_upload(struct input_dev *dev, struct ff_effect *effect,
id = effect->id;
ret = check_effect_access(ff, id, file);
- if (ret)
- goto out;
+ if (ret) {
+ ret = check_effect_shared(ff, id);
+ if (ret)
+ goto out;
+ }
old = &ff->effects[id];
@@ -174,21 +194,29 @@ static int erase_effect(struct input_dev *dev, int effect_id,
{
struct ff_device *ff = dev->ff;
int error;
+ bool shared = false;
error = check_effect_access(ff, effect_id, file);
- if (error)
- return error;
+ if (error) {
+ error = check_effect_shared(ff, effect_id);
+ if (!error)
+ shared = true;
+ else
+ return error;
+ }
spin_lock_irq(&dev->event_lock);
ff->playback(dev, effect_id, 0);
- ff->effect_owners[effect_id] = NULL;
+ if (!shared)
+ ff->effect_owners[effect_id] = NULL;
spin_unlock_irq(&dev->event_lock);
if (ff->erase) {
error = ff->erase(dev, effect_id);
if (error) {
spin_lock_irq(&dev->event_lock);
- ff->effect_owners[effect_id] = file;
+ if (!shared)
+ ff->effect_owners[effect_id] = file;
spin_unlock_irq(&dev->event_lock);
return error;
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 08/16] HID: haptic: implement release and press effects
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (6 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 07/16] Input: add shared effects Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 09/16] HID: input: calculate resolution for pressure Angela Czubak
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
Upload shared haptic affects for release and press waveforms if a device
exposes them.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
drivers/hid/hid-haptic.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/drivers/hid/hid-haptic.c b/drivers/hid/hid-haptic.c
index 7dffd0fa68c6..64e354cb3f2e 100644
--- a/drivers/hid/hid-haptic.c
+++ b/drivers/hid/hid-haptic.c
@@ -365,6 +365,7 @@ int hid_haptic_init(struct hid_device *hdev,
char *name;
int (*flush)(struct input_dev *dev, struct file *file);
int (*event)(struct input_dev *dev, unsigned int type, unsigned int code, int value);
+ struct ff_effect release_effect, press_effect;
haptic->hdev = hdev;
haptic->max_waveform_id = max(2u, haptic->max_waveform_id);
@@ -481,8 +482,41 @@ int hid_haptic_init(struct hid_device *hdev,
module_put(THIS_MODULE);
goto input_free;
}
+
+ effect_set_default(&release_effect);
+ if (haptic->release_ordinal_orig)
+ release_effect.u.hid.hid_usage = HID_HP_WAVEFORMRELEASE &
+ HID_USAGE;
+ ret = input_ff_upload(dev, &release_effect, (struct file *)UINTPTR_MAX);
+ if (ret || release_effect.id != HID_HAPTIC_RELEASE_EFFECT_ID) {
+ if (!ret) {
+ ret = -EBUSY;
+ input_ff_erase(dev, release_effect.id,
+ (struct file *)UINTPTR_MAX);
+ }
+ dev_err(&hdev->dev,
+ "Failed to allocate id 0 for release effect.\n");
+ goto input_free;
+ }
+ effect_set_default(&press_effect);
+ if (haptic->press_ordinal_orig)
+ press_effect.u.hid.hid_usage = HID_HP_WAVEFORMPRESS & HID_USAGE;
+ ret = input_ff_upload(dev, &press_effect, (struct file *)UINTPTR_MAX);
+ if (ret || press_effect.id != HID_HAPTIC_PRESS_EFFECT_ID) {
+ if (!ret) {
+ ret = -EBUSY;
+ input_ff_erase(dev, press_effect.id,
+ (struct file *)UINTPTR_MAX);
+ }
+ dev_err(&hdev->dev,
+ "Failed to allocate id 1 for press effect.\n");
+ goto release_free;
+ }
+
return 0;
+release_free:
+ input_ff_erase(dev, release_effect.id, (struct file *)UINTPTR_MAX);
input_free:
input_ff_destroy(dev);
/* Do not let double free happen, input_ff_destroy will call
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 09/16] HID: input: calculate resolution for pressure
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (7 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 08/16] HID: haptic: implement release and press effects Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 10/16] HID: haptic: add functions handling events Angela Czubak
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
Assume that if the pressure is given in newtons it should be normalized
to grams. If the pressure has no unit do not calculate resolution.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
drivers/hid/hid-input.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 9dd4a146576a..4917cdf5df27 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -258,6 +258,19 @@ __s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code)
}
break;
+ case ABS_PRESSURE:
+ case ABS_MT_PRESSURE:
+ if (field->unit == HID_UNIT_NEWTON) {
+ /* Convert to grams, 1 newton is 101.97 grams */
+ prev = physical_extents;
+ physical_extents *= 10197;
+ if (physical_extents < prev)
+ return 0;
+ unit_exponent -= 2;
+ } else if (field->unit != HID_UNIT_GRAM) {
+ return 0;
+ }
+ break;
default:
return 0;
}
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 10/16] HID: haptic: add functions handling events
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (8 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 09/16] HID: input: calculate resolution for pressure Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 11/16] Input: MT - add INPUT_MT_TOTAL_FORCE flags Angela Czubak
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
Implement hid_haptic_handle_press_release() which generates haptic feedback
as well as saves the pressed state of the haptic device.
Function hid_haptic_handle_input() inserts BTN_LEFT and ABS_PRESSURE events
if the device is in kernel mode.
Add functions to increase and reset the state of the pressure detected by
the device.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
drivers/hid/hid-haptic.c | 71 +++++++++++++++++++++++++++++++++++++++-
drivers/hid/hid-haptic.h | 18 ++++++++++
2 files changed, 88 insertions(+), 1 deletion(-)
diff --git a/drivers/hid/hid-haptic.c b/drivers/hid/hid-haptic.c
index 64e354cb3f2e..4a5d5e7b92d1 100644
--- a/drivers/hid/hid-haptic.c
+++ b/drivers/hid/hid-haptic.c
@@ -50,8 +50,13 @@ EXPORT_SYMBOL_GPL(hid_haptic_feature_mapping);
bool hid_haptic_check_pressure_unit(struct hid_haptic_device *haptic,
struct hid_input *hi, struct hid_field *field)
{
- if (field->unit == HID_UNIT_GRAM || field->unit == HID_UNIT_NEWTON)
+ if (field->unit == HID_UNIT_GRAM || field->unit == HID_UNIT_NEWTON) {
+ haptic->force_logical_minimum = field->logical_minimum;
+ haptic->force_physical_minimum = field->physical_minimum;
+ haptic->force_resolution = input_abs_get_res(hi->input,
+ ABS_MT_PRESSURE);
return true;
+ }
return false;
}
EXPORT_SYMBOL_GPL(hid_haptic_check_pressure_unit);
@@ -350,6 +355,12 @@ static void hid_haptic_destroy(struct ff_device *ff)
module_put(THIS_MODULE);
}
+static u32 convert_force_to_logical(struct hid_haptic_device *haptic, u32 value)
+{
+ return (value - haptic->force_physical_minimum) *
+ haptic->force_resolution + haptic->force_logical_minimum;
+}
+
int hid_haptic_init(struct hid_device *hdev,
struct hid_haptic_device **haptic_ptr)
{
@@ -457,6 +468,13 @@ int hid_haptic_init(struct hid_device *hdev,
fill_effect_buf(haptic, &stop_effect, &haptic->stop_effect,
HID_HAPTIC_ORDINAL_WAVEFORMSTOP);
+ haptic->mode = HID_HAPTIC_MODE_DEVICE;
+ haptic->press_threshold = convert_force_to_logical(haptic,
+ HID_HAPTIC_PRESS_THRESH);
+ haptic->release_threshold = convert_force_to_logical(haptic,
+ HID_HAPTIC_RELEASE_THRESH);
+
+
input_set_capability(dev, EV_FF, FF_HID);
flush = dev->flush;
@@ -548,3 +566,54 @@ int hid_haptic_init(struct hid_device *hdev,
return ret;
}
EXPORT_SYMBOL_GPL(hid_haptic_init);
+
+void hid_haptic_handle_press_release(struct hid_haptic_device *haptic)
+{
+ int prev_pressed_state = haptic->pressed_state;
+ struct input_dev *input = haptic->input_dev;
+ unsigned long flags;
+
+ if (haptic->pressure_sum > haptic->press_threshold)
+ haptic->pressed_state = 1;
+ else if (haptic->pressure_sum < haptic->release_threshold)
+ haptic->pressed_state = 0;
+ if (!prev_pressed_state && haptic->pressed_state &&
+ haptic->mode == HID_HAPTIC_MODE_KERNEL) {
+ spin_lock_irqsave(&input->event_lock, flags);
+ input->ff->playback(input, PRESS_HID_EFFECT_ID, 1);
+ spin_unlock_irqrestore(&input->event_lock, flags);
+ }
+ if (prev_pressed_state && !haptic->pressed_state &&
+ haptic->mode == HID_HAPTIC_MODE_KERNEL) {
+ spin_lock_irqsave(&input->event_lock, flags);
+ input->ff->playback(input, RELEASE_HID_EFFECT_ID, 1);
+ spin_unlock_irqrestore(&input->event_lock, flags);
+ }
+}
+EXPORT_SYMBOL_GPL(hid_haptic_handle_press_release);
+
+bool hid_haptic_handle_input(struct hid_haptic_device *haptic)
+{
+ if (haptic->mode == HID_HAPTIC_MODE_KERNEL) {
+ input_event(haptic->input_dev, EV_KEY, BTN_LEFT,
+ haptic->pressed_state);
+ input_event(haptic->input_dev, EV_ABS, ABS_PRESSURE,
+ haptic->pressure_sum);
+ return true;
+ }
+ return false;
+}
+EXPORT_SYMBOL_GPL(hid_haptic_handle_input);
+
+void hid_haptic_pressure_reset(struct hid_haptic_device *haptic)
+{
+ haptic->pressure_sum = 0;
+}
+EXPORT_SYMBOL_GPL(hid_haptic_pressure_reset);
+
+void hid_haptic_pressure_increase(struct hid_haptic_device *haptic,
+ __s32 pressure)
+{
+ haptic->pressure_sum += pressure;
+}
+EXPORT_SYMBOL_GPL(hid_haptic_pressure_increase);
diff --git a/drivers/hid/hid-haptic.h b/drivers/hid/hid-haptic.h
index e686f7ec42b9..586f20be0061 100644
--- a/drivers/hid/hid-haptic.h
+++ b/drivers/hid/hid-haptic.h
@@ -83,6 +83,11 @@ int hid_haptic_input_configured(struct hid_device *hdev,
struct hid_haptic_device *haptic,
struct hid_input *hi);
int hid_haptic_init(struct hid_device *hdev, struct hid_haptic_device **haptic_ptr);
+void hid_haptic_handle_press_release(struct hid_haptic_device *haptic);
+bool hid_haptic_handle_input(struct hid_haptic_device *haptic);
+void hid_haptic_pressure_reset(struct hid_haptic_device *haptic);
+void hid_haptic_pressure_increase(struct hid_haptic_device *haptic,
+ __s32 pressure);
#else
static inline
void hid_haptic_feature_mapping(struct hid_device *hdev,
@@ -117,4 +122,17 @@ int hid_haptic_init(struct hid_device *hdev, struct hid_haptic_device **haptic_p
{
return 0;
}
+static inline
+void hid_haptic_handle_press_release(struct hid_haptic_device *haptic) {}
+static inline
+bool hid_haptic_handle_input(struct hid_haptic_device *haptic)
+{
+ return false;
+}
+static inline
+void hid_haptic_pressure_reset(struct hid_haptic_device *haptic) {}
+static inline
+void hid_haptic_pressure_increase(struct hid_haptic_device *haptic,
+ __s32 pressure)
+{}
#endif
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 11/16] Input: MT - add INPUT_MT_TOTAL_FORCE flags
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (9 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 10/16] HID: haptic: add functions handling events Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 12/16] HID: haptic: add hid_haptic_switch_mode Angela Czubak
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
Add a flag to generate ABS_PRESSURE as sum of ABS_MT_PRESSURE across
all slots.
This flag should be set if one knows a device reports true force and would
like to report total force to the userspace.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
drivers/input/input-mt.c | 14 ++++++++++----
include/linux/input/mt.h | 1 +
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
index 44fe6f2f063c..d84768329083 100644
--- a/drivers/input/input-mt.c
+++ b/drivers/input/input-mt.c
@@ -197,6 +197,7 @@ void input_mt_report_pointer_emulation(struct input_dev *dev, bool use_count)
struct input_mt *mt = dev->mt;
struct input_mt_slot *oldest;
int oldid, count, i;
+ int p, reported_p = 0;
if (!mt)
return;
@@ -215,6 +216,13 @@ void input_mt_report_pointer_emulation(struct input_dev *dev, bool use_count)
oldest = ps;
oldid = id;
}
+ if (test_bit(ABS_MT_PRESSURE, dev->absbit)) {
+ p = input_mt_get_value(ps, ABS_MT_PRESSURE);
+ if (mt->flags & INPUT_MT_TOTAL_FORCE)
+ reported_p += p;
+ else if (oldid == id)
+ reported_p = p;
+ }
count++;
}
@@ -244,10 +252,8 @@ void input_mt_report_pointer_emulation(struct input_dev *dev, bool use_count)
input_event(dev, EV_ABS, ABS_X, x);
input_event(dev, EV_ABS, ABS_Y, y);
- if (test_bit(ABS_MT_PRESSURE, dev->absbit)) {
- int p = input_mt_get_value(oldest, ABS_MT_PRESSURE);
- input_event(dev, EV_ABS, ABS_PRESSURE, p);
- }
+ if (test_bit(ABS_MT_PRESSURE, dev->absbit))
+ input_event(dev, EV_ABS, ABS_PRESSURE, reported_p);
} else {
if (test_bit(ABS_MT_PRESSURE, dev->absbit))
input_event(dev, EV_ABS, ABS_PRESSURE, 0);
diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h
index 3b8580bd33c1..58d5402d382a 100644
--- a/include/linux/input/mt.h
+++ b/include/linux/input/mt.h
@@ -17,6 +17,7 @@
#define INPUT_MT_DROP_UNUSED 0x0004 /* drop contacts not seen in frame */
#define INPUT_MT_TRACK 0x0008 /* use in-kernel tracking */
#define INPUT_MT_SEMI_MT 0x0010 /* semi-mt device, finger count handled manually */
+#define INPUT_MT_TOTAL_FORCE 0x0020 /* calculate total force from slots pressure */
/**
* struct input_mt_slot - represents the state of an input MT slot
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 12/16] HID: haptic: add hid_haptic_switch_mode
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (10 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 11/16] Input: MT - add INPUT_MT_TOTAL_FORCE flags Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 13/16] HID: multitouch: add haptic multitouch support Angela Czubak
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
Function hid_haptic_switch_mode() can be used to turn off and on the
autonomoums mode for the device. If the device supports press and release
waveforms, let the kernel handle generation of haptic feedback instead of
the device itself.
Implement hid_haptic_resume() and hid_haptic_suspend() so that the
autonomous mode gets switched off at resume and switched on at suspend.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
drivers/hid/hid-haptic.c | 88 ++++++++++++++++++++++++++++++++++++----
drivers/hid/hid-haptic.h | 10 +++++
2 files changed, 90 insertions(+), 8 deletions(-)
diff --git a/drivers/hid/hid-haptic.c b/drivers/hid/hid-haptic.c
index 4a5d5e7b92d1..2035b8a6037f 100644
--- a/drivers/hid/hid-haptic.c
+++ b/drivers/hid/hid-haptic.c
@@ -5,6 +5,7 @@
* Copyright (c) 2021 Angela Czubak <acz@semihalf.com>
*/
+#include <linux/input/mt.h>
#include <linux/module.h>
#include "hid-haptic.h"
@@ -199,9 +200,58 @@ static void fill_effect_buf(struct hid_haptic_device *haptic,
mutex_unlock(&haptic->manual_trigger_mutex);
}
+static void switch_mode(struct hid_device *hdev, struct hid_haptic_device *haptic,
+ int mode)
+{
+ struct hid_report *rep = haptic->auto_trigger_report;
+ struct hid_field *field;
+ s32 value;
+ int i, j;
+
+ if (mode == HID_HAPTIC_MODE_KERNEL)
+ value = HID_HAPTIC_ORDINAL_WAVEFORMSTOP;
+ else
+ value = haptic->default_auto_trigger;
+
+ mutex_lock(&haptic->auto_trigger_mutex);
+ for (i = 0; i < rep->maxfield; i++) {
+ field = rep->field[i];
+ /* Ignore if report count is out of bounds. */
+ if (field->report_count < 1)
+ continue;
+
+ for (j = 0; j < field->maxusage; j++) {
+ if (field->usage[j].hid == HID_HP_AUTOTRIGGER)
+ field->value[j] = value;
+ }
+ }
+
+ /* send the report */
+ hid_hw_request(hdev, rep, HID_REQ_SET_REPORT);
+ mutex_unlock(&haptic->auto_trigger_mutex);
+ haptic->mode = mode;
+}
+
+#ifdef CONFIG_PM
+void hid_haptic_resume(struct hid_device *hdev, struct hid_haptic_device *haptic)
+{
+ if (haptic->press_ordinal_cur && haptic->release_ordinal_cur)
+ switch_mode(hdev, haptic, HID_HAPTIC_MODE_KERNEL);
+}
+EXPORT_SYMBOL_GPL(hid_haptic_resume);
+
+void hid_haptic_suspend(struct hid_device *hdev, struct hid_haptic_device *haptic)
+{
+ if (haptic->press_ordinal_cur && haptic->release_ordinal_cur)
+ switch_mode(hdev, haptic, HID_HAPTIC_MODE_DEVICE);
+}
+EXPORT_SYMBOL_GPL(hid_haptic_suspend);
+#endif
+
static int hid_haptic_upload_effect(struct input_dev *dev, struct ff_effect *effect,
struct ff_effect *old)
{
+ struct hid_device *hdev = input_get_drvdata(dev);
struct ff_device *ff = dev->ff;
struct hid_haptic_device *haptic = ff->private;
int i, ordinal = 0;
@@ -227,6 +277,20 @@ static int hid_haptic_upload_effect(struct input_dev *dev, struct ff_effect *eff
fill_effect_buf(haptic, &effect->u.hid, &haptic->effect[effect->id],
ordinal);
+ if (effect->id == HID_HAPTIC_RELEASE_EFFECT_ID) {
+ if (haptic->press_ordinal_cur &&
+ haptic->mode == HID_HAPTIC_MODE_DEVICE) {
+ switch_mode(hdev, haptic, HID_HAPTIC_MODE_KERNEL);
+ }
+ haptic->release_ordinal_cur = ordinal;
+ } else if (effect->id == HID_HAPTIC_PRESS_EFFECT_ID) {
+ if (haptic->release_ordinal_cur &&
+ haptic->mode == HID_HAPTIC_MODE_DEVICE) {
+ switch_mode(hdev, haptic, HID_HAPTIC_MODE_KERNEL);
+ }
+ haptic->press_ordinal_cur = ordinal;
+ }
+
return 0;
}
@@ -292,6 +356,7 @@ static void effect_set_default(struct ff_effect *effect)
static int hid_haptic_erase(struct input_dev *dev, int effect_id)
{
struct hid_haptic_device *haptic = dev->ff->private;
+ struct hid_device *hdev = input_get_drvdata(dev);
struct ff_effect effect;
int ordinal;
@@ -299,21 +364,29 @@ static int hid_haptic_erase(struct input_dev *dev, int effect_id)
switch (effect_id) {
case HID_HAPTIC_RELEASE_EFFECT_ID:
ordinal = haptic->release_ordinal_orig;
- if (!ordinal)
+ haptic->release_ordinal_cur = ordinal;
+ if (!ordinal) {
ordinal = HID_HAPTIC_ORDINAL_WAVEFORMNONE;
- else
+ if (haptic->mode == HID_HAPTIC_MODE_KERNEL)
+ switch_mode(hdev, haptic, HID_HAPTIC_MODE_DEVICE);
+ } else {
effect.u.hid.hid_usage = HID_HP_WAVEFORMRELEASE &
HID_USAGE;
+ }
fill_effect_buf(haptic, &effect.u.hid, &haptic->effect[effect_id],
ordinal);
break;
case HID_HAPTIC_PRESS_EFFECT_ID:
ordinal = haptic->press_ordinal_orig;
- if (!ordinal)
+ haptic->press_ordinal_cur = ordinal;
+ if (!ordinal) {
ordinal = HID_HAPTIC_ORDINAL_WAVEFORMNONE;
- else
+ if (haptic->mode == HID_HAPTIC_MODE_KERNEL)
+ switch_mode(hdev, haptic, HID_HAPTIC_MODE_DEVICE);
+ } else {
effect.u.hid.hid_usage = HID_HP_WAVEFORMPRESS &
HID_USAGE;
+ }
fill_effect_buf(haptic, &effect.u.hid, &haptic->effect[effect_id],
ordinal);
break;
@@ -405,6 +478,7 @@ int hid_haptic_init(struct hid_device *hdev,
haptic->hid_usage_map[HID_HAPTIC_ORDINAL_WAVEFORMSTOP] =
HID_HP_WAVEFORMSTOP & HID_USAGE;
+ mutex_init(&haptic->auto_trigger_mutex);
for (r = 0; r < haptic->auto_trigger_report->maxfield; r++)
parse_auto_trigger_field(haptic, haptic->auto_trigger_report->field[r]);
@@ -580,13 +654,13 @@ void hid_haptic_handle_press_release(struct hid_haptic_device *haptic)
if (!prev_pressed_state && haptic->pressed_state &&
haptic->mode == HID_HAPTIC_MODE_KERNEL) {
spin_lock_irqsave(&input->event_lock, flags);
- input->ff->playback(input, PRESS_HID_EFFECT_ID, 1);
+ input->ff->playback(input, HID_HAPTIC_PRESS_EFFECT_ID, 1);
spin_unlock_irqrestore(&input->event_lock, flags);
}
if (prev_pressed_state && !haptic->pressed_state &&
haptic->mode == HID_HAPTIC_MODE_KERNEL) {
spin_lock_irqsave(&input->event_lock, flags);
- input->ff->playback(input, RELEASE_HID_EFFECT_ID, 1);
+ input->ff->playback(input, HID_HAPTIC_RELEASE_EFFECT_ID, 1);
spin_unlock_irqrestore(&input->event_lock, flags);
}
}
@@ -597,8 +671,6 @@ bool hid_haptic_handle_input(struct hid_haptic_device *haptic)
if (haptic->mode == HID_HAPTIC_MODE_KERNEL) {
input_event(haptic->input_dev, EV_KEY, BTN_LEFT,
haptic->pressed_state);
- input_event(haptic->input_dev, EV_ABS, ABS_PRESSURE,
- haptic->pressure_sum);
return true;
}
return false;
diff --git a/drivers/hid/hid-haptic.h b/drivers/hid/hid-haptic.h
index 586f20be0061..280534be7e81 100644
--- a/drivers/hid/hid-haptic.h
+++ b/drivers/hid/hid-haptic.h
@@ -82,6 +82,10 @@ int hid_haptic_input_mapping(struct hid_device *hdev,
int hid_haptic_input_configured(struct hid_device *hdev,
struct hid_haptic_device *haptic,
struct hid_input *hi);
+#ifdef CONFIG_PM
+void hid_haptic_resume(struct hid_device *hdev, struct hid_haptic_device *haptic);
+void hid_haptic_suspend(struct hid_device *hdev, struct hid_haptic_device *haptic);
+#endif
int hid_haptic_init(struct hid_device *hdev, struct hid_haptic_device **haptic_ptr);
void hid_haptic_handle_press_release(struct hid_haptic_device *haptic);
bool hid_haptic_handle_input(struct hid_haptic_device *haptic);
@@ -117,6 +121,12 @@ int hid_haptic_input_configured(struct hid_device *hdev,
{
return 0;
}
+#ifdef CONFIG_PM
+static inline
+void hid_haptic_resume(struct hid_device *hdev, struct hid_haptic_device *haptic) {}
+static inline
+void hid_haptic_suspend(struct hid_device *hdev, struct hid_haptic_device *haptic) {}
+#endif
static inline
int hid_haptic_init(struct hid_device *hdev, struct hid_haptic_device **haptic_ptr)
{
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 13/16] HID: multitouch: add haptic multitouch support
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (11 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 12/16] HID: haptic: add hid_haptic_switch_mode Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 14/16] Input: introduce EVIOCFF(TAKE|RELEASE)CONTROL Angela Czubak
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
Add new option (MULTITOUCH_HAPTIC) to mark whether hid-multitouch
should try and configure simple haptic device.
Once this option is configured, and the device is recognized to have simple
haptic capabilities, check input frames for pressure and handle it using
hid_haptic_* API.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
drivers/hid/Kconfig | 11 ++++++
drivers/hid/hid-multitouch.c | 74 +++++++++++++++++++++++++++++++++++-
2 files changed, 83 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 3e7555b868e7..a202f01de912 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -755,6 +755,17 @@ config HID_MULTITOUCH
To compile this driver as a module, choose M here: the
module will be called hid-multitouch.
+config MULTITOUCH_HAPTIC
+ bool "Simple haptic multitouch support"
+ depends on HID_MULTITOUCH
+ select HID_HAPTIC
+ default n
+ help
+ Support for simple multitouch haptic devices.
+ Adds extra parsing and FF device for the hid multitouch driver.
+ It can be used for Elan 2703 haptic touchpad.
+ To enable, say Y.
+
config HID_NINTENDO
tristate "Nintendo Joy-Con and Pro Controller support"
depends on HID
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 99eabfb4145b..ec51e189bb1d 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -48,6 +48,8 @@ MODULE_LICENSE("GPL");
#include "hid-ids.h"
+#include "hid-haptic.h"
+
/* quirks to control the device */
#define MT_QUIRK_NOT_SEEN_MEANS_UP BIT(0)
#define MT_QUIRK_SLOT_IS_CONTACTID BIT(1)
@@ -159,11 +161,13 @@ struct mt_report_data {
struct mt_device {
struct mt_class mtclass; /* our mt device class */
struct timer_list release_timer; /* to release sticky fingers */
+ struct hid_haptic_device *haptic; /* haptic related configuration */
struct hid_device *hdev; /* hid_device we're attached to */
unsigned long mt_io_flags; /* mt flags (MT_IO_FLAGS_*) */
__u8 inputmode_value; /* InputMode HID feature value */
__u8 maxcontacts;
bool is_buttonpad; /* is this device a button pad? */
+ bool is_haptic_touchpad; /* is this device a haptic touchpad? */
bool serial_maybe; /* need to check for serial protocol */
struct list_head applications;
@@ -501,6 +505,8 @@ static void mt_feature_mapping(struct hid_device *hdev,
mt_get_feature(hdev, field->report);
break;
}
+
+ hid_haptic_feature_mapping(hdev, td->haptic, field, usage);
}
static void set_abs(struct input_dev *input, unsigned int code,
@@ -831,6 +837,9 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
case HID_DG_TIPPRESSURE:
set_abs(hi->input, ABS_MT_PRESSURE, field,
cls->sn_pressure);
+ td->is_haptic_touchpad =
+ hid_haptic_check_pressure_unit(td->haptic,
+ hi, field);
MT_STORE_FIELD(p);
return 1;
case HID_DG_SCANTIME:
@@ -944,8 +953,16 @@ static void mt_release_pending_palms(struct mt_device *td,
static void mt_sync_frame(struct mt_device *td, struct mt_application *app,
struct input_dev *input)
{
- if (app->quirks & MT_QUIRK_WIN8_PTP_BUTTONS)
- input_event(input, EV_KEY, BTN_LEFT, app->left_button_state);
+ if (td->is_haptic_touchpad)
+ hid_haptic_handle_press_release(td->haptic);
+
+ if (app->quirks & MT_QUIRK_WIN8_PTP_BUTTONS) {
+ if (!(td->is_haptic_touchpad &&
+ hid_haptic_handle_input(td->haptic))) {
+ input_event(input, EV_KEY, BTN_LEFT,
+ app->left_button_state);
+ }
+ }
input_mt_sync_frame(input);
input_event(input, EV_MSC, MSC_TIMESTAMP, app->timestamp);
@@ -955,6 +972,8 @@ static void mt_sync_frame(struct mt_device *td, struct mt_application *app,
app->num_received = 0;
app->left_button_state = 0;
+ if (td->is_haptic_touchpad)
+ hid_haptic_pressure_reset(td->haptic);
if (test_bit(MT_IO_FLAGS_ACTIVE_SLOTS, &td->mt_io_flags))
set_bit(MT_IO_FLAGS_PENDING_SLOTS, &td->mt_io_flags);
@@ -1104,6 +1123,9 @@ static int mt_process_slot(struct mt_device *td, struct input_dev *input,
minor = minor >> 1;
}
+ if (td->is_haptic_touchpad)
+ hid_haptic_pressure_increase(td->haptic, *slot->p);
+
input_event(input, EV_ABS, ABS_MT_POSITION_X, *slot->x);
input_event(input, EV_ABS, ABS_MT_POSITION_Y, *slot->y);
input_event(input, EV_ABS, ABS_MT_TOOL_X, *slot->cx);
@@ -1278,6 +1300,9 @@ static int mt_touch_input_configured(struct hid_device *hdev,
if (cls->is_indirect)
app->mt_flags |= INPUT_MT_POINTER;
+ if (td->is_haptic_touchpad)
+ app->mt_flags |= INPUT_MT_TOTAL_FORCE;
+
if (app->quirks & MT_QUIRK_NOT_SEEN_MEANS_UP)
app->mt_flags |= INPUT_MT_DROP_UNUSED;
@@ -1313,6 +1338,7 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
struct mt_device *td = hid_get_drvdata(hdev);
struct mt_application *application;
struct mt_report_data *rdata;
+ int ret;
rdata = mt_find_report_data(td, field->report);
if (!rdata) {
@@ -1375,6 +1401,11 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
if (field->physical == HID_DG_STYLUS)
hi->application = HID_DG_STYLUS;
+ ret = hid_haptic_input_mapping(hdev, td->haptic, hi, field, usage, bit,
+ max);
+ if (ret != 0)
+ return ret;
+
/* let hid-core decide for the others */
return 0;
}
@@ -1568,6 +1599,14 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
struct hid_report *report;
int ret;
+ if (td->is_haptic_touchpad && (td->mtclass.name == MT_CLS_WIN_8 ||
+ td->mtclass.name == MT_CLS_WIN_8_FORCE_MULTI_INPUT)) {
+ if (hid_haptic_input_configured(hdev, td->haptic, hi) == 0)
+ td->is_haptic_touchpad = false;
+ } else {
+ td->is_haptic_touchpad = false;
+ }
+
list_for_each_entry(report, &hi->reports, hidinput_list) {
rdata = mt_find_report_data(td, report);
if (!rdata) {
@@ -1713,6 +1752,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
dev_err(&hdev->dev, "cannot allocate multitouch data\n");
return -ENOMEM;
}
+ td->haptic = kzalloc(sizeof(*(td->haptic)), GFP_KERNEL);
+ if (!td->haptic)
+ return -ENOMEM;
td->hdev = hdev;
td->mtclass = *mtclass;
td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN;
@@ -1764,6 +1806,17 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
mt_set_modes(hdev, HID_LATENCY_NORMAL, true, true);
+ if (td->is_haptic_touchpad) {
+ if (hid_haptic_init(hdev, &td->haptic)) {
+ dev_warn(&hdev->dev, "Cannot allocate haptic for %s\n",
+ hdev->name);
+ td->is_haptic_touchpad = false;
+ kfree(td->haptic);
+ }
+ } else {
+ kfree(td->haptic);
+ }
+
return 0;
}
@@ -1771,6 +1824,7 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
static int mt_suspend(struct hid_device *hdev, pm_message_t state)
{
struct mt_device *td = hid_get_drvdata(hdev);
+ struct hid_haptic_device *haptic = td->haptic;
/* High latency is desirable for power savings during S3/S0ix */
if ((td->mtclass.quirks & MT_QUIRK_DISABLE_WAKEUP) ||
@@ -1779,18 +1833,31 @@ static int mt_suspend(struct hid_device *hdev, pm_message_t state)
else
mt_set_modes(hdev, HID_LATENCY_HIGH, true, true);
+ if (td->is_haptic_touchpad)
+ hid_haptic_resume(hdev, haptic);
+
return 0;
}
static int mt_reset_resume(struct hid_device *hdev)
{
+ struct mt_device *td = hid_get_drvdata(hdev);
+ struct hid_haptic_device *haptic = td->haptic;
+
mt_release_contacts(hdev);
mt_set_modes(hdev, HID_LATENCY_NORMAL, true, true);
+
+ if (td->is_haptic_touchpad)
+ hid_haptic_resume(hdev, haptic);
+
return 0;
}
static int mt_resume(struct hid_device *hdev)
{
+ struct mt_device *td = hid_get_drvdata(hdev);
+ struct hid_haptic_device *haptic = td->haptic;
+
/* Some Elan legacy devices require SET_IDLE to be set on resume.
* It should be safe to send it to other devices too.
* Tested on 3M, Stantum, Cypress, Zytronic, eGalax, and Elan panels. */
@@ -1799,6 +1866,9 @@ static int mt_resume(struct hid_device *hdev)
mt_set_modes(hdev, HID_LATENCY_NORMAL, true, true);
+ if (td->is_haptic_touchpad)
+ hid_haptic_suspend(hdev, haptic);
+
return 0;
}
#endif
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 14/16] Input: introduce EVIOCFF(TAKE|RELEASE)CONTROL
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (12 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 13/16] HID: multitouch: add haptic multitouch support Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 15/16] HID: haptic: add hid_haptic_change_control Angela Czubak
2022-01-14 18:31 ` [PATCH v2 16/16] HID: i2c-hid: fix handling numbered reports with IDs of 15 and above Angela Czubak
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
Add new ioctls which can be used for simple haptic force feedback effects.
Once the control is taken over the effect the kernel does not generate it
on its own (EVIOCFFTAKECONTROL).
To revert this action use EVIOCFFRELEASECONTROL.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
drivers/input/evdev.c | 6 +++
drivers/input/ff-core.c | 89 +++++++++++++++++++++++++++++++++++++-
include/linux/input.h | 5 +++
include/uapi/linux/input.h | 4 ++
4 files changed, 103 insertions(+), 1 deletion(-)
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 95f90699d2b1..6d25eb19e28e 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -1076,6 +1076,12 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,
case EVIOCRMFF:
return input_ff_erase(dev, (int)(unsigned long) p, file);
+ case EVIOCFFTAKECONTROL:
+ return input_ff_take_control(dev, (int)(unsigned long) p, file);
+
+ case EVIOCFFRELEASECONTROL:
+ return input_ff_release_control(dev, (int)(unsigned long) p, file);
+
case EVIOCGEFFECTS:
i = test_bit(EV_FF, dev->evbit) ?
dev->ff->max_effects : 0;
diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c
index 960ae0e29348..7536274141e7 100644
--- a/drivers/input/ff-core.c
+++ b/drivers/input/ff-core.c
@@ -252,6 +252,91 @@ int input_ff_erase(struct input_dev *dev, int effect_id, struct file *file)
}
EXPORT_SYMBOL_GPL(input_ff_erase);
+/*
+ * Take control over the effect if the requester is also the effect owner.
+ * The mutex should already be locked before calling this function.
+ */
+static int control_effect(struct input_dev *dev, int effect_id,
+ struct file *file, int take)
+{
+ struct ff_device *ff = dev->ff;
+ int error;
+
+ error = check_effect_access(ff, effect_id, file);
+ if (error) {
+ error = check_effect_shared(ff, effect_id);
+ if (error)
+ return error;
+ }
+
+ if (ff->change_control) {
+ error = ff->change_control(dev, effect_id, file, take);
+ if (error)
+ return error;
+ }
+
+ return 0;
+}
+/**
+ * input_ff_take_control - take control over a force-feedback effect from kernel
+ * @dev: input device to take control over effect from
+ * @effect_id: id of the effect to take control over
+ * @file: purported owner of the request
+ *
+ * This function switches user-controlled mode on for the given force-feedback
+ * effect. The user-mode will persist unitl the last caller releases control.
+ * The effect will only be taken control of if it was uploaded through the same
+ * file handle that is requesting taking control or for simple haptic effects
+ * 0 and 1.
+ * Valid only for simple haptic effects (ff_hid_effect).
+ */
+int input_ff_take_control(struct input_dev *dev, int effect_id,
+ struct file *file)
+{
+ struct ff_device *ff = dev->ff;
+ int ret;
+
+ if (!test_bit(EV_FF, dev->evbit))
+ return -EINVAL;
+
+ mutex_lock(&ff->mutex);
+ ret = control_effect(dev, effect_id, file, 1);
+ mutex_unlock(&ff->mutex);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(input_ff_take_control);
+
+/**
+ * input_ff_release_control - release control over a force-feedback effect
+ * @dev: input device to release control over effect to
+ * @effect_id: id of the effect to release control
+ * @file: purported owner of the request
+ *
+ * This function switches user-controlled mode off for the given force-feedback
+ * effect. The user-mode will persist unitl the last caller releases control.
+ * The control will be released of if it was uploaded through the same
+ * file handle that is requesting taking control or for simple haptic effects
+ * 0 and 1.
+ * Valid only for simple haptic effects (ff_hid_effect).
+ */
+int input_ff_release_control(struct input_dev *dev, int effect_id,
+ struct file *file)
+{
+ struct ff_device *ff = dev->ff;
+ int ret;
+
+ if (!test_bit(EV_FF, dev->evbit))
+ return -EINVAL;
+
+ mutex_lock(&ff->mutex);
+ ret = control_effect(dev, effect_id, file, 0);
+ mutex_unlock(&ff->mutex);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(input_ff_release_control);
+
/*
* input_ff_flush - erase all effects owned by a file handle
* @dev: input device to erase effect from
@@ -270,8 +355,10 @@ int input_ff_flush(struct input_dev *dev, struct file *file)
mutex_lock(&ff->mutex);
- for (i = 0; i < ff->max_effects; i++)
+ for (i = 0; i < ff->max_effects; i++) {
+ control_effect(dev, i, file, 0);
erase_effect(dev, i, file);
+ }
mutex_unlock(&ff->mutex);
diff --git a/include/linux/input.h b/include/linux/input.h
index 0354b298d874..cc432ff6a427 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -519,6 +519,7 @@ extern struct class input_class;
* @upload: Called to upload an new effect into device
* @erase: Called to erase an effect from device
* @playback: Called to request device to start playing specified effect
+ * @change_control: Called to change control over specified effect
* @set_gain: Called to set specified gain
* @set_autocenter: Called to auto-center device
* @destroy: called by input core when parent input device is being
@@ -547,6 +548,8 @@ struct ff_device {
int (*erase)(struct input_dev *dev, int effect_id);
int (*playback)(struct input_dev *dev, int effect_id, int value);
+ int (*change_control)(struct input_dev *dev, int effect_id,
+ struct file *file, int take);
void (*set_gain)(struct input_dev *dev, u16 gain);
void (*set_autocenter)(struct input_dev *dev, u16 magnitude);
@@ -570,6 +573,8 @@ int input_ff_event(struct input_dev *dev, unsigned int type, unsigned int code,
int input_ff_upload(struct input_dev *dev, struct ff_effect *effect, struct file *file);
int input_ff_erase(struct input_dev *dev, int effect_id, struct file *file);
+int input_ff_take_control(struct input_dev *dev, int effect_id, struct file *file);
+int input_ff_release_control(struct input_dev *dev, int effect_id, struct file *file);
int input_ff_flush(struct input_dev *dev, struct file *file);
int input_ff_create_memless(struct input_dev *dev, void *data,
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index ccf43a21d43d..cce37336ab38 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -178,6 +178,10 @@ struct input_mask {
#define EVIOCSFF _IOW('E', 0x80, struct ff_effect) /* send a force effect to a force feedback device */
#define EVIOCRMFF _IOW('E', 0x81, int) /* Erase a force effect */
+/* Take control over a force effect */
+#define EVIOCFFTAKECONTROL _IOW('E', 0x82, int)
+/* Release control over a force effect */
+#define EVIOCFFRELEASECONTROL _IOW('E', 0x83, int)
#define EVIOCGEFFECTS _IOR('E', 0x84, int) /* Report number of effects playable at the same time */
#define EVIOCGRAB _IOW('E', 0x90, int) /* Grab/Release device */
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 15/16] HID: haptic: add hid_haptic_change_control
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (13 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 14/16] Input: introduce EVIOCFF(TAKE|RELEASE)CONTROL Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
2022-01-14 18:31 ` [PATCH v2 16/16] HID: i2c-hid: fix handling numbered reports with IDs of 15 and above Angela Czubak
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
Implement change_control callbacks for simple haptic device.
If anybody has requested control over an effect, do not generate it
in kernel.
Signed-off-by: Angela Czubak <acz@semihalf.com>
---
drivers/hid/hid-haptic.c | 50 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 48 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-haptic.c b/drivers/hid/hid-haptic.c
index 2035b8a6037f..adc11bd1d84b 100644
--- a/drivers/hid/hid-haptic.c
+++ b/drivers/hid/hid-haptic.c
@@ -6,6 +6,7 @@
*/
#include <linux/input/mt.h>
+#include <linux/mm.h>
#include <linux/module.h>
#include "hid-haptic.h"
@@ -343,6 +344,46 @@ static int hid_haptic_playback(struct input_dev *dev, int effect_id, int value)
return 0;
}
+static int hid_haptic_change_control(struct input_dev *dev, int effect_id,
+ struct file *file, int take)
+{
+ struct hid_haptic_device *haptic = dev->ff->private;
+ struct hid_haptic_effect_node *effect_node;
+ struct hid_haptic_effect *effect;
+ bool found = false;
+ int ret = 0;
+
+ effect = &haptic->effect[effect_id];
+ mutex_lock(&effect->control_mutex);
+ list_for_each_entry(effect_node, &effect->control, node) {
+ if (effect_node->file == file) {
+ found = true;
+ break;
+ }
+ }
+ if (take) {
+ if (!found) {
+ effect_node = kvzalloc(sizeof(struct hid_haptic_effect),
+ GFP_KERNEL);
+ if (!effect_node) {
+ ret = -ENOMEM;
+ goto exit;
+ }
+ effect_node->file = file;
+ }
+ list_add(&effect_node->node, &effect->control);
+ } else {
+ if (found) {
+ list_del(&effect_node->node);
+ kvfree(effect_node);
+ }
+ }
+exit:
+ mutex_unlock(&effect->control_mutex);
+
+ return ret;
+}
+
static void effect_set_default(struct ff_effect *effect)
{
effect->type = FF_HID;
@@ -527,6 +568,8 @@ int hid_haptic_init(struct hid_device *hdev,
}
haptic->effect[r].input_dev = dev;
INIT_WORK(&haptic->effect[r].work, haptic_work_handler);
+ INIT_LIST_HEAD(&haptic->effect[r].control);
+ mutex_init(&haptic->effect[r].control_mutex);
}
haptic->stop_effect.report_buf =
hid_alloc_report_buf(haptic->manual_trigger_report,
@@ -563,6 +606,7 @@ int hid_haptic_init(struct hid_device *hdev,
ff->private = haptic;
ff->upload = hid_haptic_upload_effect;
ff->playback = hid_haptic_playback;
+ ff->change_control = hid_haptic_change_control;
ff->erase = hid_haptic_erase;
ff->destroy = hid_haptic_destroy;
if (!try_module_get(THIS_MODULE)) {
@@ -652,13 +696,15 @@ void hid_haptic_handle_press_release(struct hid_haptic_device *haptic)
else if (haptic->pressure_sum < haptic->release_threshold)
haptic->pressed_state = 0;
if (!prev_pressed_state && haptic->pressed_state &&
- haptic->mode == HID_HAPTIC_MODE_KERNEL) {
+ haptic->mode == HID_HAPTIC_MODE_KERNEL &&
+ list_empty(&haptic->effect[HID_HAPTIC_PRESS_EFFECT_ID].control)) {
spin_lock_irqsave(&input->event_lock, flags);
input->ff->playback(input, HID_HAPTIC_PRESS_EFFECT_ID, 1);
spin_unlock_irqrestore(&input->event_lock, flags);
}
if (prev_pressed_state && !haptic->pressed_state &&
- haptic->mode == HID_HAPTIC_MODE_KERNEL) {
+ haptic->mode == HID_HAPTIC_MODE_KERNEL &&
+ list_empty(&haptic->effect[HID_HAPTIC_RELEASE_EFFECT_ID].control)) {
spin_lock_irqsave(&input->event_lock, flags);
input->ff->playback(input, HID_HAPTIC_RELEASE_EFFECT_ID, 1);
spin_unlock_irqrestore(&input->event_lock, flags);
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 16/16] HID: i2c-hid: fix handling numbered reports with IDs of 15 and above
2022-01-14 18:31 [PATCH v2 00/16] *** Implement simple haptic HID support *** Angela Czubak
` (14 preceding siblings ...)
2022-01-14 18:31 ` [PATCH v2 15/16] HID: haptic: add hid_haptic_change_control Angela Czubak
@ 2022-01-14 18:31 ` Angela Czubak
15 siblings, 0 replies; 17+ messages in thread
From: Angela Czubak @ 2022-01-14 18:31 UTC (permalink / raw)
To: linux-input
Cc: upstream, dmitry.torokhov, benjamin.tissoires, jikos, Angela Czubak
Special handling of numbered reports with IDs of 15 and above is only
needed when executing what HID-I2C spec is calling "Class Specific
Requests", and not when simply sending output reports.
Additionally, our mangling of report ID in i2c_hid_set_or_send_report()
resulted in incorrect report ID being written into SET_REPORT command
payload.
To solve it let's move all the report ID manipulation into
__i2c_hid_command() where we form the command data structure.
Signed-off-by: Angela Czubak <acz@semihalf.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/hid/i2c-hid/i2c-hid-core.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c
index 6726567d7297..3195a1ffae23 100644
--- a/drivers/hid/i2c-hid/i2c-hid-core.c
+++ b/drivers/hid/i2c-hid/i2c-hid-core.c
@@ -97,6 +97,7 @@ union command {
__le16 reg;
__u8 reportTypeID;
__u8 opcode;
+ __u8 reportID;
} __packed c;
};
@@ -232,7 +233,13 @@ static int __i2c_hid_command(struct i2c_client *client,
if (length > 2) {
cmd->c.opcode = command->opcode;
- cmd->c.reportTypeID = reportID | reportType << 4;
+ if (reportID < 0x0F) {
+ cmd->c.reportTypeID = reportType << 4 | reportID;
+ } else {
+ cmd->c.reportTypeID = reportType << 4 | 0x0F;
+ cmd->c.reportID = reportID;
+ length++;
+ }
}
memcpy(cmd->data + length, args, args_len);
@@ -300,11 +307,6 @@ static int i2c_hid_get_report(struct i2c_client *client, u8 reportType,
i2c_hid_dbg(ihid, "%s\n", __func__);
- if (reportID >= 0x0F) {
- args[args_len++] = reportID;
- reportID = 0x0F;
- }
-
args[args_len++] = readRegister & 0xFF;
args[args_len++] = readRegister >> 8;
@@ -350,18 +352,12 @@ static int i2c_hid_set_or_send_report(struct i2c_client *client, u8 reportType,
size = 2 /* size */ +
(reportID ? 1 : 0) /* reportID */ +
data_len /* buf */;
- args_len = (reportID >= 0x0F ? 1 : 0) /* optional third byte */ +
- 2 /* dataRegister */ +
+ args_len = 2 /* dataRegister */ +
size /* args */;
if (!use_data && maxOutputLength == 0)
return -ENOSYS;
- if (reportID >= 0x0F) {
- args[index++] = reportID;
- reportID = 0x0F;
- }
-
/*
* use the data register for feature reports or if the device does not
* support the output register
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 17+ messages in thread