Skip to content

Commit

Permalink
IIO: ADC: AD7606: Update timestamp handling
Browse files Browse the repository at this point in the history
Add timestamp attributes.
Revise timestamp handling accordingly.
Preset timestamp generation.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Michael Hennerich authored and Greg Kroah-Hartman committed Feb 28, 2011
1 parent e08d026 commit dcfb086
Showing 1 changed file with 18 additions and 4 deletions.
22 changes: 18 additions & 4 deletions drivers/staging/iio/adc/ad7606_ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ static IIO_SCAN_EL_C(in5, 5, 0, NULL);
static IIO_SCAN_EL_C(in6, 6, 0, NULL);
static IIO_SCAN_EL_C(in7, 7, 0, NULL);

static IIO_SCAN_EL_TIMESTAMP(8);
static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64);

static ssize_t ad7606_show_type(struct device *dev,
struct device_attribute *attr,
char *buf)
Expand Down Expand Up @@ -60,6 +63,9 @@ static struct attribute *ad7606_scan_el_attrs[] = {
&iio_const_attr_in6_index.dev_attr.attr,
&iio_scan_el_in7.dev_attr.attr,
&iio_const_attr_in7_index.dev_attr.attr,
&iio_const_attr_timestamp_index.dev_attr.attr,
&iio_scan_el_timestamp.dev_attr.attr,
&iio_const_attr_timestamp_type.dev_attr.attr,
&iio_dev_attr_in_type.dev_attr.attr,
NULL,
};
Expand Down Expand Up @@ -133,10 +139,14 @@ static int ad7606_ring_preenable(struct iio_dev *indio_dev)
size_t d_size;

d_size = st->chip_info->num_channels *
st->chip_info->bits / 8 + sizeof(s64);
st->chip_info->bits / 8;

if (ring->scan_timestamp) {
d_size += sizeof(s64);

if (d_size % sizeof(s64))
d_size += sizeof(s64) - (d_size % sizeof(s64));
if (d_size % sizeof(s64))
d_size += sizeof(s64) - (d_size % sizeof(s64));
}

if (ring->access.set_bytes_per_datum)
ring->access.set_bytes_per_datum(ring, d_size);
Expand Down Expand Up @@ -210,7 +220,10 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s)
}

time_ns = iio_get_time_ns();
memcpy(buf + st->d_size - sizeof(s64), &time_ns, sizeof(time_ns));

if (ring->scan_timestamp)
memcpy(buf + st->d_size - sizeof(s64),
&time_ns, sizeof(time_ns));

ring->access.store_to(&sw_ring->buf, buf, time_ns);
done:
Expand Down Expand Up @@ -242,6 +255,7 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
indio_dev->ring->postenable = &iio_triggered_ring_postenable;
indio_dev->ring->predisable = &iio_triggered_ring_predisable;
indio_dev->ring->scan_el_attrs = &ad7606_scan_el_group;
indio_dev->ring->scan_timestamp = true ;

INIT_WORK(&st->poll_work, &ad7606_poll_bh_to_ring);

Expand Down

0 comments on commit dcfb086

Please sign in to comment.