You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
USB: vstusb.c: removal of driver for Vernier Software & Technology, Inc., devices and spectrometers
This patch removes the vstusb driver and support from the Linux tree. This driver provided support for Vernier Software & Technology devices and spectrometers (Ocean Optics). This driver is being replaced by a user space - libusb - implementation. Signed-off-by: Jim Collar <jim.collar@eqware.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
cd78069492
commit
6d61ae9112
@@ -139,7 +139,6 @@ Code Seq#(hex) Include File Comments
|
|||||||
'K' all linux/kd.h
|
'K' all linux/kd.h
|
||||||
'L' 00-1F linux/loop.h conflict!
|
'L' 00-1F linux/loop.h conflict!
|
||||||
'L' 10-1F drivers/scsi/mpt2sas/mpt2sas_ctl.h conflict!
|
'L' 10-1F drivers/scsi/mpt2sas/mpt2sas_ctl.h conflict!
|
||||||
'L' 20-2F linux/usb/vstusb.h
|
|
||||||
'L' E0-FF linux/ppdd.h encrypted disk device driver
|
'L' E0-FF linux/ppdd.h encrypted disk device driver
|
||||||
<http://linux01.gwdg.de/~alatham/ppdd.html>
|
<http://linux01.gwdg.de/~alatham/ppdd.html>
|
||||||
'M' all linux/soundcard.h conflict!
|
'M' all linux/soundcard.h conflict!
|
||||||
|
|||||||
@@ -231,17 +231,3 @@ config USB_ISIGHTFW
|
|||||||
driver beforehand. Tools for doing so are available at
|
driver beforehand. Tools for doing so are available at
|
||||||
http://bersace03.free.fr
|
http://bersace03.free.fr
|
||||||
|
|
||||||
config USB_VST
|
|
||||||
tristate "USB VST driver"
|
|
||||||
depends on USB
|
|
||||||
help
|
|
||||||
This driver is intended for Vernier Software Technologies
|
|
||||||
bulk usb devices such as their Ocean-Optics spectrometers or
|
|
||||||
Labquest.
|
|
||||||
It is a bulk channel driver with configurable read and write
|
|
||||||
timeouts.
|
|
||||||
|
|
||||||
To compile this driver as a module, choose M here: the
|
|
||||||
module will be called vstusb.
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ obj-$(CONFIG_USB_TEST) += usbtest.o
|
|||||||
obj-$(CONFIG_USB_TRANCEVIBRATOR) += trancevibrator.o
|
obj-$(CONFIG_USB_TRANCEVIBRATOR) += trancevibrator.o
|
||||||
obj-$(CONFIG_USB_USS720) += uss720.o
|
obj-$(CONFIG_USB_USS720) += uss720.o
|
||||||
obj-$(CONFIG_USB_SEVSEG) += usbsevseg.o
|
obj-$(CONFIG_USB_SEVSEG) += usbsevseg.o
|
||||||
obj-$(CONFIG_USB_VST) += vstusb.o
|
|
||||||
|
|
||||||
obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/
|
obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -5,4 +5,3 @@ header-y += gadgetfs.h
|
|||||||
header-y += midi.h
|
header-y += midi.h
|
||||||
header-y += g_printer.h
|
header-y += g_printer.h
|
||||||
header-y += tmc.h
|
header-y += tmc.h
|
||||||
header-y += vstusb.h
|
|
||||||
|
|||||||
@@ -1,71 +0,0 @@
|
|||||||
/*****************************************************************************
|
|
||||||
* File: drivers/usb/misc/vstusb.h
|
|
||||||
*
|
|
||||||
* Purpose: Support for the bulk USB Vernier Spectrophotometers
|
|
||||||
*
|
|
||||||
* Author: EQware Engineering, Inc.
|
|
||||||
* Oregon City, OR, USA 97045
|
|
||||||
*
|
|
||||||
* Copyright: 2007, 2008
|
|
||||||
* Vernier Software & Technology
|
|
||||||
* Beaverton, OR, USA 97005
|
|
||||||
*
|
|
||||||
* Web: www.vernier.com
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
|
||||||
* published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
*****************************************************************************/
|
|
||||||
/*****************************************************************************
|
|
||||||
*
|
|
||||||
* The vstusb module is a standard usb 'client' driver running on top of the
|
|
||||||
* standard usb host controller stack.
|
|
||||||
*
|
|
||||||
* In general, vstusb supports standard bulk usb pipes. It supports multiple
|
|
||||||
* devices and multiple pipes per device.
|
|
||||||
*
|
|
||||||
* The vstusb driver supports two interfaces:
|
|
||||||
* 1 - ioctl SEND_PIPE/RECV_PIPE - a general bulk write/read msg
|
|
||||||
* interface to any pipe with timeout support;
|
|
||||||
* 2 - standard read/write with ioctl config - offers standard read/write
|
|
||||||
* interface with ioctl configured pipes and timeouts.
|
|
||||||
*
|
|
||||||
* Both interfaces can be signal from other process and will abort its i/o
|
|
||||||
* operation.
|
|
||||||
*
|
|
||||||
* A timeout of 0 means NO timeout. The user can still terminate the read via
|
|
||||||
* signal.
|
|
||||||
*
|
|
||||||
* If using multiple threads with this driver, the user should ensure that
|
|
||||||
* any reads, writes, or ioctls are complete before closing the device.
|
|
||||||
* Changing read/write timeouts or pipes takes effect on next read/write.
|
|
||||||
*
|
|
||||||
*****************************************************************************/
|
|
||||||
|
|
||||||
struct vstusb_args {
|
|
||||||
union {
|
|
||||||
/* this struct is used for IOCTL_VSTUSB_SEND_PIPE, *
|
|
||||||
* IOCTL_VSTUSB_RECV_PIPE, and read()/write() fops */
|
|
||||||
struct {
|
|
||||||
void __user *buffer;
|
|
||||||
size_t count;
|
|
||||||
unsigned int timeout_ms;
|
|
||||||
int pipe;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* this one is used for IOCTL_VSTUSB_CONFIG_RW */
|
|
||||||
struct {
|
|
||||||
int rd_pipe;
|
|
||||||
int rd_timeout_ms;
|
|
||||||
int wr_pipe;
|
|
||||||
int wr_timeout_ms;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
#define VST_IOC_MAGIC 'L'
|
|
||||||
#define VST_IOC_FIRST 0x20
|
|
||||||
#define IOCTL_VSTUSB_SEND_PIPE _IO(VST_IOC_MAGIC, VST_IOC_FIRST)
|
|
||||||
#define IOCTL_VSTUSB_RECV_PIPE _IO(VST_IOC_MAGIC, VST_IOC_FIRST + 1)
|
|
||||||
#define IOCTL_VSTUSB_CONFIG_RW _IO(VST_IOC_MAGIC, VST_IOC_FIRST + 2)
|
|
||||||
Reference in New Issue
Block a user