Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3950e033 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Jiri Kosina
Browse files

HID: hid-sensor-hub: Enhance feature report set API 



Current API only allows setting one offset in the field. This API
is extended to set multiple offsets in the field report.
Also update parameters in the users of this API.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 6adc83fc

drivers/hid/hid-sensor-hub.c

+20 −2
Original line number Diff line number Diff line
@@ -199,10 +199,14 @@ int sensor_hub_remove_callback(struct hid_sensor_hub_device *hsdev, 
EXPORT_SYMBOL_GPL(sensor_hub_remove_callback);



int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,

				u32 field_index, s32 value)

			   u32 field_index, int buffer_size, void *buffer)

{

	struct hid_report *report;

	struct sensor_hub_data *data = hid_get_drvdata(hsdev->hdev);

	__s32 *buf32 = buffer;

	int i = 0;

	int remaining_bytes;

	__s32 value;

	int ret = 0;



	mutex_lock(&data->mutex);
@@ -211,7 +215,21 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id, 
		ret = -EINVAL;

		goto done_proc;

	}

	hid_set_field(report->field[field_index], 0, value);



	remaining_bytes = do_div(buffer_size, sizeof(__s32));

	if (buffer_size) {

		for (i = 0; i < buffer_size; ++i) {

			hid_set_field(report->field[field_index], i,

				      cpu_to_le32(*buf32));

			++buf32;

		}

	}

	if (remaining_bytes) {

		value = 0;

		memcpy(&value, (u8 *)buf32, remaining_bytes);

		hid_set_field(report->field[field_index], i,

			      cpu_to_le32(value));

	}

	hid_hw_request(hsdev->hdev, report, HID_REQ_SET_REPORT);

	hid_hw_wait(hsdev->hdev);

drivers/iio/common/hid-sensors/hid-sensor-attributes.c

+5 −6
Original line number Diff line number Diff line
@@ -212,9 +212,8 @@ int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st, 
		else

			value = 0;

	}

	ret = sensor_hub_set_feature(st->hsdev,

		st->poll.report_id,

		st->poll.index, value);

	ret = sensor_hub_set_feature(st->hsdev, st->poll.report_id,

				     st->poll.index, sizeof(value), &value);

	if (ret < 0 || value < 0)

		ret = -EINVAL;
@@ -254,9 +253,9 @@ int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st, 
	value = convert_to_vtf_format(st->sensitivity.size,

				st->sensitivity.unit_expo,

				val1, val2);

	ret = sensor_hub_set_feature(st->hsdev,

		st->sensitivity.report_id,

		st->sensitivity.index, value);

	ret = sensor_hub_set_feature(st->hsdev, st->sensitivity.report_id,

				     st->sensitivity.index, sizeof(value),

				     &value);

	if (ret < 0 || value < 0)

		ret = -EINVAL;

drivers/iio/common/hid-sensors/hid-sensor-trigger.c

+5 −4
Original line number Diff line number Diff line
@@ -64,15 +64,16 @@ int hid_sensor_power_state(struct hid_sensor_common *st, bool state) 
	if (state_val >= 0) {

		state_val += st->power_state.logical_minimum;

		sensor_hub_set_feature(st->hsdev, st->power_state.report_id,

					st->power_state.index,

					(s32)state_val);

				       st->power_state.index, sizeof(state_val),

				       &state_val);

	}



	if (report_val >= 0) {

		report_val += st->report_state.logical_minimum;

		sensor_hub_set_feature(st->hsdev, st->report_state.report_id,

				       st->report_state.index,

					(s32)report_val);

				       sizeof(report_val),

				       &report_val);

	}



	sensor_hub_get_feature(st->hsdev, st->power_state.report_id,

include/linux/hid-sensor-hub.h

+3 −2
Original line number Diff line number Diff line
@@ -194,13 +194,14 @@ int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev, 
* sensor_hub_set_feature() - Feature set request

* @report_id:	Report id to look for

* @field_index:	Field index inside a report

* @value:	Value to set

* @buffer_size: size of the buffer

* @buffer:	buffer to use in the feature set

*

* Used to set a field in feature report. For example this can set polling

* interval, sensitivity, activate/deactivate state.

*/

int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,

			u32 field_index, s32 value);

			   u32 field_index, int buffer_size, void *buffer);



/**

* sensor_hub_get_feature() - Feature get request