Move usb to a graveyard location under sys/legacy/dev, it is intended that the

new USB2 stack will fully replace this for 8.0.

Remove kernel modules, a subsequent commit will update conf/files. Unhook
usbdevs from the build.

1 files changed, 0 insertions, 882 deletions

diff --git a/sys/dev/usb/ubser.c b/sys/dev/usb/ubser.c
deleted file mode 100644
index 29994b9..0000000
--- a/sys/dev/usb/ubser.c
+++ /dev/null
@@ -1,882 +0,0 @@
-/*-
- * Copyright (c) 2004 Bernd Walter <ticso@freebsd.org>
- *
- * $URL: https://devel.bwct.de/svn/projects/ubser/ubser.c $
- * $Date: 2004-02-29 01:53:10 +0100 (Sun, 29 Feb 2004) $
- * $Author: ticso $
- * $Rev: 1127 $
- */
-
-/*-
- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
- * 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.
- */
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net).
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * BWCT serial adapter driver
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/malloc.h>
-#include <sys/bus.h>
-#include <sys/ioccom.h>
-#include <sys/fcntl.h>
-#include <sys/conf.h>
-#include <sys/serial.h>
-#include <sys/tty.h>
-#include <sys/clist.h>
-#include <sys/file.h>
-
-#include <sys/selinfo.h>
-
-#include <sys/sysctl.h>
-
-#include <dev/usb/usb.h>
-#include <dev/usb/usbhid.h>
-
-#include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
-#include "usbdevs.h"
-
-#include <dev/usb/ubser.h>
-
-#ifdef USB_DEBUG
-static int ubserdebug = 0;
-SYSCTL_NODE(_hw_usb, OID_AUTO, ubser, CTLFLAG_RW, 0, "USB ubser");
-SYSCTL_INT(_hw_usb_ubser, OID_AUTO, debug, CTLFLAG_RW,
-	   &ubserdebug, 0, "ubser debug level");
-#define DPRINTF(x)      do { \
-				if (ubserdebug) \
-					printf x; \
-			} while (0)
-
-#define DPRINTFN(n, x)  do { \
-				if (ubserdebug > (n)) \
-					printf x; \
-			} while (0)
-#else
-#define DPRINTF(x)
-#define DPRINTFN(n,x)
-#endif
-
-#define ISSET(t, f)	((t) & (f))
-#define SET(t, f)	(t) |= (f)
-#define CLR(t, f)	(t) &= ~((unsigned)(f))
-
-struct ubser_port {
-	int			 p_port;
-	struct ubser_softc	*p_sc;
-	usbd_xfer_handle	 p_oxfer;	/* write request */
-	u_char			*p_obuf;	/* write buffer */
-	struct tty		*p_tty;
-};
-
-struct ubser_softc {
-	device_t		sc_dev;
-	usbd_device_handle	sc_udev;
-	usbd_interface_handle	sc_iface;	/* data interface */
-	int			sc_ifaceno;
-
-	int			sc_refcnt;
-	u_char			sc_dying;
-	u_char			sc_opening;
-	int			sc_state;
-	uint8_t			sc_numser;
-
-	int			sc_bulkin_no;	/* bulk in endpoint address */
-	usbd_pipe_handle	sc_bulkin_pipe;	/* bulk in pipe */
-	usbd_xfer_handle	sc_ixfer;	/* read request */
-	u_char			*sc_ibuf;	/* read buffer */
-	u_int			sc_ibufsize;	/* read buffer size */
-	u_int			sc_ibufsizepad;	/* read buffer size padded */
-
-	int			sc_bulkout_no;	/* bulk out endpoint address */
-	usbd_pipe_handle	sc_bulkout_pipe;/* bulk out pipe */
-	u_int			sc_obufsize;	/* write buffer size */
-	u_int			sc_opkthdrlen;	/* header length of
-						   output packet */
-
-	struct ubser_port	*sc_port;
-};
-
-static int ubserparam(struct tty *, struct termios *);
-static void ubserstart(struct tty *);
-static void ubserstop(struct tty *, int);
-static usbd_status ubserstartread(struct ubser_softc *);
-static void ubserreadcb(usbd_xfer_handle, usbd_private_handle, usbd_status);
-static void ubserwritecb(usbd_xfer_handle, usbd_private_handle, usbd_status);
-static void ubser_cleanup(struct ubser_softc *sc);
-
-static t_break_t	ubserbreak;
-static t_open_t		ubseropen;
-static t_close_t	ubserclose;
-static t_modem_t	ubsermodem;
-
-static device_probe_t ubser_match;
-static device_attach_t ubser_attach;
-static device_detach_t ubser_detach;
-
-static device_method_t ubser_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		ubser_match),
-	DEVMETHOD(device_attach,	ubser_attach),
-	DEVMETHOD(device_detach,	ubser_detach),
-
-	{ 0, 0 }
-};
-
-static driver_t ubser_driver = {
-	"ubser",
-	ubser_methods,
-	sizeof(struct ubser_softc)
-};
-
-static devclass_t ubser_devclass;
-
-static int
-ubser_match(device_t self)
-{
-	struct usb_attach_arg *uaa = device_get_ivars(self);
-	usb_string_descriptor_t us;
-	usb_interface_descriptor_t *id;
-	usb_device_descriptor_t *dd;
-	int err, size;
-
-	if (uaa->iface == NULL)
-		return (UMATCH_NONE);
-
-	DPRINTFN(20,("ubser: vendor=0x%x, product=0x%x\n",
-		     uaa->vendor, uaa->product));
-
-	dd = usbd_get_device_descriptor(uaa->device);
-	if (dd == NULL) {
-		printf("ubser: failed to get device descriptor\n");
-		return (UMATCH_NONE);
-	}
-
-	id = usbd_get_interface_descriptor(uaa->iface);
-	if (id == NULL) {
-		printf("ubser: failed to get interface descriptor\n");
-		return (UMATCH_NONE);
-	}
-
-	err = usbd_get_string_desc(uaa->device, dd->iManufacturer, 0, &us,
-	    &size);
-	if (err != 0)
-		return (UMATCH_NONE);
-
-	/* check if this is a BWCT vendor specific ubser interface */
-	if (strcmp((char*)us.bString, "B\0W\0C\0T\0") == 0 &&
-	    id->bInterfaceClass == 0xff && id->bInterfaceSubClass == 0x00)
-		return (UMATCH_VENDOR_IFACESUBCLASS);
-
-	return (UMATCH_NONE);
-}
-
-static int
-ubser_attach(device_t self)
-{
-	struct ubser_softc *sc = device_get_softc(self);
-	struct usb_attach_arg *uaa = device_get_ivars(self);
-	usbd_device_handle udev = uaa->device;
-	usb_endpoint_descriptor_t *ed;
-	usb_interface_descriptor_t *id;
-	usb_device_request_t req;
-	struct tty *tp;
-	usbd_status err;
-	int i;
-	int alen;
-	uint8_t epcount;
-	struct ubser_port *pp;
-
-	sc->sc_dev = self;
-
-	DPRINTFN(10,("\nubser_attach: sc=%p\n", sc));
-
-	sc->sc_udev = udev = uaa->device;
-	sc->sc_iface = uaa->iface;
-	sc->sc_numser = 0;
-	sc->sc_port = NULL;
-
-	/* get interface index */
-	id = usbd_get_interface_descriptor(uaa->iface);
-	if (id == NULL) {
-		printf("ubser: failed to get interface descriptor\n");
-		return (UMATCH_NONE);
-	}
-	sc->sc_ifaceno = id->bInterfaceNumber;
-
-	/* get number of serials */
-	req.bmRequestType = UT_READ_VENDOR_INTERFACE;
-	req.bRequest = VENDOR_GET_NUMSER;
-	USETW(req.wValue, 0);
-	USETW(req.wIndex, sc->sc_ifaceno);
-	USETW(req.wLength, 1);
-	err = usbd_do_request_flags(udev, &req, &sc->sc_numser,
-	    USBD_SHORT_XFER_OK, &alen, USBD_DEFAULT_TIMEOUT);
-	if (err) {
-		device_printf(self, "failed to get number of serials\n");
-		goto bad;
-	} else if (alen != 1) {
-		device_printf(self, "bogus answer on get_numser\n");
-		goto bad;
-	}
-	if (sc->sc_numser > MAX_SER)
-		sc->sc_numser = MAX_SER;
-	device_printf(self, "found %i serials\n", sc->sc_numser);
-
-	sc->sc_port = malloc(sizeof(*sc->sc_port) * sc->sc_numser,
-	    M_USBDEV, M_WAITOK);
-
-	/* find our bulk endpoints */
-	epcount = 0;
-	(void)usbd_endpoint_count(sc->sc_iface, &epcount);
-	sc->sc_bulkin_no = -1;
-	sc->sc_bulkout_no = -1;
-	for (i = 0; i < epcount; i++) {
-		ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i);
-		if (ed == NULL) {
-			device_printf(self, "couldn't get ep %d\n", i);
-			return ENXIO;
-		}
-		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
-		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-			sc->sc_bulkin_no = ed->bEndpointAddress;
-			sc->sc_ibufsizepad = UGETW(ed->wMaxPacketSize);
-			sc->sc_ibufsizepad = UGETW(ed->wMaxPacketSize) - 1;
-		} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
-		    UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) {
-			sc->sc_bulkout_no = ed->bEndpointAddress;
-			sc->sc_obufsize = UGETW(ed->wMaxPacketSize) - 1;
-			sc->sc_opkthdrlen = 1;
-		}
-	}
-	if (sc->sc_bulkin_no == -1 || sc->sc_bulkout_no == -1) {
-		device_printf(self, "could not find bulk in/out endpoint\n");
-		sc->sc_dying = 1;
-		goto bad;
-	}
-
-	/* Open the bulk pipes */
-	/* Bulk-in pipe */
-	err = usbd_open_pipe(sc->sc_iface, sc->sc_bulkin_no, 0,
-			     &sc->sc_bulkin_pipe);
-	if (err) {
-		device_printf(self, "open bulk in error (addr %d): %s\n",
-		    sc->sc_bulkin_no, usbd_errstr(err));
-		goto fail_0;
-	}
-	/* Bulk-out pipe */
-	err = usbd_open_pipe(sc->sc_iface, sc->sc_bulkout_no,
-			     USBD_EXCLUSIVE_USE, &sc->sc_bulkout_pipe);
-	if (err) {
-		device_printf(self, "open bulk out error (addr %d): %s\n",
-		    sc->sc_bulkout_no, usbd_errstr(err));
-		goto fail_1;
-	}
-
-	/* Allocate a request and an input buffer */
-	sc->sc_ixfer = usbd_alloc_xfer(sc->sc_udev);
-	if (sc->sc_ixfer == NULL) {
-		goto fail_2;
-	}
-
-	sc->sc_ibuf = usbd_alloc_buffer(sc->sc_ixfer,
-					sc->sc_ibufsizepad);
-	if (sc->sc_ibuf == NULL) {
-		goto fail_3;
-	}
-
-	for (i = 0; i < sc->sc_numser; i++) {
-		pp = &sc->sc_port[i];
-		pp->p_port = i;
-		pp->p_sc = sc;
-		tp = pp->p_tty = ttyalloc();
-		tp->t_sc = pp;
-		DPRINTF(("ubser_attach: tty_attach tp = %p\n", tp));
-		tp->t_oproc = ubserstart;
-		tp->t_param = ubserparam;
-		tp->t_stop = ubserstop;
-		tp->t_break = ubserbreak;
-		tp->t_open = ubseropen;
-		tp->t_close = ubserclose;
-		tp->t_modem = ubsermodem;
-		ttycreate(tp, 0, "y%r%r", device_get_unit(sc->sc_dev), i);
-	}
-
-
-	for (i = 0; i < sc->sc_numser; i++) {
-		sc->sc_port[i].p_oxfer = NULL;
-		sc->sc_port[i].p_obuf = NULL;
-	}
-	for (i = 0; i < sc->sc_numser; i++) {
-		sc->sc_port[i].p_oxfer = usbd_alloc_xfer(sc->sc_udev);
-		if (sc->sc_port[i].p_oxfer == NULL) {
-			goto fail_4;
-		}
-
-		sc->sc_port[i].p_obuf = usbd_alloc_buffer(sc->sc_port[i].p_oxfer,
-						sc->sc_obufsize +
-						sc->sc_opkthdrlen);
-		if (sc->sc_port[i].p_obuf == NULL) {
-			goto fail_4;
-		}
-	}
-
-	ubserstartread(sc);
-	return 0;
-
-fail_4:
-	for (i = 0; i < sc->sc_numser; i++) {
-		if (sc->sc_port[i].p_oxfer != NULL) {
-			usbd_free_xfer(sc->sc_port[i].p_oxfer);
-			sc->sc_port[i].p_oxfer = NULL;
-		}
-	}
-fail_3:
-	usbd_free_xfer(sc->sc_ixfer);
-	sc->sc_ixfer = NULL;
-fail_2:
-	usbd_close_pipe(sc->sc_bulkout_pipe);
-	sc->sc_bulkout_pipe = NULL;
-fail_1:
-	usbd_close_pipe(sc->sc_bulkin_pipe);
-	sc->sc_bulkin_pipe = NULL;
-fail_0:
-	sc->sc_opening = 0;
-	wakeup(&sc->sc_opening);
-
-bad:
-	ubser_cleanup(sc);
-	if (sc->sc_port != NULL) {
-		for (i = 0; i < sc->sc_numser; i++) {
-			pp = &sc->sc_port[i];
-			if (pp->p_tty != NULL)
-				ttyfree(pp->p_tty);
-		}
-		free(sc->sc_port, M_USBDEV);
-		sc->sc_port = NULL;
-	}
-
-	DPRINTF(("ubser_attach: ATTACH ERROR\n"));
-	return ENXIO;
-}
-
-static int
-ubser_detach(device_t self)
-{
-	struct ubser_softc *sc = device_get_softc(self);
-	int i;
-	struct ubser_port *pp;
-
-	DPRINTF(("ubser_detach: sc=%p\n", sc));
-
-	sc->sc_dying = 1;
-	for (i = 0; i < sc->sc_numser; i++) {
-		pp = &sc->sc_port[i];
-		if (pp->p_tty != NULL)
-			ttygone(pp->p_tty);
-	}
-
-	if (sc->sc_bulkin_pipe != NULL)
-		usbd_abort_pipe(sc->sc_bulkin_pipe);
-	if (sc->sc_bulkout_pipe != NULL)
-		usbd_abort_pipe(sc->sc_bulkout_pipe);
-
-	if (sc->sc_port != NULL) {
-		for (i = 0; i < sc->sc_numser; i++) {
-			pp = &sc->sc_port[i];
-			if (pp->p_tty != NULL)
-				ttyfree(pp->p_tty);
-		}
-		free(sc->sc_port, M_USBDEV);
-		sc->sc_port = NULL;
-	}
-
-	if (--sc->sc_refcnt >= 0) {
-		/* Wait for processes to go away. */
-		usb_detach_wait(sc->sc_dev);
-	}
-
-	return (0);
-}
-
-static int
-ubserparam(struct tty *tp, struct termios *t)
-{
-	struct ubser_softc *sc;
-	struct ubser_port *pp;
-
-	pp = tp->t_sc;
-	sc = pp->p_sc;
-
-	if (sc->sc_dying)
-		return (EIO);
-
-	DPRINTF(("ubserparam: sc = %p\n", sc));
-
-	/*
-	 * The firmware on our devices can only do 8n1@9600bps
-	 * without handshake.
-	 * We refuse to accept other configurations.
-	 */
-
-	/* enshure 9600bps */
-	switch (t->c_ospeed) {
-	case 9600:
-		break;
-	default:
-		return (EINVAL);
-	}
-
-	/* 2 stop bits not possible */
-	if (ISSET(t->c_cflag, CSTOPB))
-		return (EINVAL);
-
-	/* XXX parity handling not possible with current firmware */
-	if (ISSET(t->c_cflag, PARENB))
-		return (EINVAL);
-
-	/* we can only do 8 data bits */
-	switch (ISSET(t->c_cflag, CSIZE)) {
-	case CS8:
-		break;
-	default:
-		return (EINVAL);
-	}
-
-	/* we can't do any kind of hardware handshaking */
-	if ((t->c_cflag &
-	    (CRTS_IFLOW | CDTR_IFLOW |CDSR_OFLOW |CCAR_OFLOW)) != 0)
-		return (EINVAL);
-
-	/*
-	 * XXX xon/xoff not supported by the firmware!
-	 * This is handled within FreeBSD only and may overflow buffers
-	 * because of delayed reaction due to device buffering.
-	 */
-
-	ttsetwater(tp);
-
-	return (0);
-}
-
-static void
-ubserstart(struct tty *tp)
-{
-	struct ubser_softc *sc;
-	struct ubser_port *pp;
-	struct cblock *cbp;
-	usbd_status err;
-	u_char *data;
-	int cnt;
-	uint8_t serial;
-
-	pp = tp->t_sc;
-	sc = pp->p_sc;
-	serial = pp->p_port;
-	DPRINTF(("ubserstart: sc = %p, tp = %p\n", sc, tp));
-
-	if (sc->sc_dying)
-		return;
-
-	if (ISSET(tp->t_state, TS_BUSY | TS_TIMEOUT | TS_TTSTOP)) {
-		ttwwakeup(tp);
-		DPRINTF(("ubserstart: stopped\n"));
-		return;
-	}
-
-	if (tp->t_outq.c_cc <= tp->t_olowat) {
-		if (ISSET(tp->t_state, TS_SO_OLOWAT)) {
-			CLR(tp->t_state, TS_SO_OLOWAT);
-			wakeup(TSA_OLOWAT(tp));
-		}
-		selwakeuppri(&tp->t_wsel, TTIPRI);
-		if (tp->t_outq.c_cc == 0) {
-			if (ISSET(tp->t_state, TS_BUSY | TS_SO_OCOMPLETE) ==
-			    TS_SO_OCOMPLETE && tp->t_outq.c_cc == 0) {
-				CLR(tp->t_state, TS_SO_OCOMPLETE);
-				wakeup(TSA_OCOMPLETE(tp));
-			}
-			return;
-		}
-	}
-
-	/* Grab the first contiguous region of buffer space. */
-	data = tp->t_outq.c_cf;
-	cbp = (struct cblock *) ((intptr_t) tp->t_outq.c_cf & ~CROUND);
-	cnt = min((char *) (cbp+1) - tp->t_outq.c_cf, tp->t_outq.c_cc);
-
-	if (cnt == 0) {
-		DPRINTF(("ubserstart: cnt == 0\n"));
-		return;
-	}
-
-	SET(tp->t_state, TS_BUSY);
-
-	if (cnt + sc->sc_opkthdrlen > sc->sc_obufsize) {
-		DPRINTF(("ubserstart: big buffer %d chars\n", cnt));
-		cnt = sc->sc_obufsize;
-	}
-	sc->sc_port[serial].p_obuf[0] = serial;
-	memcpy(sc->sc_port[serial].p_obuf + sc->sc_opkthdrlen, data, cnt);
-
-
-	DPRINTF(("ubserstart: %d chars\n", cnt));
-	usbd_setup_xfer(sc->sc_port[serial].p_oxfer, sc->sc_bulkout_pipe,
-			(usbd_private_handle)tp, sc->sc_port[serial].p_obuf,
-			cnt + sc->sc_opkthdrlen,
-			USBD_NO_COPY, USBD_NO_TIMEOUT, ubserwritecb);
-	/* What can we do on error? */
-	err = usbd_transfer(sc->sc_port[serial].p_oxfer);
-	if (err != USBD_IN_PROGRESS)
-		printf("ubserstart: err=%s\n", usbd_errstr(err));
-
-	ttwwakeup(tp);
-}
-
-static void
-ubserstop(struct tty *tp, int flag)
-{
-	struct ubser_softc *sc;
-
-	sc = tp->t_sc;
-
-	DPRINTF(("ubserstop: %d\n", flag));
-
-	if (flag & FWRITE) {
-		DPRINTF(("ubserstop: write\n"));
-		if (ISSET(tp->t_state, TS_BUSY)) {
-			/* XXX do what? */
-			if (!ISSET(tp->t_state, TS_TTSTOP))
-				SET(tp->t_state, TS_FLUSH);
-		}
-	}
-
-	DPRINTF(("ubserstop: done\n"));
-}
-
-static void
-ubserwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
-{
-	struct tty *tp;
-	struct ubser_softc *sc;
-	struct ubser_port *pp;
-	u_int32_t cc;
-
-	tp = (struct tty *)p;
-	pp = tp->t_sc;
-	sc = pp->p_sc;
-
-	DPRINTF(("ubserwritecb: status = %d\n", status));
-
-	if (status == USBD_CANCELLED || sc->sc_dying)
-		goto error;
-
-	if (status != USBD_NORMAL_COMPLETION) {
-		device_printf(sc->sc_dev, "ubserwritecb: %s\n",
-		    usbd_errstr(status));
-		if (status == USBD_STALLED)
-			usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe);
-		/* XXX we should restart after some delay. */
-		goto error;
-	}
-
-	usbd_get_xfer_status(xfer, NULL, NULL, &cc, NULL);
-	DPRINTF(("ubserwritecb: cc = %d\n", cc));
-	if (cc <= sc->sc_opkthdrlen) {
-		device_printf(sc->sc_dev, "sent size too small, cc = %d\n",
-		    cc);
-		goto error;
-	}
-
-	/* convert from USB bytes to tty bytes */
-	cc -= sc->sc_opkthdrlen;
-
-	CLR(tp->t_state, TS_BUSY);
-	if (ISSET(tp->t_state, TS_FLUSH))
-		CLR(tp->t_state, TS_FLUSH);
-	else
-		ndflush(&tp->t_outq, cc);
-	ttyld_start(tp);
-
-	return;
-
-error:
-	CLR(tp->t_state, TS_BUSY);
-	return;
-}
-
-static usbd_status
-ubserstartread(struct ubser_softc *sc)
-{
-	usbd_status err;
-
-	DPRINTF(("ubserstartread: start\n"));
-
-	if (sc->sc_bulkin_pipe == NULL)
-		return (USBD_NORMAL_COMPLETION);
-
-	usbd_setup_xfer(sc->sc_ixfer, sc->sc_bulkin_pipe,
-			(usbd_private_handle)sc,
-			sc->sc_ibuf, sc->sc_ibufsizepad,
-			USBD_SHORT_XFER_OK | USBD_NO_COPY,
-			USBD_NO_TIMEOUT, ubserreadcb);
-
-	err = usbd_transfer(sc->sc_ixfer);
-	if (err != USBD_IN_PROGRESS) {
-		DPRINTF(("ubserstartread: err = %s\n", usbd_errstr(err)));
-		return (err);
-	}
-
-	return (USBD_NORMAL_COMPLETION);
-}
-
-static void
-ubserreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
-{
-	struct ubser_softc *sc = (struct ubser_softc *)p;
-	struct tty *tp;
-	usbd_status err;
-	u_int32_t cc;
-	u_char *cp;
-	int lostcc;
-
-	if (status == USBD_IOERROR) {
-		device_printf(sc->sc_dev, "ubserreadcb: %s - restarting\n",
-		    usbd_errstr(status));
-		goto resubmit;
-	}
-
-	DPRINTF(("ubserreadcb: status = %d\n", status));
-
-	if (status != USBD_NORMAL_COMPLETION) {
-		if (status != USBD_CANCELLED) {
-			device_printf(sc->sc_dev, "ubserreadcb: %s\n",
-			    usbd_errstr(status));
-		}
-		if (status == USBD_STALLED)
-			usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe);
-		return;
-	}
-
-	usbd_get_xfer_status(xfer, NULL, (void **)&cp, &cc, NULL);
-
-	DPRINTF(("ubserreadcb: got %d bytes from device\n", cc));
-	if (cc == 0)
-		goto resubmit;
-
-	if (cc > sc->sc_ibufsizepad) {
-		device_printf(sc->sc_dev, "invalid receive data size, %d chars\n",
-		    cc);
-		goto resubmit;
-	}
-
-	/* parse header */
-	if (cc < 1)
-		goto resubmit;
-	DPRINTF(("ubserreadcb: got %d chars for serial %d\n", cc - 1, *cp));
-	tp = sc->sc_port[*cp].p_tty;
-	cp++;
-	cc--;
-
-	if (cc < 1)
-		goto resubmit;
-
-	if (!(tp->t_state & TS_ISOPEN))	/* drop data for unused serials */
-		goto resubmit;
-
-	if (tp->t_state & TS_CAN_BYPASS_L_RINT) {
-		if (tp->t_rawq.c_cc + cc > tp->t_ihiwat
-		    && (tp->t_iflag & IXOFF)
-		    && !(tp->t_state & TS_TBLOCK))
-			ttyblock(tp);
-		lostcc = b_to_q((char *)cp, cc, &tp->t_rawq);
-		tp->t_rawcc += cc;
-		ttwakeup(tp);
-		if (tp->t_state & TS_TTSTOP
-		    && (tp->t_iflag & IXANY
-			|| tp->t_cc[VSTART] == tp->t_cc[VSTOP])) {
-			tp->t_state &= ~TS_TTSTOP;
-			tp->t_lflag &= ~FLUSHO;
-			ubserstart(tp);
-		}
-		if (lostcc > 0)
-			device_printf(sc->sc_dev, "lost %d chars\n", lostcc);
-	} else {
-		/* Give characters to tty layer. */
-		while (cc > 0) {
-			DPRINTFN(7, ("ubserreadcb: char = 0x%02x\n", *cp));
-			if (ttyld_rint(tp, *cp) == -1) {
-				/* XXX what should we do? */
-				device_printf(sc->sc_dev, "lost %d chars\n",
-				    cc);
-				break;
-			}
-			cc--;
-			cp++;
-		}
-	}
-
-resubmit:
-	err = ubserstartread(sc);
-	if (err) {
-		device_printf(sc->sc_dev, "read start failed\n");
-		/* XXX what should we do now? */
-	}
-
-}
-
-static void
-ubser_cleanup(struct ubser_softc *sc)
-{
-	int i;
-	struct ubser_port *pp;
-
-	DPRINTF(("ubser_cleanup: closing pipes\n"));
-
-	if (sc->sc_bulkin_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_bulkin_pipe);
-		usbd_close_pipe(sc->sc_bulkin_pipe);
-		sc->sc_bulkin_pipe = NULL;
-	}
-	if (sc->sc_bulkout_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_bulkout_pipe);
-		usbd_close_pipe(sc->sc_bulkout_pipe);
-		sc->sc_bulkout_pipe = NULL;
-	}
-	if (sc->sc_ixfer != NULL) {
-		usbd_free_xfer(sc->sc_ixfer);
-		sc->sc_ixfer = NULL;
-	}
-	for (i = 0; i < sc->sc_numser; i++) {
-		pp = &sc->sc_port[i];
-		if (pp->p_oxfer != NULL) {
-			usbd_free_xfer(pp->p_oxfer);
-			pp->p_oxfer = NULL;
-		}
-	}
-}
-
-static int
-ubseropen(struct tty *tp, struct cdev *dev)
-{
-	struct ubser_softc *sc;
-	struct ubser_port *pp;
-
-	pp = tp->t_sc;
-	sc = pp->p_sc;
-
-	sc->sc_refcnt++;	/* XXX: wrong refcnt on error later on */
-	return (0);
-}
-
-static void
-ubserclose(struct tty *tp)
-{
-	struct ubser_softc *sc;
-	struct ubser_port *pp;
-
-	pp = tp->t_sc;
-	sc = pp->p_sc;
-	if (--sc->sc_refcnt < 0)
-		usb_detach_wakeup(sc->sc_dev);
-}
-
-static void
-ubserbreak(struct tty *tp, int sig)
-{
-	usb_device_request_t req;
-	struct ubser_softc *sc;
-	struct ubser_port *pp;
-	int error;
-	int alen;
-
-	pp = tp->t_sc;
-	sc = pp->p_sc;
-	if (sig) {
-		DPRINTF(("ubser_break: TIOCSBRK\n"));
-		req.bmRequestType = UT_READ_VENDOR_INTERFACE;
-		req.bRequest = VENDOR_SET_BREAK;
-		USETW(req.wValue, pp->p_port);
-		USETW(req.wIndex, sc->sc_ifaceno);
-		USETW(req.wLength, 0);
-		error = usbd_do_request_flags(sc->sc_udev, &req, &sc->sc_numser,
-		    USBD_SHORT_XFER_OK, &alen, USBD_DEFAULT_TIMEOUT);
-	}
-}
-
-static int
-ubsermodem(struct tty *tp, int sigon, int sigoff)
-{
-
-	return (SER_DTR | SER_RTS | SER_DCD);
-}
-
-MODULE_DEPEND(ubser, usb, 1, 1, 1);
-DRIVER_MODULE(ubser, uhub, ubser_driver, ubser_devclass, usbd_driver_load, 0);