From: Jonathan Cameron <jic23@cam.ac.uk>
To: michael.hennerich@analog.com
Cc: linux-iio@vger.kernel.org, drivers@analog.com,
device-drivers-devel@blackfin.uclinux.org
Subject: Re: [PATCH] IIO: ADC: AD7606: Update timestamp handling
Date: Thu, 24 Feb 2011 19:55:04 +0000 [thread overview]
Message-ID: <4D66B798.2040301@cam.ac.uk> (raw)
In-Reply-To: <1298574577-8373-3-git-send-email-michael.hennerich@analog.com>
On 02/24/11 19:09, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
>
> 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>
> ---
> drivers/staging/iio/adc/ad7606_ring.c | 22 ++++++++++++++++++----
> 1 files changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c
> index 9889680..b32cb0d 100644
> --- a/drivers/staging/iio/adc/ad7606_ring.c
> +++ b/drivers/staging/iio/adc/ad7606_ring.c
> @@ -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)
> @@ -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,
> };
> @@ -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);
> @@ -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:
> @@ -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);
>
next prev parent reply other threads:[~2011-02-24 19:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-24 19:09 [PATCH] IIO: ADC: AD7476: Update timestamp handling michael.hennerich
2011-02-24 19:09 ` [PATCH] IIO: ADC: AD7887: " michael.hennerich
2011-02-24 19:54 ` Jonathan Cameron
2011-02-24 19:09 ` [PATCH] IIO: ADC: AD7606: " michael.hennerich
2011-02-24 19:55 ` Jonathan Cameron [this message]
2011-02-24 19:09 ` [PATCH] IIO: ADC: AD799x: " michael.hennerich
2011-02-24 19:55 ` Jonathan Cameron
2011-02-24 20:31 ` Hennerich, Michael
2011-02-24 19:51 ` [PATCH] IIO: ADC: AD7476: " Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D66B798.2040301@cam.ac.uk \
--to=jic23@cam.ac.uk \
--cc=device-drivers-devel@blackfin.uclinux.org \
--cc=drivers@analog.com \
--cc=linux-iio@vger.kernel.org \
--cc=michael.hennerich@analog.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.