Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/usb remove urio(4), a driver for the Rio500 MP3 player.



details:   https://anonhg.NetBSD.org/src/rev/dbe77af4d572
branches:  trunk
changeset: 1006872:dbe77af4d572
user:      maya <maya%NetBSD.org@localhost>
date:      Wed Jan 29 18:39:00 2020 +0000

description:
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:

 distrib/sets/lists/comp/mi                     |    4 +-
 distrib/sets/lists/man/mi                      |    8 +-
 etc/MAKEDEV.tmpl                               |    9 +-
 share/man/man4/Makefile                        |    4 +-
 share/man/man4/urio.4                          |   70 ---
 share/man/man4/usb.4                           |    6 +-
 share/man/man8/MAKEDEV.8                       |    7 +-
 sys/arch/aarch64/conf/majors.aarch64           |    4 +-
 sys/arch/algor/conf/majors.algor               |    4 +-
 sys/arch/alpha/conf/majors.alpha               |    4 +-
 sys/arch/amd64/conf/ALL                        |    7 +-
 sys/arch/amd64/conf/XEN3_DOM0                  |    7 +-
 sys/arch/amd64/conf/majors.amd64               |    4 +-
 sys/arch/arm/conf/majors.arm32                 |    4 +-
 sys/arch/cats/conf/GENERIC                     |    5 +-
 sys/arch/cobalt/conf/majors.cobalt             |    4 +-
 sys/arch/epoc32/conf/majors.epoc32             |    4 +-
 sys/arch/evbarm/conf/HDL_G                     |    5 +-
 sys/arch/evbarm/conf/HPT5325                   |    5 +-
 sys/arch/evbarm/conf/MINI2440                  |    5 +-
 sys/arch/evbarm/conf/MMNET_GENERIC             |    7 +-
 sys/arch/evbarm/conf/MPCSA_GENERIC             |    7 +-
 sys/arch/evbarm/conf/POGO                      |    1 -
 sys/arch/evbarm/conf/SHEEVAPLUG                |    5 +-
 sys/arch/evbarm/conf/SMDK2410                  |    5 +-
 sys/arch/evbarm/conf/TS7200                    |    5 +-
 sys/arch/evbarm/conf/TWINTAIL                  |    5 +-
 sys/arch/evbmips/conf/majors.evbmips           |    4 +-
 sys/arch/evbppc/conf/OPENBLOCKS266_OPT         |    5 +-
 sys/arch/evbppc/conf/PMPPC                     |    5 +-
 sys/arch/evbppc/conf/majors.evbppc             |    4 +-
 sys/arch/hpcarm/conf/majors.hpcarm             |    4 +-
 sys/arch/hpcmips/conf/GENERIC                  |    7 +-
 sys/arch/hpcmips/conf/VR41XX                   |    7 +-
 sys/arch/hpcmips/conf/majors.hpcmips           |    4 +-
 sys/arch/hppa/conf/GENERIC                     |    7 +-
 sys/arch/i386/conf/ALL                         |    7 +-
 sys/arch/i386/conf/XEN3PAE_DOM0                |    5 +-
 sys/arch/i386/conf/majors.i386                 |    4 +-
 sys/arch/ia64/conf/majors.ia64                 |    4 +-
 sys/arch/landisk/conf/GENERIC                  |    7 +-
 sys/arch/landisk/conf/majors.landisk           |    4 +-
 sys/arch/or1k/conf/majors.or1k                 |    3 +-
 sys/arch/playstation2/conf/DEBUG               |    5 +-
 sys/arch/playstation2/conf/majors.playstation2 |    4 +-
 sys/arch/powerpc/conf/majors.powerpc           |    4 +-
 sys/arch/prep/conf/GENERIC                     |    7 +-
 sys/arch/sgimips/conf/majors.sgimips           |    4 +-
 sys/arch/sparc/conf/majors.sparc               |    4 +-
 sys/arch/sparc64/conf/GENERIC                  |    7 +-
 sys/arch/sparc64/conf/majors.sparc64           |    4 +-
 sys/arch/x68k/conf/GENERIC                     |    7 +-
 sys/arch/x68k/conf/majors.x68k                 |    4 +-
 sys/arch/zaurus/conf/majors.zaurus             |    4 +-
 sys/dev/usb/FILES                              |    2 -
 sys/dev/usb/TODO.usbmp                         |    6 +-
 sys/dev/usb/urio.c                             |  549 -------------------------
 sys/dev/usb/urio.h                             |   58 --
 sys/dev/usb/usbdevices.config                  |    5 +-
 59 files changed, 94 insertions(+), 866 deletions(-)

