Linux IIO development
 help / color / mirror / Atom feed
* [PATCH] iio: trigger: Add filter callbacks
@ 2011-06-06 11:01 michael.hennerich
  2011-06-06 11:40 ` Jonathan Cameron
  0 siblings, 1 reply; 5+ messages in thread
From: michael.hennerich @ 2011-06-06 11:01 UTC (permalink / raw)
  To: jic23; +Cc: linux-iio, device-drivers-devel, drivers, Michael Hennerich

From: Michael Hennerich <michael.hennerich@analog.com>

Allow devices to reject triggers and vice versa.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
---
 drivers/staging/iio/iio.h                  |    2 ++
 drivers/staging/iio/industrialio-trigger.c |   16 +++++++++++++++-
 drivers/staging/iio/trigger.h              |    2 ++
 3 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index 78a0927..8ec4f41 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -293,6 +293,8 @@ struct iio_dev {
 
 	u32				*available_scan_masks;
 	struct iio_trigger		*trig;
+	int (*iio_validate_trigger)	(struct iio_dev *indio_dev,
+					 struct iio_trigger *trig);
 	struct iio_poll_func		*pollfunc;
 
 	struct iio_chan_spec const *channels;
diff --git a/drivers/staging/iio/industrialio-trigger.c b/drivers/staging/iio/industrialio-trigger.c
index 6159023..1f6bc65 100644
--- a/drivers/staging/iio/industrialio-trigger.c
+++ b/drivers/staging/iio/industrialio-trigger.c
@@ -294,6 +294,7 @@ struct iio_poll_func
 	pf->h = h;
 	pf->thread = thread;
 	pf->type = type;
+	pf->private_data = private;
 
 	return pf;
 }
@@ -339,6 +340,8 @@ static ssize_t iio_trigger_write_current(struct device *dev,
 {
 	struct iio_dev *dev_info = dev_get_drvdata(dev);
 	struct iio_trigger *oldtrig = dev_info->trig;
+	struct iio_trigger *trig;
+
 	mutex_lock(&dev_info->mlock);
 	if (dev_info->currentmode == INDIO_RING_TRIGGERED) {
 		mutex_unlock(&dev_info->mlock);
@@ -346,7 +349,18 @@ static ssize_t iio_trigger_write_current(struct device *dev,
 	}
 	mutex_unlock(&dev_info->mlock);
 
-	dev_info->trig = iio_trigger_find_by_name(buf, len);
+	trig = iio_trigger_find_by_name(buf, len);
+
+	if (trig && dev_info->iio_validate_trigger &&
+		dev_info->iio_validate_trigger(dev_info, trig))
+		return -EINVAL;
+
+	if (trig && trig->iio_validate_device &&
+		trig->iio_validate_device(trig, dev_info))
+		return -EINVAL;
+
+	dev_info->trig = trig;
+
 	if (oldtrig && dev_info->trig != oldtrig)
 		iio_put_trigger(oldtrig);
 	if (dev_info->trig)
diff --git a/drivers/staging/iio/trigger.h b/drivers/staging/iio/trigger.h
index f329fe1..9218200 100644
--- a/drivers/staging/iio/trigger.h
+++ b/drivers/staging/iio/trigger.h
@@ -48,6 +48,8 @@ struct iio_trigger {
 
 	int (*set_trigger_state)(struct iio_trigger *trig, bool state);
 	int (*try_reenable)(struct iio_trigger *trig);
+	int (*iio_validate_device)(struct iio_trigger *trig,
+				   struct iio_dev *indio_dev);
 
 	struct irq_chip			subirq_chip;
 	int				subirq_base;
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-06-06 12:40 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-06 11:01 [PATCH] iio: trigger: Add filter callbacks michael.hennerich
2011-06-06 11:40 ` Jonathan Cameron
2011-06-06 11:54   ` Jonathan Cameron
2011-06-06 11:56     ` Hennerich, Michael
2011-06-06 12:48       ` Jonathan Cameron

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox