summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormaya <maya@NetBSD.org>2020-01-29 18:39:00 +0000
committermaya <maya@NetBSD.org>2020-01-29 18:39:00 +0000
commit4607a239cdb76acacd56e32dabcfea6e69dde43e (patch)
tree35102c0cdd24ceedd61b442fcc9c203e646a471e /sys/dev
parent2f17c8c7aa2c3a337ccf75d82bea2702637d9dd2 (diff)
remove urio(4), a driver for the Rio500 MP3 player.
At this point it is highly unlikely this 1999 device still has users, but it still comes up in the context of maxv's USB-fuzzing (and any device could pretend to be a urio(4)), so it's best to get rid of it. Renamed all major entries to obsolete, as was done in previous removals. This still requires an update to sanitizers, but they're located in "external", perhaps it should be first committed upstream? Proposed on tech-kern a month ago.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/FILES2
-rw-r--r--sys/dev/usb/TODO.usbmp6
-rw-r--r--sys/dev/usb/urio.c549
-rw-r--r--sys/dev/usb/urio.h58
-rw-r--r--sys/dev/usb/usbdevices.config5
5 files changed, 2 insertions, 618 deletions
diff --git a/sys/dev/usb/FILES b/sys/dev/usb/FILES
index dedf2e43933..b532a97a61f 100644
--- a/sys/dev/usb/FILES
+++ b/sys/dev/usb/FILES
@@ -57,8 +57,6 @@ umidi_quirks.c Strange MIDI devices
umidi_quirks.h and definitions for it
umodem.c USB modem (CDC ACM) driver
ums.c USB mouse driver
-urio.c USB Diamond Rio500 driver
-urio.h USB Diamond Rio500 defines
usb.c usb (bus) device driver
usb.h general USB defines
usb_mem.c memory allocation for DMAable memory
diff --git a/sys/dev/usb/TODO.usbmp b/sys/dev/usb/TODO.usbmp
index dc5d2680844..53efc0cce8b 100644
--- a/sys/dev/usb/TODO.usbmp
+++ b/sys/dev/usb/TODO.usbmp
@@ -1,4 +1,4 @@
-$NetBSD: TODO.usbmp,v 1.17 2020/01/17 15:00:20 maya Exp $
+$NetBSD: TODO.usbmp,v 1.18 2020/01/29 18:39:04 maya Exp $
the majority of the USB MP device interface is documented in usbdivar.h.
@@ -30,7 +30,6 @@ usb_detach_{waitold,wakeup} to usb_detach_{wait,broadcast} conversion:
uirda.c
ulpt.c
umass.c - done, partially done -- need to check umass_scsipi.c change
- urio.c
uscanner.c
usscanner.c
ustir.c
@@ -74,7 +73,6 @@ splusb drivers to convert:
- uirda.c
- ukbd.c
- ulpt.c
- - urio.c
- usbdi.h
- uscanner.c
- usscanner.c
@@ -104,7 +102,6 @@ missing D_MPSAFE drivers:
- ugen - partially ready
- uhso
- ulpt
- - urio
- usb
- uscanner
- utoppy
@@ -162,7 +159,6 @@ driver testing: STATUS
- upl working
- uberry
- uipad
- - urio
- uscanner ? (must take kernel lock for scsipi)
- usscanner
- utoppy
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
deleted file mode 100644
index b6b2ad50c25..00000000000
--- a/sys/dev/usb/urio.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/* $NetBSD: urio.c,v 1.50 2019/12/01 08:27:54 maxv 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 (lennart@augustsson.net) 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.
- *
- * 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 <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.50 2019/12/01 08:27:54 maxv Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/kmem.h>
-#include <sys/device.h>
-#include <sys/ioctl.h>
-#include <sys/conf.h>
-#include <sys/file.h>
-#include <sys/select.h>
-#include <sys/proc.h>
-#include <sys/vnode.h>
-#include <sys/poll.h>
-
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
-
-#include <dev/usb/usbdevs.h>
-#include <dev/usb/urio.h>
-
-#include "ioconf.h"
-
-#ifdef URIO_DEBUG
-#define DPRINTF(x) if (uriodebug) printf x
-#define DPRINTFN(n,x) if (uriodebug>(n)) printf x
-int uriodebug = 0;
-#else
-#define DPRINTF(x)
-#define DPRINTFN(n,x)
-#endif
-
-
-static dev_type_open(urioopen);
-static dev_type_close(urioclose);
-static dev_type_read(urioread);
-static dev_type_write(uriowrite);
-static dev_type_ioctl(urioioctl);
-
-const struct cdevsw urio_cdevsw = {
- .d_open = urioopen,
- .d_close = urioclose,
- .d_read = urioread,
- .d_write = uriowrite,
- .d_ioctl = urioioctl,
- .d_stop = nostop,
- .d_tty = notty,
- .d_poll = nopoll,
- .d_mmap = nommap,
- .d_kqfilter = nokqfilter,
- .d_discard = nodiscard,
- .d_flag = D_OTHER
-};
-
-#define URIO_CONFIG_NO 1
-#define URIO_IFACE_IDX 0
-
-
-#define URIO_BSIZE 4096
-
-
-struct urio_softc {
- device_t sc_dev;
- struct usbd_device * sc_udev;
- struct usbd_interface * sc_iface;
- enum {
- URIO_INIT_NONE,
- URIO_INIT_INITED
- } sc_init_state;
-
- int sc_in_addr;
- struct usbd_pipe * sc_in_pipe;
- int sc_out_addr;
- struct usbd_pipe * sc_out_pipe;
-
- int sc_refcnt;
- char sc_dying;
-};
-
-#define URIOUNIT(n) (minor(n))
-
-#define URIO_RW_TIMEOUT 4000 /* ms */
-
-static const struct usb_devno urio_devs[] = {
- { USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB},
- { USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_RIO600USB},
- { USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_RIO800USB},
- { USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_PSAPLAY120},
-};
-#define urio_lookup(v, p) usb_lookup(urio_devs, v, p)
-
-static int urio_match(device_t, cfdata_t, void *);
-static void urio_attach(device_t, device_t, void *);
-static int urio_detach(device_t, int);
-static int urio_activate(device_t, enum devact);
-
-CFATTACH_DECL_NEW(urio, sizeof(struct urio_softc), urio_match, urio_attach,
- urio_detach, urio_activate);
-
-static int
-urio_match(device_t parent, cfdata_t match, void *aux)
-{
- struct usb_attach_arg *uaa = aux;
-
- DPRINTFN(50,("urio_match\n"));
-
- return urio_lookup(uaa->uaa_vendor, uaa->uaa_product) != NULL ?
- UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
-}
-
-static void
-urio_attach(device_t parent, device_t self, void *aux)
-{
- struct urio_softc *sc = device_private(self);
- struct usb_attach_arg *uaa = aux;
- struct usbd_device * dev = uaa->uaa_device;
- struct usbd_interface * iface;
- char *devinfop;
- usbd_status err;
- usb_endpoint_descriptor_t *ed;
- uint8_t epcount;
- int i;
-
- DPRINTFN(10,("urio_attach: sc=%p\n", sc));
-
- sc->sc_dev = self;
- sc->sc_init_state = URIO_INIT_NONE;
-
- aprint_naive("\n");
- aprint_normal("\n");
-
- devinfop = usbd_devinfo_alloc(dev, 0);
- aprint_normal_dev(self, "%s\n", devinfop);
- usbd_devinfo_free(devinfop);
-
- err = usbd_set_config_no(dev, URIO_CONFIG_NO, 1);
- if (err) {
- aprint_error_dev(self, "failed to set configuration"
- ", err=%s\n", usbd_errstr(err));
- return;
- }
-
- err = usbd_device2interface_handle(dev, URIO_IFACE_IDX, &iface);
- if (err) {
- aprint_error_dev(self, "getting interface handle failed\n");
- 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) {
- aprint_error_dev(self, "couldn't get ep %d\n", i);
- 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) {
- aprint_error_dev(self, "missing endpoint\n");
- return;
- }
-
- DPRINTFN(10, ("urio_attach: %p\n", sc->sc_udev));
-
- usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
-
- sc->sc_init_state = URIO_INIT_INITED;
-
- return;
-}
-
-static int
-urio_detach(device_t self, int flags)
-{
- struct urio_softc *sc = device_private(self);
- int s;
- int maj, mn;
-
- DPRINTF(("urio_detach: sc=%p flags=%d\n", sc, flags));
-
- 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_waitold(sc->sc_dev);
- }
- splx(s);
-
- /* locate the major number */
- maj = cdevsw_lookup_major(&urio_cdevsw);
-
- /* Nuke the vnodes for any open instances (calls close). */
- mn = device_unit(self);
- vdevgone(maj, mn, mn, VCHR);
-
- if (sc->sc_init_state < URIO_INIT_INITED)
- return 0;
-
- usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
-
- return 0;
-}
-
-static int
-urio_activate(device_t self, enum devact act)
-{
- struct urio_softc *sc = device_private(self);
-
- switch (act) {
- case DVACT_DEACTIVATE:
- sc->sc_dying = 1;
- return 0;
- default:
- return EOPNOTSUPP;
- }
-}
-
-static int
-urioopen(dev_t dev, int flag, int mode, struct lwp *l)
-{
- struct urio_softc *sc;
- usbd_status err;
-
- sc = device_lookup_private(&urio_cd, URIOUNIT(dev));
- if (sc == NULL)
- return ENXIO;
-
- 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;
-}
-
-static int
-urioclose(dev_t dev, int flag, int mode,
- struct lwp *l)
-{
- struct urio_softc *sc;
- sc = device_lookup_private(&urio_cd, URIOUNIT(dev));
-
- 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;
-}
-
-static int
-urioread(dev_t dev, struct uio *uio, int flag)
-{
- struct urio_softc *sc;
- struct usbd_xfer *xfer;
- usbd_status err;
- void *bufp;
- uint32_t n, tn;
- int error = 0;
-
- sc = device_lookup_private(&urio_cd, URIOUNIT(dev));
-
- DPRINTFN(5, ("urioread: %d\n", URIOUNIT(dev)));
-
- if (sc->sc_dying)
- return EIO;
-
- error = usbd_create_xfer(sc->sc_in_pipe, URIO_BSIZE, 0, 0, &xfer);
- if (error) {
- return error;
- }
- bufp = usbd_get_buffer(xfer);
-
- sc->sc_refcnt++;
-
- while ((n = uimin(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);
- 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_destroy_xfer(xfer);
-
- if (--sc->sc_refcnt < 0)
- usb_detach_wakeupold(sc->sc_dev);
-
- return error;
-}
-
-static int
-uriowrite(dev_t dev, struct uio *uio, int flag)
-{
- struct urio_softc *sc;
- struct usbd_xfer *xfer;
- usbd_status err;
- void *bufp;
- uint32_t n;
- int error = 0;
-
- sc = device_lookup_private(&urio_cd, URIOUNIT(dev));
-
- DPRINTFN(5, ("uriowrite: unit=%d, len=%ld\n", URIOUNIT(dev),
- (long)uio->uio_resid));
-
- if (sc->sc_dying)
- return EIO;
-
- error = usbd_create_xfer(sc->sc_out_pipe, URIO_BSIZE, 0, 0, &xfer);
- if (error) {
- return error;
- }
- bufp = usbd_get_buffer(xfer);
- sc->sc_refcnt++;
-
- while ((n = uimin(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);
- 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_destroy_xfer(xfer);
-
- if (--sc->sc_refcnt < 0)
- usb_detach_wakeupold(sc->sc_dev);
-
- DPRINTFN(5, ("uriowrite: done unit=%d, error=%d\n", URIOUNIT(dev),
- error));
-
- return error;
-}
-
-
-static int
-urioioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
-{
- 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;
- uint32_t req_actlen = 0;
- void *ptr = NULL;
- int error = 0;
-
- sc = device_lookup_private(&urio_cd, unit);
-
- 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 = (void *)rcmd->buffer;
- iov.iov_len = len;
- uio.uio_iov = &iov;
- uio.uio_iovcnt = 1;
- uio.uio_resid = len;
- uio.uio_offset = 0;
- uio.uio_rw = req.bmRequestType & UT_READ ?
- UIO_READ : UIO_WRITE;
- uio.uio_vmspace = l->l_proc->p_vmspace;
- ptr = kmem_alloc(len, KM_SLEEP);
- 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, USBD_DEFAULT_TIMEOUT);
-
- if (--sc->sc_refcnt < 0)
- usb_detach_wakeupold(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)
- kmem_free(ptr, len);
- return error;
-}
diff --git a/sys/dev/usb/urio.h b/sys/dev/usb/urio.h
deleted file mode 100644
index f1258600d6a..00000000000
--- a/sys/dev/usb/urio.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $NetBSD: urio.h,v 1.5 2016/04/23 10:15:32 skrll 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 (lennart@augustsson.net) 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.
- *
- * 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/ioccom.h>
-
-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/usbdevices.config b/sys/dev/usb/usbdevices.config
index ca9c232b845..3269b9cff95 100644
--- a/sys/dev/usb/usbdevices.config
+++ b/sys/dev/usb/usbdevices.config
@@ -1,4 +1,4 @@
-# $NetBSD: usbdevices.config,v 1.36 2019/09/20 10:34:54 mrg Exp $
+# $NetBSD: usbdevices.config,v 1.37 2020/01/29 18:39:04 maya Exp $
#
# This file contains all USB related configuration.
# It is suitable for inclusion in a kernel config(5) file.
@@ -195,9 +195,6 @@ uberry* at uhub? port ?
# Apple iPad
uipad* at uhub? port ?
-# Diamond Multimedia Rio 500
-urio* at uhub? port ?
-
# USB Handspring Visor
uvisor* at uhub? port ?
ucom* at uvisor?