From: Dave Penkler <dpenkler@gmail.com>
To: gregkh@linuxfoundation.org
Cc: peter.chen@freescale.com, teuniz@gmail.com,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
dpenkler@gmail.org
Subject: [PATCH v3 3/5] Add support for receiving USBTMC USB488 SRQ notifications via poll/select
Date: Wed, 11 Nov 2015 12:16:47 +0100 [thread overview]
Message-ID: <20151111111647.GC1875@slacky> (raw)
In-Reply-To: <20151111110827.GA1785@slacky>
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 2239cd0..bb9a6ab 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>
@@ -1193,6 +1194,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 = 0;
+
+ 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,
@@ -1201,6 +1223,7 @@ static const struct file_operations fops = {
.release = usbtmc_release,
.unlocked_ioctl = usbtmc_ioctl,
.fasync = usbtmc_fasync,
+ .poll = usbtmc_poll,
.llseek = default_llseek,
};
--
2.5.1
next prev parent reply other threads:[~2015-11-11 11:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-11 11:08 [PATCH v3 0/5] usb: usbtmc: Add support for missing functions in USBTMC-USB488 spec Dave Penkler
2015-11-11 11:16 ` [PATCH v3 1/5] Implement an ioctl to support the USMTMC-USB488 READ_STATUS_BYTE operation Dave Penkler
2015-11-11 19:03 ` Andy Shevchenko
2015-11-11 19:48 ` Sergei Shtylyov
2015-11-11 19:54 ` Andy Shevchenko
2015-11-11 21:08 ` Greg Kroah-Hartman
[not found] ` <CAL=kjP3sdPu4FZcznoGMo5a_S2fi376UdfykcMw65+w2g+QQqA@mail.gmail.com>
2015-11-12 9:41 ` Andy Shevchenko
2015-11-11 11:16 ` [PATCH v3 2/5] Add support for USBTMC USB488 SRQ notification with fasync Dave Penkler
2015-11-11 11:16 ` Dave Penkler [this message]
2015-11-11 19:04 ` [PATCH v3 3/5] Add support for receiving USBTMC USB488 SRQ notifications via poll/select Andy Shevchenko
2015-11-11 11:20 ` [PATCH v3 4/5] Add ioctl to retrieve USBTMC-USB488 capabilities Dave Penkler
2015-11-11 19:34 ` Andy Shevchenko
2015-11-11 11:21 ` [PATCH v3 5/5] Add ioctls to enable and disable local controls on an instrument Dave Penkler
2015-11-11 19:36 ` Andy Shevchenko
2015-11-13 8:59 ` Dave Penkler
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=20151111111647.GC1875@slacky \
--to=dpenkler@gmail.com \
--cc=dpenkler@gmail.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=peter.chen@freescale.com \
--cc=teuniz@gmail.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.