Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1267411
| From | Andy Shevchenko <andy.shevchenko@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v3 5/5] Add ioctls to enable and disable local controls on an instrument |
| Date | 2015-11-11 20:40 +0100 |
| Message-ID | <qtJpp-71V-29@gated-at.bofh.it> (permalink) |
| References | <qtBrQ-20m-7@gated-at.bofh.it> <qtBLb-27c-11@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Wed, Nov 11, 2015 at 1:21 PM, Dave Penkler <dpenkler@gmail.com> wrote:
> These ioctls provide support for the USBTMC-USB488 control requests
> for REN_CONTROL, GO_TO_LOCAL and LOCAL_LOCKOUT
>
> Signed-off-by: Dave Penkler <dpenkler@gmail.com>
> ---
> drivers/usb/class/usbtmc.c | 76 ++++++++++++++++++++++++++++++++++++++++++++
> include/uapi/linux/usb/tmc.h | 9 +++++-
> 2 files changed, 84 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
> index deca4b5..646bfff 100644
> --- a/drivers/usb/class/usbtmc.c
> +++ b/drivers/usb/class/usbtmc.c
> @@ -482,6 +482,68 @@ static int usbtmc488_ioctl_read_stb(struct usbtmc_device_data *data,
> return rv;
> }
>
> +static int usbtmc488_ioctl_simple(struct usbtmc_device_data *data,
> + unsigned long arg,
> + unsigned int cmd)
> +{
> + u8 *buffer;
> + struct device *dev;
> + int rv;
> + unsigned int val;
> + u16 wValue;
> +
> + dev = &data->intf->dev;
> +
> + if (0 == (data->usb488_caps & USBTMC488_CAPABILITY_SIMPLE))
Other way around.
> + return -EINVAL;
> +
> + buffer = kmalloc(8, GFP_KERNEL);
> + if (!buffer)
> + return -ENOMEM;
> +
Redundant empty line.
> +
> + if (cmd == USBTMC488_REQUEST_REN_CONTROL) {
> + rv = copy_from_user(&val, (void __user *)arg, sizeof(val));
> + if (rv) {
> + rv = -EFAULT;
> + goto exit;
> + }
> + wValue = (val) ? 1 : 0;
!!val;
> + } else {
> + wValue = 0;
> + }
> +
> + rv = usb_control_msg(data->usb_dev,
> + usb_rcvctrlpipe(data->usb_dev, 0),
> + cmd,
> + USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
> + wValue,
> + data->ifnum,
> + buffer, 0x01, USBTMC_TIMEOUT);
> +
> + if (rv < 0) {
> + dev_err(dev, "simple usb_control_msg failed %d\n", rv);
> + goto exit;
> + } else if (rv != 1) {
> + dev_warn(dev, "simple usb_control_msg returned %d\n", rv);
> + rv = -EIO;
> + goto exit;
> + }
> +
> + if (buffer[0] != USBTMC_STATUS_SUCCESS) {
> + dev_err(dev, "simple control status returned %x\n",
> + buffer[0]);
> + rv = -EIO;
> + goto exit;
> + } else {
> + rv = 0;
> + }
> +
> + exit:
> + kfree(buffer);
> + return rv;
> +}
> +
> /*
> * Sends a REQUEST_DEV_DEP_MSG_IN message on the Bulk-IN endpoint.
> * @transfer_size: number of bytes to request from the device.
> @@ -1192,6 +1254,20 @@ static long usbtmc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> retval = usbtmc488_ioctl_read_stb(data, arg);
> break;
>
> + case USBTMC488_IOCTL_REN_CONTROL:
> + retval = usbtmc488_ioctl_simple(data, arg,
> + USBTMC488_REQUEST_REN_CONTROL);
> + break;
> +
> + case USBTMC488_IOCTL_GOTO_LOCAL:
> + retval = usbtmc488_ioctl_simple(data, arg,
> + USBTMC488_REQUEST_GOTO_LOCAL);
> + break;
> +
> + case USBTMC488_IOCTL_LOCAL_LOCKOUT:
> + retval = usbtmc488_ioctl_simple(data, arg,
> + USBTMC488_REQUEST_LOCAL_LOCKOUT);
> + break;
> }
>
> skip_io_on_zombie:
> diff --git a/include/uapi/linux/usb/tmc.h b/include/uapi/linux/usb/tmc.h
> index 2606664..fe9663f 100644
> --- a/include/uapi/linux/usb/tmc.h
> +++ b/include/uapi/linux/usb/tmc.h
> @@ -1,3 +1,4 @@
> +
> /*
> * Copyright (C) 2007 Stefan Kopp, Gechingen, Germany
> * Copyright (C) 2008 Novell, Inc.
> @@ -32,7 +33,10 @@
> #define USBTMC_REQUEST_CHECK_CLEAR_STATUS 6
> #define USBTMC_REQUEST_GET_CAPABILITIES 7
> #define USBTMC_REQUEST_INDICATOR_PULSE 64
> -#define USBTMC488_REQUEST_READ_STATUS_BYTE 128
> +#define USBTMC488_REQUEST_READ_STATUS_BYTE 128
> +#define USBTMC488_REQUEST_REN_CONTROL 160
> +#define USBTMC488_REQUEST_GOTO_LOCAL 161
> +#define USBTMC488_REQUEST_LOCAL_LOCKOUT 162
>
> /* Request values for USBTMC driver's ioctl entry point */
> #define USBTMC_IOC_NR 91
> @@ -44,6 +48,9 @@
> #define USBTMC_IOCTL_CLEAR_IN_HALT _IO(USBTMC_IOC_NR, 7)
> #define USBTMC488_IOCTL_GET_CAPS _IO(USBTMC_IOC_NR, 17)
> #define USBTMC488_IOCTL_READ_STB _IOR(USBTMC_IOC_NR, 18, unsigned char)
> +#define USBTMC488_IOCTL_REN_CONTROL _IOW(USBTMC_IOC_NR, 19, unsigned char)
> +#define USBTMC488_IOCTL_GOTO_LOCAL _IO(USBTMC_IOC_NR, 20)
> +#define USBTMC488_IOCTL_LOCAL_LOCKOUT _IO(USBTMC_IOC_NR, 21)
>
> /* Driver encoded usb488 capabilities */
> #define USBTMC488_CAPABILITY_TRIGGER 1
> --
> 2.5.1
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
With Best Regards,
Andy Shevchenko
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 0/5] usb: usbtmc: Add support for missing functions in USBTMC-USB488 spec Dave Penkler <dpenkler@gmail.com> - 2015-11-11 12:10 +0100
[PATCH v3 3/5] Add support for receiving USBTMC USB488 SRQ notifications via poll/select Dave Penkler <dpenkler@gmail.com> - 2015-11-11 12:20 +0100
Re: [PATCH v3 3/5] Add support for receiving USBTMC USB488 SRQ notifications via poll/select Andy Shevchenko <andy.shevchenko@gmail.com> - 2015-11-11 20:10 +0100
[PATCH v3 1/5] Implement an ioctl to support the USMTMC-USB488 READ_STATUS_BYTE operation. Dave Penkler <dpenkler@gmail.com> - 2015-11-11 12:20 +0100
Re: [PATCH v3 1/5] Implement an ioctl to support the USMTMC-USB488 READ_STATUS_BYTE operation. Andy Shevchenko <andy.shevchenko@gmail.com> - 2015-11-11 20:10 +0100
Re: [PATCH v3 1/5] Implement an ioctl to support the USMTMC-USB488 READ_STATUS_BYTE operation. Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-11-11 20:50 +0100
Re: [PATCH v3 1/5] Implement an ioctl to support the USMTMC-USB488 READ_STATUS_BYTE operation. Andy Shevchenko <andy.shevchenko@gmail.com> - 2015-11-11 21:00 +0100
Re: [PATCH v3 1/5] Implement an ioctl to support the USMTMC-USB488 READ_STATUS_BYTE operation. Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-11-11 22:10 +0100
Re: [PATCH v3 1/5] Implement an ioctl to support the USMTMC-USB488 READ_STATUS_BYTE operation. Andy Shevchenko <andy.shevchenko@gmail.com> - 2015-11-12 10:50 +0100
[PATCH v3 2/5] Add support for USBTMC USB488 SRQ notification with fasync Dave Penkler <dpenkler@gmail.com> - 2015-11-11 12:20 +0100
[PATCH v3 4/5] Add ioctl to retrieve USBTMC-USB488 capabilities Dave Penkler <dpenkler@gmail.com> - 2015-11-11 12:30 +0100
Re: [PATCH v3 4/5] Add ioctl to retrieve USBTMC-USB488 capabilities Andy Shevchenko <andy.shevchenko@gmail.com> - 2015-11-11 20:40 +0100
[PATCH v3 5/5] Add ioctls to enable and disable local controls on an instrument Dave Penkler <dpenkler@gmail.com> - 2015-11-11 12:30 +0100
Re: [PATCH v3 5/5] Add ioctls to enable and disable local controls on an instrument Andy Shevchenko <andy.shevchenko@gmail.com> - 2015-11-11 20:40 +0100
Re: [PATCH v3 5/5] Add ioctls to enable and disable local controls on an instrument Dave Penkler <dpenkler@gmail.com> - 2015-11-13 10:10 +0100
csiph-web