Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1319220

[PATCH v7 3/5] Add support for receiving USBTMC USB488 SRQ notifications via poll/select

Show all headers | View raw

Background:
In many situations operations on multiple instruments need to be
synchronized. poll/select provide a convenient way of waiting on a
number of different instruments and other peripherals
simultaneously.

Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
 drivers/usb/class/usbtmc.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index d77da2f..8678429 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -27,6 +27,7 @@
 #include <linux/uaccess.h>
 #include <linux/kref.h>
 #include <linux/slab.h>
+#include <linux/poll.h>
 #include <linux/mutex.h>
 #include <linux/usb.h>
 #include <linux/usb/tmc.h>
@@ -1184,6 +1185,27 @@ static int usbtmc_fasync(int fd, struct file *file, int on)
 	return fasync_helper(fd, file, on, &data->fasync);
 }
 
+static unsigned int usbtmc_poll(struct file *file, poll_table *wait)
+{
+	struct usbtmc_device_data *data = file->private_data;
+	unsigned int mask;
+
+	mutex_lock(&data->io_mutex);
+
+	if (data->zombie) {
+		mask = POLLHUP | POLLERR;
+		goto no_poll;
+	}
+
+	poll_wait(file, &data->waitq, wait);
+
+	mask = (atomic_read(&data->srq_asserted)) ? POLLIN | POLLRDNORM : 0;
+
+no_poll:
+	mutex_unlock(&data->io_mutex);
+	return mask;
+}
+
 static const struct file_operations fops = {
 	.owner		= THIS_MODULE,
 	.read		= usbtmc_read,
@@ -1192,6 +1214,7 @@ static const struct file_operations fops = {
 	.release	= usbtmc_release,
 	.unlocked_ioctl	= usbtmc_ioctl,
 	.fasync         = usbtmc_fasync,
+	.poll           = usbtmc_poll,
 	.llseek		= default_llseek,
 };
 
-- 
2.6.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v7 0/5] usb: usbtmc: Add support for missing functions in  USBTMC-USB488 spec Dave Penkler <dpenkler@gmail.com> - 2016-01-27 19:00 +0100
  [PATCH v7 1/5] Implement an ioctl to support the USMTMC-USB488  READ_STATUS_BYTE operation. Dave Penkler <dpenkler@gmail.com> - 2016-01-27 19:10 +0100
  [PATCH v7 2/5] Add support for USBTMC USB488 SRQ notification with  fasync Dave Penkler <dpenkler@gmail.com> - 2016-01-27 19:20 +0100
  [PATCH v7 3/5] Add support for receiving USBTMC USB488 SRQ  notifications via poll/select Dave Penkler <dpenkler@gmail.com> - 2016-01-27 19:20 +0100
  [PATCH v7 4/5] Add ioctl to retrieve USBTMC-USB488 capabilities Dave Penkler <dpenkler@gmail.com> - 2016-01-27 19:30 +0100
  [PATCH v7 5/5] Add ioctls to enable and disable local controls on an  instrument Dave Penkler <dpenkler@gmail.com> - 2016-01-27 19:30 +0100

csiph-web