From b271c12c532262d77e3d90489d5fc0a11b81c910 Mon Sep 17 00:00:00 2001 From: jakob Date: Sat, 15 Apr 2000 17:36:28 +0000 Subject: [PATCH] urio(4) - Diamond Multimedia RIO 500 (from NetBSD) This driver will eventually go away as it really should be implemented using ugen(4) instead. --- sys/arch/i386/i386/conf.c | 5 +- sys/dev/usb/files.usb | 7 +- sys/dev/usb/urio.c | 593 ++++++++++++++++++++++++++++++++++++++ sys/dev/usb/urio.h | 64 ++++ sys/dev/usb/usb_port.h | 3 +- 5 files changed, 669 insertions(+), 3 deletions(-) create mode 100644 sys/dev/usb/urio.c create mode 100644 sys/dev/usb/urio.h diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index e0b5252644d..45e996e5b38 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.59 2000/04/09 21:07:46 matthieu Exp $ */ +/* $OpenBSD: conf.c,v 1.60 2000/04/15 17:36:29 jakob Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -202,6 +202,8 @@ cdev_decl(uhid); cdev_decl(ugen); #include "ulpt.h" cdev_decl(ulpt); +#include "urio.h" +cdev_decl(urio); #ifdef IPFILTER #define NIPF 1 @@ -303,6 +305,7 @@ struct cdevsw cdevsw[] = cdev_usbdev_init(NUHID,uhid), /* 62: USB generic HID */ cdev_ugen_init(NUGEN,ugen), /* 63: USB generic driver */ cdev_ulpt_init(NULPT,ulpt), /* 64: USB printers */ + cdev_usbdev_init(NURIO,urio), /* 65: USB Diamond Rio 500 */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb index a4d1fae5602..7ff0fc7b7ae 100644 --- a/sys/dev/usb/files.usb +++ b/sys/dev/usb/files.usb @@ -1,4 +1,4 @@ -# $OpenBSD: files.usb,v 1.10 2000/04/05 00:29:14 aaron Exp $ +# $OpenBSD: files.usb,v 1.11 2000/04/15 17:36:29 jakob Exp $ # $NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $ # # Config file and device description for machine-independent USB code. @@ -61,6 +61,11 @@ device umodem: ucombus attach umodem at uhub file dev/usb/umodem.c umodem +# Diamond Multimedia Rio 500 +device urio +attach urio at uhub +file dev/usb/urio.c urio needs-flag + # Ethernet adapters # ADMtek AN986 Pegasus device aue: ether, ifnet, mii, ifmedia diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c new file mode 100644 index 00000000000..2649fb5cb47 --- /dev/null +++ b/sys/dev/usb/urio.c @@ -0,0 +1,593 @@ +/* $OpenBSD: urio.c,v 1.1 2000/04/15 17:36:28 jakob Exp $ */ +/* $NetBSD: urio.c,v 1.1 2000/04/14 14:20:02 augustss Exp $ */ + +/* + * Copyright (c) 2000 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Lennart Augustsson (augustss@carlstedt.se) at + * Carlstedt Research & Technology. + * + * 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. + */ + +/* + * The inspiration and information for this driver comes from the + * FreeBSD driver written by Iwasa Kazmi. + */ + +#include +#include +#include +#include +#if defined(__NetBSD__) || defined(__OpenBSD__) +#include +#include +#elif defined(__FreeBSD__) +#include +#include +#include +#include +#include +#include +#endif +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#ifdef URIO_DEBUG +#define DPRINTF(x) if (uriodebug) logprintf x +#define DPRINTFN(n,x) if (uriodebug>(n)) logprintf x +int uriodebug = 0; +#else +#define DPRINTF(x) +#define DPRINTFN(n,x) +#endif + + +#if defined(__NetBSD__) || defined(__OpenBSD__) +cdev_decl(urio); +#elif defined(__FreeBSD__) +d_open_t urioopen; +d_close_t urioclose; +d_read_t urioread; +d_write_t uriowrite; +d_ioctl_t urioioctl; + +#define URIO_CDEV_MAJOR 143 + +static struct cdevsw urio_cdevsw = { + urioopen, urioclose, urioread, uriowrite, + urioioctl, nopoll, nommap, nostrategy, + "urio", URIO_CDEV_MAJOR,nodump, nopsize, + 0, -1 +}; +#endif /* defined(__FreeBSD__) */ + +#define URIO_CONFIG_NO 1 +#define URIO_IFACE_IDX 0 + + +#define URIO_BSIZE 4096 + + +struct urio_softc { + USBBASEDEVICE sc_dev; + usbd_device_handle sc_udev; + usbd_interface_handle sc_iface; + + int sc_in_addr; + usbd_pipe_handle sc_in_pipe; + int sc_out_addr; + usbd_pipe_handle sc_out_pipe; + + int sc_refcnt; + char sc_dying; +}; + +#define URIOUNIT(n) (minor(n)) + +#define URIO_RW_TIMEOUT 4000 /* ms */ + +USB_DECLARE_DRIVER(urio); + +USB_MATCH(urio) +{ + USB_MATCH_START(urio, uaa); + + DPRINTFN(50,("urio_match\n")); + + if (uaa->iface != NULL) + return (UMATCH_NONE); + + if (uaa->vendor == USB_VENDOR_DIAMOND && + uaa->product == USB_PRODUCT_DIAMOND_RIO500USB) + return (UMATCH_VENDOR_PRODUCT); + else + return (UMATCH_NONE); +} + +USB_ATTACH(urio) +{ + USB_ATTACH_START(urio, sc, uaa); + usbd_device_handle dev = uaa->device; + usbd_interface_handle iface; + char devinfo[1024]; + usbd_status err; + usb_endpoint_descriptor_t *ed; + u_int8_t epcount; + int i; + + DPRINTFN(10,("urio_attach: sc=%p\n", sc)); + + usbd_devinfo(dev, 0, devinfo); + USB_ATTACH_SETUP; + printf("%s: %s\n", USBDEVNAME(sc->sc_dev), devinfo); + + err = usbd_set_config_no(dev, URIO_CONFIG_NO, 0); + if (err) { + printf("%s: setting config no failed\n", + USBDEVNAME(sc->sc_dev)); + USB_ATTACH_ERROR_RETURN; + } + + err = usbd_device2interface_handle(dev, URIO_IFACE_IDX, &iface); + if (err) { + printf("%s: getting interface handle failed\n", + USBDEVNAME(sc->sc_dev)); + USB_ATTACH_ERROR_RETURN; + } + + sc->sc_udev = dev; + sc->sc_iface = iface; + + epcount = 0; + (void)usbd_endpoint_count(iface, &epcount); + + sc->sc_in_addr = -1; + sc->sc_out_addr = -1; + for (i = 0; i < epcount; i++) { + ed = usbd_interface2endpoint_descriptor(iface, i); + if (ed == NULL) { + printf("%s: couldn't get ep %d\n", + USBDEVNAME(sc->sc_dev), i); + USB_ATTACH_ERROR_RETURN; + } + if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && + UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) { + sc->sc_in_addr = ed->bEndpointAddress; + } else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT && + UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) { + sc->sc_out_addr = ed->bEndpointAddress; + } + } + if (sc->sc_in_addr == -1 || sc->sc_out_addr == -1) { + printf("%s: missing endpoint\n", USBDEVNAME(sc->sc_dev)); + USB_ATTACH_ERROR_RETURN; + } + +#if defined(__FreeBSD__) + /* XXX no error trapping, no storing of dev_t */ + (void)make_dev(&urio_cdevsw, device_get_unit(self), + UID_ROOT, GID_OPERATOR, + 0644, "urio%d", device_get_unit(self)); +#endif /* defined(__FreeBSD__) */ + + DPRINTFN(10, ("urio_attach: %p\n", sc->sc_udev)); + + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, + USBDEV(sc->sc_dev)); + + USB_ATTACH_SUCCESS_RETURN; +} + +USB_DETACH(urio) +{ + USB_DETACH_START(urio, sc); + int s; +#if defined(__NetBSD__) || defined(__OpenBSD__) + int maj, mn; + + DPRINTF(("urio_detach: sc=%p flags=%d\n", sc, flags)); +#elif defined(__FreeBSD__) + DPRINTF(("urio_detach: sc=%p\n", sc)); +#endif + + sc->sc_dying = 1; + /* Abort all pipes. Causes processes waiting for transfer to wake. */ + if (sc->sc_in_pipe != NULL) { + usbd_abort_pipe(sc->sc_in_pipe); + usbd_close_pipe(sc->sc_in_pipe); + sc->sc_in_pipe = NULL; + } + if (sc->sc_out_pipe != NULL) { + usbd_abort_pipe(sc->sc_out_pipe); + usbd_close_pipe(sc->sc_out_pipe); + sc->sc_out_pipe = NULL; + } + + s = splusb(); + if (--sc->sc_refcnt >= 0) { + /* Wait for processes to go away. */ + usb_detach_wait(USBDEV(sc->sc_dev)); + } + splx(s); + +#if defined(__NetBSD__) || defined(__OpenBSD__) + /* locate the major number */ + for (maj = 0; maj < nchrdev; maj++) + if (cdevsw[maj].d_open == urioopen) + break; + + /* Nuke the vnodes for any open instances (calls close). */ + mn = self->dv_unit; + vdevgone(maj, mn, mn, VCHR); +#elif defined(__FreeBSD__) + /* XXX not implemented yet */ +#endif + + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, + USBDEV(sc->sc_dev)); + + return (0); +} + +#if defined(__NetBSD__) || defined(__OpenBSD__) +int +urio_activate(self, act) + device_ptr_t self; + enum devact act; +{ + struct urio_softc *sc = (struct urio_softc *)self; + + switch (act) { + case DVACT_ACTIVATE: + return (EOPNOTSUPP); + break; + + case DVACT_DEACTIVATE: + sc->sc_dying = 1; + break; + } + return (0); +} +#endif + +int +urioopen(dev, flag, mode, p) + dev_t dev; + int flag; + int mode; + struct proc *p; +{ + struct urio_softc *sc; + usbd_status err; + + USB_GET_SC_OPEN(urio, URIOUNIT(dev), sc); + + DPRINTFN(5, ("urioopen: flag=%d, mode=%d, unit=%d\n", + flag, mode, URIOUNIT(dev))); + + if (sc->sc_dying) + return (EIO); + + if (sc->sc_in_pipe != NULL) + return (EBUSY); + + if ((flag & (FWRITE|FREAD)) != (FWRITE|FREAD)) + return (EACCES); + + err = usbd_open_pipe(sc->sc_iface, sc->sc_in_addr, 0, &sc->sc_in_pipe); + if (err) + return (EIO); + err = usbd_open_pipe(sc->sc_iface, sc->sc_out_addr,0,&sc->sc_out_pipe); + if (err) { + usbd_close_pipe(sc->sc_in_pipe); + sc->sc_in_pipe = NULL; + return (EIO); + } + + return (0); +} + +int +urioclose(dev, flag, mode, p) + dev_t dev; + int flag; + int mode; + struct proc *p; +{ + struct urio_softc *sc; + USB_GET_SC(urio, URIOUNIT(dev), sc); + + DPRINTFN(5, ("urioclose: flag=%d, mode=%d, unit=%d\n", + flag, mode, URIOUNIT(dev))); + + if (sc->sc_in_pipe != NULL) { + usbd_abort_pipe(sc->sc_in_pipe); + usbd_close_pipe(sc->sc_in_pipe); + sc->sc_in_pipe = NULL; + } + if (sc->sc_out_pipe != NULL) { + usbd_abort_pipe(sc->sc_out_pipe); + usbd_close_pipe(sc->sc_out_pipe); + sc->sc_out_pipe = NULL; + } + + return (0); +} + +int +urioread(dev, uio, flag) + dev_t dev; + struct uio *uio; + int flag; +{ + struct urio_softc *sc; + usbd_xfer_handle xfer; + usbd_status err; + void *bufp; + u_int32_t n, tn; + int error = 0; + + USB_GET_SC(urio, URIOUNIT(dev), sc); + + DPRINTFN(5, ("urioread: %d\n", URIOUNIT(dev))); + + if (sc->sc_dying) + return (EIO); + + xfer = usbd_alloc_xfer(sc->sc_udev); + if (xfer == NULL) + return (ENOMEM); + bufp = usbd_alloc_buffer(xfer, URIO_BSIZE); + if (bufp == NULL) { + usbd_free_xfer(xfer); + return (ENOMEM); + } + + sc->sc_refcnt++; + + while ((n = min(URIO_BSIZE, uio->uio_resid)) != 0) { + DPRINTFN(1, ("urioread: start transfer %d bytes\n", n)); + tn = n; + err = usbd_bulk_transfer(xfer, sc->sc_in_pipe, 0, + URIO_RW_TIMEOUT, bufp, &tn, "uriors"); + if (err) { + if (err == USBD_INTERRUPTED) + error = EINTR; + else if (err == USBD_TIMEOUT) + error = ETIMEDOUT; + else + error = EIO; + break; + } + + DPRINTFN(1, ("urioread: got %d bytes\n", tn)); + + error = uiomove(bufp, tn, uio); + if (error || tn < n) + break; + } + usbd_free_xfer(xfer); + + if (--sc->sc_refcnt < 0) + usb_detach_wakeup(USBDEV(sc->sc_dev)); + + return (error); +} + +int +uriowrite(dev, uio, flag) + dev_t dev; + struct uio *uio; + int flag; +{ + struct urio_softc *sc; + usbd_xfer_handle xfer; + usbd_status err; + void *bufp; + u_int32_t n; + int error = 0; + + USB_GET_SC(urio, URIOUNIT(dev), sc); + + DPRINTFN(5, ("uriowrite: unit=%d, len=%ld\n", URIOUNIT(dev), + (long)uio->uio_resid)); + + if (sc->sc_dying) + return (EIO); + + xfer = usbd_alloc_xfer(sc->sc_udev); + if (xfer == NULL) + return (ENOMEM); + bufp = usbd_alloc_buffer(xfer, URIO_BSIZE); + if (bufp == NULL) { + usbd_free_xfer(xfer); + return (ENOMEM); + } + + sc->sc_refcnt++; + + while ((n = min(URIO_BSIZE, uio->uio_resid)) != 0) { + error = uiomove(bufp, n, uio); + if (error) + break; + + DPRINTFN(1, ("uriowrite: transfer %d bytes\n", n)); + + err = usbd_bulk_transfer(xfer, sc->sc_out_pipe, 0, + URIO_RW_TIMEOUT, bufp, &n, "uriowr"); + DPRINTFN(2, ("uriowrite: err=%d\n", err)); + if (err) { + if (err == USBD_INTERRUPTED) + error = EINTR; + else if (err == USBD_TIMEOUT) + error = ETIMEDOUT; + else + error = EIO; + break; + } + } + + usbd_free_xfer(xfer); + + if (--sc->sc_refcnt < 0) + usb_detach_wakeup(USBDEV(sc->sc_dev)); + + DPRINTFN(5, ("uriowrite: done unit=%d, error=%d\n", URIOUNIT(dev), + error)); + + return (error); +} + + +int +urioioctl(dev, cmd, addr, flag, p) + dev_t dev; + u_long cmd; + caddr_t addr; + int flag; + struct proc *p; +{ + struct urio_softc * sc; + int unit = URIOUNIT(dev); + struct urio_command *rcmd; + int requesttype, len; + struct iovec iov; + struct uio uio; + usb_device_request_t req; + usbd_status err; + int req_flags = 0; + u_int32_t req_actlen = 0; + void *ptr = NULL; + int error = 0; + + USB_GET_SC(urio, unit, sc); + + if (sc->sc_dying) + return (EIO); + + rcmd = (struct urio_command *)addr; + + switch (cmd) { + case URIO_RECV_COMMAND: + requesttype = rcmd->requesttype | UT_READ_VENDOR_DEVICE; + break; + + case URIO_SEND_COMMAND: + requesttype = rcmd->requesttype | UT_WRITE_VENDOR_DEVICE; + break; + + default: + return (EINVAL); + break; + } + + if (!(flag & FWRITE)) + return (EPERM); + len = rcmd->length; + + DPRINTFN(1,("urio_ioctl: cmd=0x%08lx reqtype=0x%0x req=0x%0x " + "value=0x%0x index=0x%0x len=0x%0x\n", + cmd, requesttype, rcmd->request, rcmd->value, + rcmd->index, len)); + + /* Send rio control message */ + req.bmRequestType = requesttype; + req.bRequest = rcmd->request; + USETW(req.wValue, rcmd->value); + USETW(req.wIndex, rcmd->index); + USETW(req.wLength, len); + + if (len < 0 || len > 32767) + return (EINVAL); + if (len != 0) { + iov.iov_base = (caddr_t)rcmd->buffer; + iov.iov_len = len; + uio.uio_iov = &iov; + uio.uio_iovcnt = 1; + uio.uio_resid = len; + uio.uio_offset = 0; + uio.uio_segflg = UIO_USERSPACE; + uio.uio_rw = req.bmRequestType & UT_READ ? + UIO_READ : UIO_WRITE; + uio.uio_procp = p; + ptr = malloc(len, M_TEMP, M_WAITOK); + if (uio.uio_rw == UIO_WRITE) { + error = uiomove(ptr, len, &uio); + if (error) + goto ret; + } + } + + sc->sc_refcnt++; + + err = usbd_do_request_flags(sc->sc_udev, &req, ptr, req_flags, + &req_actlen); + + if (--sc->sc_refcnt < 0) + usb_detach_wakeup(USBDEV(sc->sc_dev)); + + if (err) { + error = EIO; + } else { + if (len != 0 && uio.uio_rw == UIO_READ) + error = uiomove(ptr, len, &uio); + } + +ret: + if (ptr != NULL) + free(ptr, M_TEMP); + return (error); +} + +int +uriopoll(dev, events, p) + dev_t dev; + int events; + struct proc *p; +{ + return (0); +} + +#if defined(__FreeBSD__) +DRIVER_MODULE(urio, uhub, urio_driver, urio_devclass, usbd_driver_load, 0); +#endif /* defined(__FreeBSD__) */ diff --git a/sys/dev/usb/urio.h b/sys/dev/usb/urio.h new file mode 100644 index 00000000000..2847759314b --- /dev/null +++ b/sys/dev/usb/urio.h @@ -0,0 +1,64 @@ +/* $OpenBSD: urio.h,v 1.1 2000/04/15 17:36:28 jakob Exp $ */ +/* $NetBSD: urio.h,v 1.1 2000/04/14 18:15:47 augustss Exp $ */ + +/* + * Copyright (c) 2000 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Lennart Augustsson (augustss@carlstedt.se) at + * Carlstedt Research & Technology. + * + * 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. + */ + +struct urio_command +{ + unsigned short length; + int request; + int requesttype; + int value; + int index; + void *buffer; + int timeout; +}; + +#define URIO_SEND_COMMAND _IOWR('U', 200, struct urio_command) +#define URIO_RECV_COMMAND _IOWR('U', 201, struct urio_command) + +#define URIO_DIR_OUT 0x0 +#define URIO_DIR_IN 0x1 + +#ifndef __KERNEL__ +#define RIO_DIR_OUT URIO_DIR_OUT +#define RIO_DIR_IN URIO_DIR_IN +#define RIO_SEND_COMMAND URIO_SEND_COMMAND +#define RIO_RECV_COMMAND URIO_RECV_COMMAND +#define RioCommand urio_command +#endif diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index c62154d7f66..6915c3711b1 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_port.h,v 1.13 2000/04/12 16:19:12 aaron Exp $ */ +/* $OpenBSD: usb_port.h,v 1.14 2000/04/15 17:36:28 jakob Exp $ */ /* $NetBSD: usb_port.h,v 1.28 2000/03/30 08:53:31 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -231,6 +231,7 @@ __CONCAT(dname,_detach)(self, flags) \ #define usbpoll usbselect #define uhidpoll uhidselect #define ugenpoll ugenselect +#define uriopoll urioselect #define powerhook_establish(fn, sc) (fn) #define powerhook_disestablish(hdl) -- 2.20.1