On Thu, 3 Aug 2017 01:24:26 +0200
Andreas Klinger <ak@xxxxxxxxxxxxx> wrote:
> Add support for triggered buffers.
>
> Data format is quite simple:
> distance 16 Bit
> alignment 48 Bit
> timestamp 64 Bit
>
> Signed-off-by: Andreas Klinger <ak@xxxxxxxxxxxxx>
Trivial stuff inline. Otherwise looks good.
> ---
> drivers/iio/proximity/srf08.c | 45 +++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 43 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/proximity/srf08.c b/drivers/iio/proximity/srf08.c
> index 350b5b0eb64e..92e1799c430c 100644
> --- a/drivers/iio/proximity/srf08.c
> +++ b/drivers/iio/proximity/srf08.c
> @@ -18,6 +18,9 @@
> #include <linux/bitops.h>
> #include <linux/iio/iio.h>
> #include <linux/iio/sysfs.h>
> +#include <linux/iio/buffer.h>
> +#include <linux/iio/trigger_consumer.h>
> +#include <linux/iio/triggered_buffer.h>
>
> /* registers of SRF08 device */
> #define SRF08_WRITE_COMMAND 0x00 /* Command Register */
> @@ -30,7 +33,6 @@
>
> #define SRF08_CMD_RANGING_CM 0x51 /* Ranging Mode - Result in cm */
>
> -//#define SRF08_DEFAULT_GAIN 1025 /* default analogue value of Gain */
Ah.. This needs moving back to patch one.
> #define SRF08_DEFAULT_RANGE 6020 /* default value of Range in mm */
>
> #define SRF08_MAX_SENSITIVITY 32 /* number of Gain Register values */
> @@ -47,6 +49,8 @@ struct srf08_data {
> int range_mm; /* max. Range in mm */
> struct mutex lock;
> enum srf08_sensor_type sensor_type; /* Sensor-Type */
> + s16 buffer[8];
> + /* 1x16-bit channel + 3x16 padding + 4x16 timestamp */
This some pretty random indenting etc.
Put it on the line above and use a blank line to clearly separate it from
those further up.
> };
>
> /*
> @@ -137,6 +141,28 @@ static int srf08_read_ranging(struct srf08_data *data)
> return ret;
> }
>
> +static irqreturn_t srf08_trigger_handler(int irq, void *p)
> +{
> + struct iio_poll_func *pf = p;
> + struct iio_dev *indio_dev = pf->indio_dev;
> + struct srf08_data *data = iio_priv(indio_dev);
> + s16 sensor_data;
> +
> + sensor_data = srf08_read_ranging(data);
> + if (sensor_data < 0)
> + goto err;
> +
> + mutex_lock(&data->lock);
> + data->buffer[0] = sensor_data;
> + mutex_unlock(&data->lock);
> +
> + iio_push_to_buffers_with_timestamp(indio_dev,
> + data->buffer, pf->timestamp);
> +err:
> + iio_trigger_notify_done(indio_dev->trig);
> + return IRQ_HANDLED;
> +}
> +
> static int srf08_read_raw(struct iio_dev *indio_dev,
> struct iio_chan_spec const *channel, int *val,
> int *val2, long mask)
> @@ -357,7 +383,15 @@ static const struct iio_chan_spec srf08_channels[] = {
> .info_mask_separate =
> BIT(IIO_CHAN_INFO_RAW) |
> BIT(IIO_CHAN_INFO_SCALE),
> + .scan_index = 0,
> + .scan_type = {
> + .sign = 's',
> + .realbits = 16,
> + .storagebits = 16,
> + .endianness = IIO_CPU,
> + },
> },
> + IIO_CHAN_SOFT_TIMESTAMP(1),
> };
>
> static const struct iio_info srf08_info = {
> @@ -397,6 +431,13 @@ static int srf08_probe(struct i2c_client *client,
>
> mutex_init(&data->lock);
>
> + ret = devm_iio_triggered_buffer_setup(&client->dev, indio_dev,
> + iio_pollfunc_store_time, srf08_trigger_handler, NULL);
> + if (ret < 0) {
> + dev_err(&client->dev, "setup of iio triggered buffer failed\n");
> + return ret;
> + }
> +
> /*
> * set default values of device here
> * these register values cannot be read from the hardware
> @@ -431,5 +472,5 @@ static struct i2c_driver srf08_driver = {
> module_i2c_driver(srf08_driver);
>
> MODULE_AUTHOR("Andreas Klinger <ak@xxxxxxxxxxxxx>");
> -MODULE_DESCRIPTION("Devantech SRF08 ultrasonic ranger driver");
> +MODULE_DESCRIPTION("Devantech SRF08/SRF10 ultrasonic ranger driver");
> MODULE_LICENSE("GPL");