diffs (truncated from 1902 to 300 lines):

diff -r 56fc83840d0d -r dbe77af4d572 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Wed Jan 29 17:11:57 2020 +0000
+++ b/distrib/sets/lists/comp/mi        Wed Jan 29 18:39:00 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.2306 2020/01/29 03:17:34 thorpej Exp $
+#      $NetBSD: mi,v 1.2307 2020/01/29 18:39:04 maya Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp                           comp-sys-root
@@ -740,7 +740,7 @@
 ./usr/include/dev/usb/if_umbreg.h              comp-c-include
 ./usr/include/dev/usb/mbim.h                   comp-c-include
 ./usr/include/dev/usb/ukyopon.h                        comp-c-include
-./usr/include/dev/usb/urio.h                   comp-c-include
+./usr/include/dev/usb/urio.h                   comp-obsolete           obsolete
 ./usr/include/dev/usb/usb.h                    comp-c-include
 ./usr/include/dev/usb/usbcdc.h                 comp-obsolete           obsolete
 ./usr/include/dev/usb/usbdevs.h                        comp-obsolete           obsolete
diff -r 56fc83840d0d -r dbe77af4d572 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Wed Jan 29 17:11:57 2020 +0000
+++ b/distrib/sets/lists/man/mi Wed Jan 29 18:39:00 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1677 2020/01/22 14:01:50 thorpej Exp $
+# $NetBSD: mi,v 1.1678 2020/01/29 18:39:04 maya Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1906,7 +1906,7 @@
 ./usr/share/man/cat4/uplcom.0                  man-sys-catman          .cat
 ./usr/share/man/cat4/urandom.0                 man-sys-catman          .cat
 ./usr/share/man/cat4/ure.0                     man-sys-catman          .cat
-./usr/share/man/cat4/urio.0                    man-sys-catman          .cat
+./usr/share/man/cat4/urio.0                    man-obsolete            obsolete
 ./usr/share/man/cat4/url.0                     man-sys-catman          .cat
 ./usr/share/man/cat4/urlphy.0                  man-sys-catman          .cat
 ./usr/share/man/cat4/urndis.0                  man-sys-catman          .cat
@@ -5015,7 +5015,7 @@
 ./usr/share/man/html4/uplcom.html              man-sys-htmlman         html
 ./usr/share/man/html4/urandom.html             man-sys-htmlman         html
 ./usr/share/man/html4/ure.html                 man-sys-htmlman         html
-./usr/share/man/html4/urio.html                        man-sys-htmlman         html
+./usr/share/man/html4/urio.html                        man-obsolete            obsolete
 ./usr/share/man/html4/url.html                 man-sys-htmlman         html
 ./usr/share/man/html4/urlphy.html              man-sys-htmlman         html
 ./usr/share/man/html4/urndis.html              man-sys-htmlman         html
@@ -8048,7 +8048,7 @@
 ./usr/share/man/man4/uplcom.4                  man-sys-man             .man
 ./usr/share/man/man4/urandom.4                 man-sys-man             .man
 ./usr/share/man/man4/ure.4                     man-sys-man             .man
-./usr/share/man/man4/urio.4                    man-sys-man             .man
+./usr/share/man/man4/urio.4                    man-obsolete            obsolete
 ./usr/share/man/man4/url.4                     man-sys-man             .man
 ./usr/share/man/man4/urlphy.4                  man-sys-man             .man
 ./usr/share/man/man4/urndis.4                  man-sys-man             .man
diff -r 56fc83840d0d -r dbe77af4d572 etc/MAKEDEV.tmpl
--- a/etc/MAKEDEV.tmpl  Wed Jan 29 17:11:57 2020 +0000
+++ b/etc/MAKEDEV.tmpl  Wed Jan 29 18:39:00 2020 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#      $NetBSD: MAKEDEV.tmpl,v 1.213 2020/01/19 20:41:18 riastradh Exp $
+#      $NetBSD: MAKEDEV.tmpl,v 1.214 2020/01/29 18:39:05 maya Exp $
 #
 # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -180,7 +180,6 @@
 #      uhid*   USB generic HID devices
 #      ulpt*   USB printer devices
 #      ugen*   USB generic devices
-#      urio*   USB Diamond Rio 500 devices
 #      uscanner*       USB scanners
 #      ttyHS*  USB Option N.V. modems
 #      ttyU*   USB modems
