Commit 04fe70d1 authored by Ye Xiang's avatar Ye Xiang Committed by Jonathan Cameron
Browse files

iio: hid-sensor-incl-3d: Add timestamp channel 



Each sample has a timestamp field with this change. This timestamp may
be from the sensor hub when present or local kernel timestamp. And the
unit of timestamp is nanosecond.

Signed-off-by: default avatarYe Xiang <xiang.ye@intel.com>
Link: https://lore.kernel.org/r/20210105093515.19135-6-xiang.ye@intel.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent a6bea3d5

drivers/iio/orientation/hid-sensor-incl-3d.c

+27 −16
Original line number Diff line number Diff line
@@ -24,15 +24,21 @@ enum incl_3d_channel { 
	INCLI_3D_CHANNEL_MAX,

};



#define CHANNEL_SCAN_INDEX_TIMESTAMP INCLI_3D_CHANNEL_MAX



struct incl_3d_state {

	struct hid_sensor_hub_callbacks callbacks;

	struct hid_sensor_common common_attributes;

	struct hid_sensor_hub_attribute_info incl[INCLI_3D_CHANNEL_MAX];

	struct {

		u32 incl_val[INCLI_3D_CHANNEL_MAX];

		u64 timestamp __aligned(8);

	} scan;

	int scale_pre_decml;

	int scale_post_decml;

	int scale_precision;

	int value_offset;

	s64 timestamp;

};



static const u32 incl_3d_addresses[INCLI_3D_CHANNEL_MAX] = {
@@ -73,7 +79,8 @@ static const struct iio_chan_spec incl_3d_channels[] = { 
		BIT(IIO_CHAN_INFO_SAMP_FREQ) |

		BIT(IIO_CHAN_INFO_HYSTERESIS),

		.scan_index = CHANNEL_SCAN_INDEX_Z,

	}

	},

	IIO_CHAN_SOFT_TIMESTAMP(CHANNEL_SCAN_INDEX_TIMESTAMP),

};



/* Adjust channel real bits based on report descriptor */
@@ -178,13 +185,6 @@ static const struct iio_info incl_3d_info = { 
	.write_raw = &incl_3d_write_raw,

};



/* Function to push data to buffer */

static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)

{

	dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");

	iio_push_to_buffers(indio_dev, (u8 *)data);

}



/* Callback handler to send event after all samples are received and captured */

static int incl_3d_proc_event(struct hid_sensor_hub_device *hsdev,

				unsigned usage_id,
@@ -194,10 +194,16 @@ static int incl_3d_proc_event(struct hid_sensor_hub_device *hsdev, 
	struct incl_3d_state *incl_state = iio_priv(indio_dev);



	dev_dbg(&indio_dev->dev, "incl_3d_proc_event\n");

	if (atomic_read(&incl_state->common_attributes.data_ready))

		hid_sensor_push_data(indio_dev,

				(u8 *)incl_state->incl_val,

				sizeof(incl_state->incl_val));

	if (atomic_read(&incl_state->common_attributes.data_ready)) {

		if (!incl_state->timestamp)

			incl_state->timestamp = iio_get_time_ns(indio_dev);



		iio_push_to_buffers_with_timestamp(indio_dev,

						   &incl_state->scan,

						   incl_state->timestamp);



		incl_state->timestamp = 0;

	}



	return 0;

}
@@ -214,13 +220,18 @@ static int incl_3d_capture_sample(struct hid_sensor_hub_device *hsdev, 


	switch (usage_id) {

	case HID_USAGE_SENSOR_ORIENT_TILT_X:

		incl_state->incl_val[CHANNEL_SCAN_INDEX_X] = *(u32 *)raw_data;

		incl_state->scan.incl_val[CHANNEL_SCAN_INDEX_X] = *(u32 *)raw_data;

	break;

	case HID_USAGE_SENSOR_ORIENT_TILT_Y:

		incl_state->incl_val[CHANNEL_SCAN_INDEX_Y] = *(u32 *)raw_data;

		incl_state->scan.incl_val[CHANNEL_SCAN_INDEX_Y] = *(u32 *)raw_data;

	break;

	case HID_USAGE_SENSOR_ORIENT_TILT_Z:

		incl_state->incl_val[CHANNEL_SCAN_INDEX_Z] = *(u32 *)raw_data;

		incl_state->scan.incl_val[CHANNEL_SCAN_INDEX_Z] = *(u32 *)raw_data;

	break;

	case HID_USAGE_SENSOR_TIME_TIMESTAMP:

		incl_state->timestamp =

			hid_sensor_convert_timestamp(&incl_state->common_attributes,

						     *(s64 *)raw_data);

	break;

	default:

		ret = -EINVAL;