6f0e1ffd07
src/sys/dev/usb2/core/usbdevs src/sys/dev/usb2/include/urio2_ioctl.h src/sys/dev/usb2/storage/ustorage2_fs.h These files are not used any more. src/usr.sbin/Makefile src/etc/mtree/BSD.include.dist src/include/Makefile src/lib/Makefile src/share/man/man7/hier.7 src/share/mk/bsd.libnames.mk src/etc/mtree/BSD.include.dist Make "usbconfig" and "libusb20" a part of the default build. src/sys/dev/usb/rio500_usb.h src/sys/dev/usb2/storage/urio2.c Use common include file. src/sys/dev/usb2/bluetooth/ng_ubt2.c Make USB bluetooth depend on "ng_hci" module. src/sys/dev/usb2/controller/ehci2.c src/sys/dev/usb2/controller/ehci2.h Patches for Marvell EHCI. src/sys/dev/usb2/core/usb2_busdma.c Bugfix for 64-bit platforms. Need to unload the previously loaded DMA map and some cleanup regarding some corner cases. src/sys/dev/usb2/core/usb2_core.h src/sys/dev/usb2/core/usb2_dev.c src/sys/dev/usb2/core/usb2_dev.h Bugfix for libusb filesystem interface. New feature: Add support for filtering device data at the expense of the userland process. Add some more comments. Some minor code styling. Remove unused function, usb2_fifo_get_data_next(). Fix an issue about "fifo_index" being used instead of "ep_index". src/sys/dev/usb2/core/usb2_device.c src/sys/dev/usb2/core/usb2_generic.c Bugfix for Linux USB compat layer. Do not free non-generic FIFOs when doing an alternate setting. Cleanup USB IOCTL and USB reference handling. Fix a corner case where USB-FS was left initialised after setting a new configuration or alternate setting. src/sys/dev/usb2/core/usb2_hub.c Improvement: Check all USB HUB ports by default at least one time. src/sys/dev/usb2/core/usb2_request.c Bugfix: Make sure destination ASCII string is properly zero terminated in all cases. Improvement: Skip invalid characters instead of replacing with a dot. src/sys/dev/usb2/core/usb2_util.c src/sys/dev/usb2/image/uscanner2.c Spelling. src/sys/dev/usb2/include/Makefile Share "usbdevs" with the old USB stack. src/sys/dev/usb2/include/usb2_devid.h src/sys/dev/usb2/include/usb2_devtable.h Regenerate files. Alfred: Please fix the RCS tag at the top. src/sys/dev/usb2/include/usb2_ioctl.h Fix compilation of "kdump". src/sys/dev/usb2/serial/ubsa2.c src/sys/dev/usb2/serial/ugensa2.c Remove device ID's which will end up in a new 3G driver. src/sys/dev/usb2/sound/uaudio2.c Correct a debug printout. src/sys/dev/usb2/storage/umass2.c Sync with old USB stack. src/lib/libusb20/libusb20.3 Add more documentation. src/lib/libusb20/libusb20.c Various bugfixes and improvements. src/usr.sbin/usbconfig/dump.c src/usr.sbin/usbconfig/usbconfig.c New commands for dumping strings and doing custom USB requests from the command line. Remove keyword requirements from generated files: "head/sys/dev/usb2/include/usb2_devid.h" "head/sys/dev/usb2/include/usb2_devtable.h"
492 lines
12 KiB
C
492 lines
12 KiB
C
/*-
|
|
* Copyright (c) 2000 Iwasa Kazmi
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions, and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
|
|
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* This code is based on ugen.c and ulpt.c developed by Lennart Augustsson.
|
|
* This code includes software developed by the NetBSD Foundation, Inc. and
|
|
* its contributors.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
|
/*
|
|
* 2000/3/24 added NetBSD/OpenBSD support (from Alex Nemirovsky)
|
|
* 2000/3/07 use two bulk-pipe handles for read and write (Dirk)
|
|
* 2000/3/06 change major number(143), and copyright header
|
|
* some fix for 4.0 (Dirk)
|
|
* 2000/3/05 codes for FreeBSD 4.x - CURRENT (Thanks to Dirk-Willem van Gulik)
|
|
* 2000/3/01 remove retry code from urioioctl()
|
|
* change method of bulk transfer (no interrupt)
|
|
* 2000/2/28 small fixes for new rio_usb.h
|
|
* 2000/2/24 first version.
|
|
*/
|
|
|
|
#include <dev/usb2/include/usb2_devid.h>
|
|
#include <dev/usb2/include/usb2_standard.h>
|
|
#include <dev/usb2/include/usb2_mfunc.h>
|
|
#include <dev/usb2/include/usb2_error.h>
|
|
#include <dev/usb2/include/usb2_ioctl.h>
|
|
#include <dev/usb/rio500_usb.h>
|
|
|
|
#define USB_DEBUG_VAR urio_debug
|
|
|
|
#include <dev/usb2/core/usb2_core.h>
|
|
#include <dev/usb2/core/usb2_debug.h>
|
|
#include <dev/usb2/core/usb2_process.h>
|
|
#include <dev/usb2/core/usb2_config_td.h>
|
|
#include <dev/usb2/core/usb2_request.h>
|
|
#include <dev/usb2/core/usb2_lookup.h>
|
|
#include <dev/usb2/core/usb2_util.h>
|
|
#include <dev/usb2/core/usb2_busdma.h>
|
|
#include <dev/usb2/core/usb2_mbuf.h>
|
|
#include <dev/usb2/core/usb2_dev.h>
|
|
#include <dev/usb2/core/usb2_generic.h>
|
|
|
|
#if USB_DEBUG
|
|
static int urio_debug = 0;
|
|
|
|
SYSCTL_NODE(_hw_usb2, OID_AUTO, urio, CTLFLAG_RW, 0, "USB urio");
|
|
SYSCTL_INT(_hw_usb2_urio, OID_AUTO, debug, CTLFLAG_RW,
|
|
&urio_debug, 0, "urio debug level");
|
|
#endif
|
|
|
|
#define URIO_T_WR 0
|
|
#define URIO_T_RD 1
|
|
#define URIO_T_WR_CS 2
|
|
#define URIO_T_RD_CS 3
|
|
#define URIO_T_MAX 4
|
|
|
|
#define URIO_BSIZE (1<<12) /* bytes */
|
|
#define URIO_IFQ_MAXLEN 2 /* units */
|
|
|
|
struct urio_softc {
|
|
struct usb2_fifo_sc sc_fifo;
|
|
struct mtx sc_mtx;
|
|
|
|
struct usb2_device *sc_udev;
|
|
struct usb2_xfer *sc_xfer[URIO_T_MAX];
|
|
|
|
uint8_t sc_flags;
|
|
#define URIO_FLAG_READ_STALL 0x01 /* read transfer stalled */
|
|
#define URIO_FLAG_WRITE_STALL 0x02 /* write transfer stalled */
|
|
|
|
uint8_t sc_name[16];
|
|
};
|
|
|
|
/* prototypes */
|
|
|
|
static device_probe_t urio_probe;
|
|
static device_attach_t urio_attach;
|
|
static device_detach_t urio_detach;
|
|
|
|
static usb2_callback_t urio_write_callback;
|
|
static usb2_callback_t urio_write_clear_stall_callback;
|
|
static usb2_callback_t urio_read_callback;
|
|
static usb2_callback_t urio_read_clear_stall_callback;
|
|
|
|
static usb2_fifo_close_t urio_close;
|
|
static usb2_fifo_cmd_t urio_start_read;
|
|
static usb2_fifo_cmd_t urio_start_write;
|
|
static usb2_fifo_cmd_t urio_stop_read;
|
|
static usb2_fifo_cmd_t urio_stop_write;
|
|
static usb2_fifo_ioctl_t urio_ioctl;
|
|
static usb2_fifo_open_t urio_open;
|
|
|
|
static struct usb2_fifo_methods urio_fifo_methods = {
|
|
.f_close = &urio_close,
|
|
.f_ioctl = &urio_ioctl,
|
|
.f_open = &urio_open,
|
|
.f_start_read = &urio_start_read,
|
|
.f_start_write = &urio_start_write,
|
|
.f_stop_read = &urio_stop_read,
|
|
.f_stop_write = &urio_stop_write,
|
|
.basename[0] = "urio",
|
|
};
|
|
|
|
static const struct usb2_config urio_config[URIO_T_MAX] = {
|
|
[URIO_T_WR] = {
|
|
.type = UE_BULK,
|
|
.endpoint = UE_ADDR_ANY,
|
|
.direction = UE_DIR_OUT,
|
|
.mh.bufsize = URIO_BSIZE,
|
|
.mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,.proxy_buffer = 1,},
|
|
.mh.callback = &urio_write_callback,
|
|
},
|
|
|
|
[URIO_T_RD] = {
|
|
.type = UE_BULK,
|
|
.endpoint = UE_ADDR_ANY,
|
|
.direction = UE_DIR_IN,
|
|
.mh.bufsize = URIO_BSIZE,
|
|
.mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,.proxy_buffer = 1,},
|
|
.mh.callback = &urio_read_callback,
|
|
},
|
|
|
|
[URIO_T_WR_CS] = {
|
|
.type = UE_CONTROL,
|
|
.endpoint = 0x00, /* Control pipe */
|
|
.direction = UE_DIR_ANY,
|
|
.mh.bufsize = sizeof(struct usb2_device_request),
|
|
.mh.flags = {},
|
|
.mh.callback = &urio_write_clear_stall_callback,
|
|
.mh.timeout = 1000, /* 1 second */
|
|
.mh.interval = 50, /* 50ms */
|
|
},
|
|
|
|
[URIO_T_RD_CS] = {
|
|
.type = UE_CONTROL,
|
|
.endpoint = 0x00, /* Control pipe */
|
|
.direction = UE_DIR_ANY,
|
|
.mh.bufsize = sizeof(struct usb2_device_request),
|
|
.mh.flags = {},
|
|
.mh.callback = &urio_read_clear_stall_callback,
|
|
.mh.timeout = 1000, /* 1 second */
|
|
.mh.interval = 50, /* 50ms */
|
|
},
|
|
};
|
|
|
|
static devclass_t urio_devclass;
|
|
|
|
static device_method_t urio_methods[] = {
|
|
/* Device interface */
|
|
DEVMETHOD(device_probe, urio_probe),
|
|
DEVMETHOD(device_attach, urio_attach),
|
|
DEVMETHOD(device_detach, urio_detach),
|
|
{0, 0}
|
|
};
|
|
|
|
static driver_t urio_driver = {
|
|
.name = "urio",
|
|
.methods = urio_methods,
|
|
.size = sizeof(struct urio_softc),
|
|
};
|
|
|
|
DRIVER_MODULE(urio, ushub, urio_driver, urio_devclass, NULL, 0);
|
|
MODULE_DEPEND(urio, usb2_storage, 1, 1, 1);
|
|
MODULE_DEPEND(urio, usb2_core, 1, 1, 1);
|
|
|
|
static int
|
|
urio_probe(device_t dev)
|
|
{
|
|
struct usb2_attach_arg *uaa = device_get_ivars(dev);
|
|
|
|
if (uaa->usb2_mode != USB_MODE_HOST) {
|
|
return (ENXIO);
|
|
}
|
|
if ((((uaa->info.idVendor == USB_VENDOR_DIAMOND) &&
|
|
(uaa->info.idProduct == USB_PRODUCT_DIAMOND_RIO500USB)) ||
|
|
((uaa->info.idVendor == USB_VENDOR_DIAMOND2) &&
|
|
((uaa->info.idProduct == USB_PRODUCT_DIAMOND2_RIO600USB) ||
|
|
(uaa->info.idProduct == USB_PRODUCT_DIAMOND2_RIO800USB)))))
|
|
return (0);
|
|
else
|
|
return (ENXIO);
|
|
}
|
|
|
|
static int
|
|
urio_attach(device_t dev)
|
|
{
|
|
struct usb2_attach_arg *uaa = device_get_ivars(dev);
|
|
struct urio_softc *sc = device_get_softc(dev);
|
|
int error;
|
|
|
|
if (sc == NULL) {
|
|
return (ENOMEM);
|
|
}
|
|
device_set_usb2_desc(dev);
|
|
|
|
sc->sc_udev = uaa->device;
|
|
|
|
mtx_init(&sc->sc_mtx, "urio lock", NULL, MTX_DEF | MTX_RECURSE);
|
|
|
|
snprintf(sc->sc_name, sizeof(sc->sc_name),
|
|
"%s", device_get_nameunit(dev));
|
|
|
|
error = usb2_transfer_setup(uaa->device,
|
|
&uaa->info.bIfaceIndex, sc->sc_xfer,
|
|
urio_config, URIO_T_MAX, sc, &sc->sc_mtx);
|
|
|
|
if (error) {
|
|
DPRINTF("error=%s\n", usb2_errstr(error));
|
|
goto detach;
|
|
}
|
|
/* set interface permissions */
|
|
usb2_set_iface_perm(uaa->device, uaa->info.bIfaceIndex,
|
|
UID_ROOT, GID_OPERATOR, 0644);
|
|
|
|
error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx,
|
|
&urio_fifo_methods, &sc->sc_fifo,
|
|
device_get_unit(dev), 0 - 1, uaa->info.bIfaceIndex);
|
|
if (error) {
|
|
goto detach;
|
|
}
|
|
return (0); /* success */
|
|
|
|
detach:
|
|
urio_detach(dev);
|
|
return (ENOMEM); /* failure */
|
|
}
|
|
|
|
static void
|
|
urio_write_callback(struct usb2_xfer *xfer)
|
|
{
|
|
struct urio_softc *sc = xfer->priv_sc;
|
|
struct usb2_fifo *f = sc->sc_fifo.fp[USB_FIFO_TX];
|
|
uint32_t actlen;
|
|
|
|
switch (USB_GET_STATE(xfer)) {
|
|
case USB_ST_TRANSFERRED:
|
|
case USB_ST_SETUP:
|
|
if (sc->sc_flags & URIO_FLAG_WRITE_STALL) {
|
|
usb2_transfer_start(sc->sc_xfer[URIO_T_WR_CS]);
|
|
return;
|
|
}
|
|
if (usb2_fifo_get_data(f, xfer->frbuffers, 0,
|
|
xfer->max_data_length, &actlen, 0)) {
|
|
|
|
xfer->frlengths[0] = actlen;
|
|
usb2_start_hardware(xfer);
|
|
}
|
|
return;
|
|
|
|
default: /* Error */
|
|
if (xfer->error != USB_ERR_CANCELLED) {
|
|
/* try to clear stall first */
|
|
sc->sc_flags |= URIO_FLAG_WRITE_STALL;
|
|
usb2_transfer_start(sc->sc_xfer[URIO_T_WR_CS]);
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
|
|
static void
|
|
urio_write_clear_stall_callback(struct usb2_xfer *xfer)
|
|
{
|
|
struct urio_softc *sc = xfer->priv_sc;
|
|
struct usb2_xfer *xfer_other = sc->sc_xfer[URIO_T_WR];
|
|
|
|
if (usb2_clear_stall_callback(xfer, xfer_other)) {
|
|
DPRINTF("stall cleared\n");
|
|
sc->sc_flags &= ~URIO_FLAG_WRITE_STALL;
|
|
usb2_transfer_start(xfer_other);
|
|
}
|
|
return;
|
|
}
|
|
|
|
static void
|
|
urio_read_callback(struct usb2_xfer *xfer)
|
|
{
|
|
struct urio_softc *sc = xfer->priv_sc;
|
|
struct usb2_fifo *f = sc->sc_fifo.fp[USB_FIFO_RX];
|
|
|
|
switch (USB_GET_STATE(xfer)) {
|
|
case USB_ST_TRANSFERRED:
|
|
usb2_fifo_put_data(f, xfer->frbuffers, 0,
|
|
xfer->actlen, 1);
|
|
|
|
case USB_ST_SETUP:
|
|
if (sc->sc_flags & URIO_FLAG_READ_STALL) {
|
|
usb2_transfer_start(sc->sc_xfer[URIO_T_RD_CS]);
|
|
return;
|
|
}
|
|
if (usb2_fifo_put_bytes_max(f) != 0) {
|
|
xfer->frlengths[0] = xfer->max_data_length;
|
|
usb2_start_hardware(xfer);
|
|
}
|
|
return;
|
|
|
|
default: /* Error */
|
|
if (xfer->error != USB_ERR_CANCELLED) {
|
|
/* try to clear stall first */
|
|
sc->sc_flags |= URIO_FLAG_READ_STALL;
|
|
usb2_transfer_start(sc->sc_xfer[URIO_T_RD_CS]);
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
|
|
static void
|
|
urio_read_clear_stall_callback(struct usb2_xfer *xfer)
|
|
{
|
|
struct urio_softc *sc = xfer->priv_sc;
|
|
struct usb2_xfer *xfer_other = sc->sc_xfer[URIO_T_RD];
|
|
|
|
if (usb2_clear_stall_callback(xfer, xfer_other)) {
|
|
DPRINTF("stall cleared\n");
|
|
sc->sc_flags &= ~URIO_FLAG_READ_STALL;
|
|
usb2_transfer_start(xfer_other);
|
|
}
|
|
return;
|
|
}
|
|
|
|
static void
|
|
urio_start_read(struct usb2_fifo *fifo)
|
|
{
|
|
struct urio_softc *sc = fifo->priv_sc0;
|
|
|
|
usb2_transfer_start(sc->sc_xfer[URIO_T_RD]);
|
|
return;
|
|
}
|
|
|
|
static void
|
|
urio_stop_read(struct usb2_fifo *fifo)
|
|
{
|
|
struct urio_softc *sc = fifo->priv_sc0;
|
|
|
|
usb2_transfer_stop(sc->sc_xfer[URIO_T_RD_CS]);
|
|
usb2_transfer_stop(sc->sc_xfer[URIO_T_RD]);
|
|
return;
|
|
}
|
|
|
|
static void
|
|
urio_start_write(struct usb2_fifo *fifo)
|
|
{
|
|
struct urio_softc *sc = fifo->priv_sc0;
|
|
|
|
usb2_transfer_start(sc->sc_xfer[URIO_T_WR]);
|
|
return;
|
|
}
|
|
|
|
static void
|
|
urio_stop_write(struct usb2_fifo *fifo)
|
|
{
|
|
struct urio_softc *sc = fifo->priv_sc0;
|
|
|
|
usb2_transfer_stop(sc->sc_xfer[URIO_T_WR_CS]);
|
|
usb2_transfer_stop(sc->sc_xfer[URIO_T_WR]);
|
|
return;
|
|
}
|
|
|
|
static int
|
|
urio_open(struct usb2_fifo *fifo, int fflags, struct thread *td)
|
|
{
|
|
struct urio_softc *sc = fifo->priv_sc0;
|
|
|
|
if ((fflags & (FWRITE | FREAD)) != (FWRITE | FREAD)) {
|
|
return (EACCES);
|
|
}
|
|
if (fflags & FREAD) {
|
|
/* clear stall first */
|
|
mtx_lock(&sc->sc_mtx);
|
|
sc->sc_flags |= URIO_FLAG_READ_STALL;
|
|
mtx_unlock(&sc->sc_mtx);
|
|
|
|
if (usb2_fifo_alloc_buffer(fifo,
|
|
sc->sc_xfer[URIO_T_RD]->max_data_length,
|
|
URIO_IFQ_MAXLEN)) {
|
|
return (ENOMEM);
|
|
}
|
|
}
|
|
if (fflags & FWRITE) {
|
|
/* clear stall first */
|
|
sc->sc_flags |= URIO_FLAG_WRITE_STALL;
|
|
|
|
if (usb2_fifo_alloc_buffer(fifo,
|
|
sc->sc_xfer[URIO_T_WR]->max_data_length,
|
|
URIO_IFQ_MAXLEN)) {
|
|
return (ENOMEM);
|
|
}
|
|
}
|
|
return (0); /* success */
|
|
}
|
|
|
|
static void
|
|
urio_close(struct usb2_fifo *fifo, int fflags, struct thread *td)
|
|
{
|
|
if (fflags & (FREAD | FWRITE)) {
|
|
usb2_fifo_free_buffer(fifo);
|
|
}
|
|
return;
|
|
}
|
|
|
|
static int
|
|
urio_ioctl(struct usb2_fifo *fifo, u_long cmd, void *addr,
|
|
int fflags, struct thread *td)
|
|
{
|
|
struct usb2_ctl_request ur;
|
|
struct RioCommand *rio_cmd;
|
|
int error;
|
|
|
|
switch (cmd) {
|
|
case RIO_RECV_COMMAND:
|
|
if (!(fflags & FWRITE)) {
|
|
error = EPERM;
|
|
goto done;
|
|
}
|
|
bzero(&ur, sizeof(ur));
|
|
rio_cmd = addr;
|
|
ur.ucr_request.bmRequestType =
|
|
rio_cmd->requesttype | UT_READ_VENDOR_DEVICE;
|
|
break;
|
|
|
|
case RIO_SEND_COMMAND:
|
|
if (!(fflags & FWRITE)) {
|
|
error = EPERM;
|
|
goto done;
|
|
}
|
|
bzero(&ur, sizeof(ur));
|
|
rio_cmd = addr;
|
|
ur.ucr_request.bmRequestType =
|
|
rio_cmd->requesttype | UT_WRITE_VENDOR_DEVICE;
|
|
break;
|
|
|
|
default:
|
|
error = EINVAL;
|
|
goto done;
|
|
}
|
|
|
|
DPRINTFN(2, "Sending command\n");
|
|
|
|
/* Send rio control message */
|
|
ur.ucr_request.bRequest = rio_cmd->request;
|
|
USETW(ur.ucr_request.wValue, rio_cmd->value);
|
|
USETW(ur.ucr_request.wIndex, rio_cmd->index);
|
|
USETW(ur.ucr_request.wLength, rio_cmd->length);
|
|
ur.ucr_data = rio_cmd->buffer;
|
|
|
|
/* reuse generic USB code */
|
|
error = ugen_do_request(fifo, &ur);
|
|
|
|
done:
|
|
return (error);
|
|
}
|
|
|
|
static int
|
|
urio_detach(device_t dev)
|
|
{
|
|
struct urio_softc *sc = device_get_softc(dev);
|
|
|
|
DPRINTF("\n");
|
|
|
|
usb2_fifo_detach(&sc->sc_fifo);
|
|
|
|
usb2_transfer_unsetup(sc->sc_xfer, URIO_T_MAX);
|
|
|
|
mtx_destroy(&sc->sc_mtx);
|
|
|
|
return (0);
|
|
}
|