@@ -923,7 +922,6 @@
        makedev ttyU0 ttyU1 ttyU2 ttyU3 ttyU4 ttyU5 ttyU6 ttyU7
        makedev ttyY0 ttyY1
        makedev ttyHS0
-       makedev urio0
        makedev uscanner0 uscanner1
        makedev utoppy0 utoppy1
        makedev ugen0 ugen1 ugen2 ugen3
@@ -971,11 +969,6 @@
        mkdev ulpn$unit c %ulpt_chr% $(($unit + 64))
        ;;
 
-urio[0-9]*)
-       unit=${i#urio}
-       mkdev urio$unit c %urio_chr% $unit 666
-       ;;
-
 uscanner[0-9]*)
        unit=${i#uscanner}
        mkdev uscanner$unit c %uscanner_chr% $unit
diff -r 56fc83840d0d -r dbe77af4d572 share/man/man4/Makefile
--- a/share/man/man4/Makefile   Wed Jan 29 17:11:57 2020 +0000
+++ b/share/man/man4/Makefile   Wed Jan 29 18:39:00 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.700 2020/01/22 14:01:50 thorpej Exp $
+#      $NetBSD: Makefile,v 1.701 2020/01/29 18:39:04 maya Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/18/93
 
 MAN=   aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -85,7 +85,7 @@
        ucom.4 ucycom.4 udav.4 udsbr.4 uftdi.4 ugen.4 ugensa.4 uhci.4 uhid.4 \
        uhidev.4 uhmodem.4 uhso.4 uipad.4 uipaq.4 uirda.4 ukbd.4 ukyopon.4 \
        ulpt.4 umass.4 umcs.4 umct.4 umidi.4 umodem.4 ums.4 upgt.4 upl.4 \
-       uplcom.4 ure.4 urio.4 url.4 urndis.4 urtw.4 urtwn.4 \
+       uplcom.4 ure.4 url.4 urndis.4 urtw.4 urtwn.4 \
        usb.4 usbnet.4 uscanner.4 uslsa.4 usmsc.4 usscanner.4 \
        ustir.4 uthum.4 utoppy.4 uts.4 uvideo.4 uvisor.4 uvscom.4 uyap.4 \
        xhci.4 \
diff -r 56fc83840d0d -r dbe77af4d572 share/man/man4/urio.4
--- a/share/man/man4/urio.4     Wed Jan 29 17:11:57 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-.\" $NetBSD: urio.4,v 1.9 2012/03/13 19:25:42 njoly 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.
-.\"
-.\" 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.
-.\"
-.Dd March 6, 2000
-.Dt URIO 4
-.Os
-.Sh NAME
-.Nm urio
-.Nd USB driver for the Diamond Multimedia Rio500 MP3 player
-.Sh SYNOPSIS
-.Cd "urio* at uhub?"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for Rio500 MP3 player from Diamond MultiMedia.
-.Pp
-The driver implements minimal support to access the device and requires
-a user application for up and downloading music.
-.Sh FILES
-.Bl -tag -width /dev/urio0 -compact
-.It Pa /dev/urio0
-device node
-.El
-.Sh EXAMPLES
-Using the Rio500 package from sourceforge the command
-.Pp
-.Dl rio_add_song 01_BlinkarBla.mp3
-.Pp
-will download a song over the
-.Tn USB
-connection into your Rio500.
-.Sh SEE ALSO
-.Xr usb 4
-.Pp
-.Lk http://rio500.sourceforge.net/ "Rio500 project"
-.Sh HISTORY
-The
-.Nm
-driver
-appeared in
-.Nx 1.5 .
-This driver is based on a
-.Fx
-Rio driver written by Iwasa Kazmi.
diff -r 56fc83840d0d -r dbe77af4d572 share/man/man4/usb.4
--- a/share/man/man4/usb.4      Wed Jan 29 17:11:57 2020 +0000
+++ b/share/man/man4/usb.4      Wed Jan 29 18:39:00 2020 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: usb.4,v 1.110 2018/09/18 05:37:54 mrg Exp $
+.\" $NetBSD: usb.4,v 1.111 2020/01/29 18:39:04 maya Exp $
 .\"
 .\" Copyright (c) 1999-2014 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 30, 2017
+.Dd January 29, 2020
 .Dt USB 4
 .Os
 .Sh NAME
@@ -170,8 +170,6 @@
 USB audio devices
 .It Xr umidi 4
 USB MIDI devices
-.It Xr urio 4
-Diamond Multimedia Rio MP3 players
 .El
 .Ss Radio receiver devices
 .Bl -tag -width 12n -offset ind -compact
diff -r 56fc83840d0d -r dbe77af4d572 share/man/man8/MAKEDEV.8
--- a/share/man/man8/MAKEDEV.8  Wed Jan 29 17:11:57 2020 +0000
+++ b/share/man/man8/MAKEDEV.8  Wed Jan 29 18:39:00 2020 +0000
@@ -6,7 +6,7 @@
 .\" *** DO NOT EDIT - any changes will be lost!!!
 .\" *** ------------------------------------------------------------------
 .\"
-.\" $NetBSD: MAKEDEV.8,v 1.55 2019/09/15 15:15:02 maxv Exp $
+.\" $NetBSD: MAKEDEV.8,v 1.56 2020/01/29 18:39:05 maya Exp $
 .\"
 .\" Copyright (c) 2001, 2003, 2007, 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 15, 2019
+.Dd January 29, 2020
 .Dt MAKEDEV 8
 .Os
 .Sh NAME
@@ -575,9 +575,6 @@
 . It Ar ugen#
 USB generic devices, see
 .Xr \&ugen 4
-. It Ar urio#
-USB Diamond Rio 500 devices, see
-.Xr \&urio 4
 . It Ar uscanner#
 USB scanners, see
 .Xr \&uscanner 4
diff -r 56fc83840d0d -r dbe77af4d572 sys/arch/aarch64/conf/majors.aarch64
--- a/sys/arch/aarch64/conf/majors.aarch64      Wed Jan 29 17:11:57 2020 +0000
+++ b/sys/arch/aarch64/conf/majors.aarch64      Wed Jan 29 18:39:00 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: majors.aarch64,v 1.4 2019/01/28 02:28:56 dholland Exp $
+# $NetBSD: majors.aarch64,v 1.5 2020/01/29 18:39:00 maya Exp $
 #
 # Device majors for arm32
 #
@@ -68,7 +68,7 @@
 device-major   ugen            char 72                 ugen
 device-major   wsmux           char 73                 wsmux
 device-major   ucom            char 74                 ucom
-device-major   urio            char 75                 urio
+#device-major  obsolete        char 75                 obsolete (urio)
 device-major   uscanner        char 76                 uscanner
 device-major   openfirm        char 77                 openfirm
 device-major   biconsdev       char 78                 biconsdev
diff -r 56fc83840d0d -r dbe77af4d572 sys/arch/algor/conf/majors.algor
--- a/sys/arch/algor/conf/majors.algor  Wed Jan 29 17:11:57 2020 +0000
+++ b/sys/arch/algor/conf/majors.algor  Wed Jan 29 18:39:00 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: majors.algor,v 1.27 2019/01/28 02:28:56 dholland Exp $
+#      $NetBSD: majors.algor,v 1.28 2020/01/29 18:39:00 maya Exp $
 #
 # Device majors for algor
 #
@@ -59,7 +59,7 @@
 device-major   ld              char 59  block 17       ld
 device-major   cy              char 60                 cy
 device-major   cz              char 61                 cz
-device-major   urio            char 62                 urio
+#device-major  obsolete        char 62                 obsolete (urio)
 device-major   uscanner        char 63                 uscanner
 device-major   altq            char 64                 altq
 device-major   mlx             char 65                 mlx
diff -r 56fc83840d0d -r dbe77af4d572 sys/arch/alpha/conf/majors.alpha
--- a/sys/arch/alpha/conf/majors.alpha  Wed Jan 29 17:11:57 2020 +0000
+++ b/sys/arch/alpha/conf/majors.alpha  Wed Jan 29 18:39:00 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: majors.alpha,v 1.34 2019/01/28 02:28:56 dholland Exp $
+#      $NetBSD: majors.alpha,v 1.35 2020/01/29 18:39:00 maya Exp $
 #
 # Device majors for alpha
 #
@@ -60,7 +60,7 @@
 device-major   ld              char 59  block 17       ld
 device-major   cy              char 60                 cy
 device-major   cz              char 61                 cz
-device-major   urio            char 62                 urio
+#device-major  obsolete        char 62                 obsolete (urio)
 device-major   uscanner        char 63                 uscanner
 device-major   altq            char 64                 altq
 device-major   mlx             char 65                 mlx
diff -r 56fc83840d0d -r dbe77af4d572 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Wed Jan 29 17:11:57 2020 +0000
+++ b/sys/arch/amd64/conf/ALL   Wed Jan 29 18:39:00 2020 +0000
@@ -1,4 +1,4 @@



Home | Main Index | Thread Index | Old Index