Module Name: src Committed By: maya Date: Wed Jan 29 18:39:05 UTC 2020
Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi src/etc: MAKEDEV.tmpl src/share/man/man4: Makefile usb.4 src/share/man/man8: MAKEDEV.8 src/sys/arch/aarch64/conf: majors.aarch64 src/sys/arch/algor/conf: majors.algor src/sys/arch/alpha/conf: majors.alpha src/sys/arch/amd64/conf: ALL XEN3_DOM0 majors.amd64 src/sys/arch/arm/conf: majors.arm32 src/sys/arch/cats/conf: GENERIC src/sys/arch/cobalt/conf: majors.cobalt src/sys/arch/epoc32/conf: majors.epoc32 src/sys/arch/evbarm/conf: HDL_G HPT5325 MINI2440 MMNET_GENERIC MPCSA_GENERIC POGO SHEEVAPLUG SMDK2410 TS7200 TWINTAIL src/sys/arch/evbmips/conf: majors.evbmips src/sys/arch/evbppc/conf: OPENBLOCKS266_OPT PMPPC majors.evbppc src/sys/arch/hpcarm/conf: majors.hpcarm src/sys/arch/hpcmips/conf: GENERIC VR41XX majors.hpcmips src/sys/arch/hppa/conf: GENERIC src/sys/arch/i386/conf: ALL XEN3PAE_DOM0 majors.i386 src/sys/arch/ia64/conf: majors.ia64 src/sys/arch/landisk/conf: GENERIC majors.landisk src/sys/arch/or1k/conf: majors.or1k src/sys/arch/playstation2/conf: DEBUG majors.playstation2 src/sys/arch/powerpc/conf: majors.powerpc src/sys/arch/prep/conf: GENERIC src/sys/arch/sgimips/conf: majors.sgimips src/sys/arch/sparc/conf: majors.sparc src/sys/arch/sparc64/conf: GENERIC majors.sparc64 src/sys/arch/x68k/conf: GENERIC majors.x68k src/sys/arch/zaurus/conf: majors.zaurus src/sys/dev/usb: FILES TODO.usbmp usbdevices.config Removed Files: src/share/man/man4: urio.4 src/sys/dev/usb: urio.c urio.h Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.2306 -r1.2307 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1677 -r1.1678 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.213 -r1.214 src/etc/MAKEDEV.tmpl cvs rdiff -u -r1.700 -r1.701 src/share/man/man4/Makefile cvs rdiff -u -r1.9 -r0 src/share/man/man4/urio.4 cvs rdiff -u -r1.110 -r1.111 src/share/man/man4/usb.4 cvs rdiff -u -r1.55 -r1.56 src/share/man/man8/MAKEDEV.8 cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/conf/majors.aarch64 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/algor/conf/majors.algor cvs rdiff -u -r1.34 -r1.35 src/sys/arch/alpha/conf/majors.alpha cvs rdiff -u -r1.142 -r1.143 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.173 -r1.174 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amd64/conf/majors.amd64 cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/conf/majors.arm32 cvs rdiff -u -r1.177 -r1.178 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.32 -r1.33 src/sys/arch/cobalt/conf/majors.cobalt cvs rdiff -u -r1.4 -r1.5 src/sys/arch/epoc32/conf/majors.epoc32 cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/conf/HDL_G cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/conf/HPT5325 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/MINI2440 cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/conf/MMNET_GENERIC cvs rdiff -u -r1.69 -r1.70 src/sys/arch/evbarm/conf/MPCSA_GENERIC cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/POGO cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/SHEEVAPLUG cvs rdiff -u -r1.72 -r1.73 src/sys/arch/evbarm/conf/SMDK2410 cvs rdiff -u -r1.73 -r1.74 src/sys/arch/evbarm/conf/TS7200 cvs rdiff -u -r1.77 -r1.78 src/sys/arch/evbarm/conf/TWINTAIL cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbmips/conf/majors.evbmips cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbppc/conf/PMPPC cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbppc/conf/majors.evbppc cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcarm/conf/majors.hpcarm cvs rdiff -u -r1.240 -r1.241 src/sys/arch/hpcmips/conf/GENERIC cvs rdiff -u -r1.73 -r1.74 src/sys/arch/hpcmips/conf/VR41XX cvs rdiff -u -r1.33 -r1.34 src/sys/arch/hpcmips/conf/majors.hpcmips cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hppa/conf/GENERIC cvs rdiff -u -r1.486 -r1.487 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.51 -r1.52 src/sys/arch/i386/conf/majors.i386 cvs rdiff -u -r1.17 -r1.18 src/sys/arch/ia64/conf/majors.ia64 cvs rdiff -u -r1.64 -r1.65 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.9 -r1.10 src/sys/arch/landisk/conf/majors.landisk cvs rdiff -u -r1.2 -r1.3 src/sys/arch/or1k/conf/majors.or1k cvs rdiff -u -r1.25 -r1.26 src/sys/arch/playstation2/conf/DEBUG cvs rdiff -u -r1.23 -r1.24 src/sys/arch/playstation2/conf/majors.playstation2 cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/conf/majors.powerpc cvs rdiff -u -r1.190 -r1.191 src/sys/arch/prep/conf/GENERIC cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sgimips/conf/majors.sgimips cvs rdiff -u -r1.38 -r1.39 src/sys/arch/sparc/conf/majors.sparc cvs rdiff -u -r1.223 -r1.224 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.37 -r1.38 src/sys/arch/sparc64/conf/majors.sparc64 cvs rdiff -u -r1.196 -r1.197 src/sys/arch/x68k/conf/GENERIC cvs rdiff -u -r1.30 -r1.31 src/sys/arch/x68k/conf/majors.x68k cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/conf/majors.zaurus cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/FILES cvs rdiff -u -r1.17 -r1.18 src/sys/dev/usb/TODO.usbmp cvs rdiff -u -r1.50 -r0 src/sys/dev/usb/urio.c cvs rdiff -u -r1.5 -r0 src/sys/dev/usb/urio.h cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/usbdevices.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2306 src/distrib/sets/lists/comp/mi:1.2307 --- src/distrib/sets/lists/comp/mi:1.2306 Wed Jan 29 03:17:34 2020 +++ src/distrib/sets/lists/comp/mi Wed Jan 29 18:39:04 2020 @@ -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 Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1677 src/distrib/sets/lists/man/mi:1.1678 --- src/distrib/sets/lists/man/mi:1.1677 Wed Jan 22 14:01:50 2020 +++ src/distrib/sets/lists/man/mi Wed Jan 29 18:39:04 2020 @@ -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 Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.213 src/etc/MAKEDEV.tmpl:1.214 --- src/etc/MAKEDEV.tmpl:1.213 Sun Jan 19 20:41:18 2020 +++ src/etc/MAKEDEV.tmpl Wed Jan 29 18:39:05 2020 @@ -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 @@ usbs) 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 @@ ulpt[0-9]*) 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 Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.700 src/share/man/man4/Makefile:1.701 --- src/share/man/man4/Makefile:1.700 Wed Jan 22 14:01:50 2020 +++ src/share/man/man4/Makefile Wed Jan 29 18:39:04 2020 @@ -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 @@ MAN+= atu.4 aubtfwl.4 aue.4 axe.4 axen.4 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 \ Index: src/share/man/man4/usb.4 diff -u src/share/man/man4/usb.4:1.110 src/share/man/man4/usb.4:1.111 --- src/share/man/man4/usb.4:1.110 Tue Sep 18 05:37:54 2018 +++ src/share/man/man4/usb.4 Wed Jan 29 18:39:04 2020 @@ -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 @@ SUNTAC Slipper U VS-10U USB serial adapt 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 Index: src/share/man/man8/MAKEDEV.8 diff -u src/share/man/man8/MAKEDEV.8:1.55 src/share/man/man8/MAKEDEV.8:1.56 --- src/share/man/man8/MAKEDEV.8:1.55 Sun Sep 15 15:15:02 2019 +++ src/share/man/man8/MAKEDEV.8 Wed Jan 29 18:39:05 2020 @@ -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 @@ USB printer devices, see . 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 Index: src/sys/arch/aarch64/conf/majors.aarch64 diff -u src/sys/arch/aarch64/conf/majors.aarch64:1.4 src/sys/arch/aarch64/conf/majors.aarch64:1.5 --- src/sys/arch/aarch64/conf/majors.aarch64:1.4 Mon Jan 28 02:28:56 2019 +++ src/sys/arch/aarch64/conf/majors.aarch64 Wed Jan 29 18:39:00 2020 @@ -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 raid char 71 block 71 rai 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 Index: src/sys/arch/algor/conf/majors.algor diff -u src/sys/arch/algor/conf/majors.algor:1.27 src/sys/arch/algor/conf/majors.algor:1.28 --- src/sys/arch/algor/conf/majors.algor:1.27 Mon Jan 28 02:28:56 2019 +++ src/sys/arch/algor/conf/majors.algor Wed Jan 29 18:39:00 2020 @@ -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 ses char 58 ses 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 Index: src/sys/arch/alpha/conf/majors.alpha diff -u src/sys/arch/alpha/conf/majors.alpha:1.34 src/sys/arch/alpha/conf/majors.alpha:1.35 --- src/sys/arch/alpha/conf/majors.alpha:1.34 Mon Jan 28 02:28:56 2019 +++ src/sys/arch/alpha/conf/majors.alpha Wed Jan 29 18:39:00 2020 @@ -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 ses char 58 ses 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 Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.142 src/sys/arch/amd64/conf/ALL:1.143 --- src/sys/arch/amd64/conf/ALL:1.142 Sat Jan 25 18:38:34 2020 +++ src/sys/arch/amd64/conf/ALL Wed Jan 29 18:39:00 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.142 2020/01/25 18:38:34 thorpej Exp $ +# $NetBSD: ALL,v 1.143 2020/01/29 18:39:00 maya Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.142 $" +#ident "ALL-$Revision: 1.143 $" maxusers 64 # estimated number of users @@ -1304,9 +1304,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? Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.173 src/sys/arch/amd64/conf/XEN3_DOM0:1.174 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.173 Sat Jan 25 18:38:34 2020 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Wed Jan 29 18:39:00 2020 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.173 2020/01/25 18:38:34 thorpej Exp $ +# $NetBSD: XEN3_DOM0,v 1.174 2020/01/29 18:39:00 maya Exp $ include "arch/amd64/conf/std.xen" @@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.173 $" +#ident "XEN3_DOM0-$Revision: 1.174 $" maxusers 32 # estimated number of users @@ -666,9 +666,6 @@ ucom* at uplcom? portno ? uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/amd64/conf/majors.amd64 diff -u src/sys/arch/amd64/conf/majors.amd64:1.32 src/sys/arch/amd64/conf/majors.amd64:1.33 --- src/sys/arch/amd64/conf/majors.amd64:1.32 Mon Jan 28 02:28:56 2019 +++ src/sys/arch/amd64/conf/majors.amd64 Wed Jan 29 18:39:00 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.amd64,v 1.32 2019/01/28 02:28:56 dholland Exp $ +# $NetBSD: majors.amd64,v 1.33 2020/01/29 18:39:00 maya Exp $ # # Device majors for amd64 # @@ -64,7 +64,7 @@ device-major ucom char 66 ucom device-major sysmon char 67 sysmon device-major ld char 69 block 19 ld -device-major urio char 70 urio +#device-major obsolete char 70 obsolete (urio) device-major bktr char 71 bktr device-major cz char 73 cz Index: src/sys/arch/arm/conf/majors.arm32 diff -u src/sys/arch/arm/conf/majors.arm32:1.39 src/sys/arch/arm/conf/majors.arm32:1.40 --- src/sys/arch/arm/conf/majors.arm32:1.39 Mon Jan 28 02:28:57 2019 +++ src/sys/arch/arm/conf/majors.arm32 Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.arm32,v 1.39 2019/01/28 02:28:57 dholland Exp $ +# $NetBSD: majors.arm32,v 1.40 2020/01/29 18:39:01 maya Exp $ # # Device majors for arm32 # @@ -71,7 +71,7 @@ device-major raid char 71 block 71 rai 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 Index: src/sys/arch/cats/conf/GENERIC diff -u src/sys/arch/cats/conf/GENERIC:1.177 src/sys/arch/cats/conf/GENERIC:1.178 --- src/sys/arch/cats/conf/GENERIC:1.177 Sat Jan 25 18:38:35 2020 +++ src/sys/arch/cats/conf/GENERIC Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.177 2020/01/25 18:38:35 thorpej Exp $ +# $NetBSD: GENERIC,v 1.178 2020/01/29 18:39:01 maya Exp $ # # GENERIC machine description file # @@ -396,9 +396,6 @@ ucom* at uplcom? portno ? umct* at uhub? port ? # MCT USB-RS232 serial adapter ucom* at umct? portno ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/cobalt/conf/majors.cobalt diff -u src/sys/arch/cobalt/conf/majors.cobalt:1.32 src/sys/arch/cobalt/conf/majors.cobalt:1.33 --- src/sys/arch/cobalt/conf/majors.cobalt:1.32 Mon Jan 28 02:28:57 2019 +++ src/sys/arch/cobalt/conf/majors.cobalt Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.cobalt,v 1.32 2019/01/28 02:28:57 dholland Exp $ +# $NetBSD: majors.cobalt,v 1.33 2020/01/29 18:39:01 maya Exp $ # # Device majors for cobalt # @@ -48,7 +48,7 @@ device-major uhid char 41 uhid device-major ulpt char 42 ulpt device-major ugen char 43 ugen device-major ucom char 44 ucom -device-major urio char 45 urio +#device-major obsolete char 45 obsolete (urio) device-major uscanner char 46 uscanner device-major audio char 47 audio device-major midi char 48 midi Index: src/sys/arch/epoc32/conf/majors.epoc32 diff -u src/sys/arch/epoc32/conf/majors.epoc32:1.4 src/sys/arch/epoc32/conf/majors.epoc32:1.5 --- src/sys/arch/epoc32/conf/majors.epoc32:1.4 Mon Jan 28 02:28:57 2019 +++ src/sys/arch/epoc32/conf/majors.epoc32 Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.epoc32,v 1.4 2019/01/28 02:28:57 dholland Exp $ +# $NetBSD: majors.epoc32,v 1.5 2020/01/29 18:39:01 maya Exp $ # # Device majors for epoc32 # @@ -68,7 +68,7 @@ device-major raid char 71 block 71 rai 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 Index: src/sys/arch/evbarm/conf/HDL_G diff -u src/sys/arch/evbarm/conf/HDL_G:1.58 src/sys/arch/evbarm/conf/HDL_G:1.59 --- src/sys/arch/evbarm/conf/HDL_G:1.58 Sun Jan 19 01:25:04 2020 +++ src/sys/arch/evbarm/conf/HDL_G Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: HDL_G,v 1.58 2020/01/19 01:25:04 thorpej Exp $ +# $NetBSD: HDL_G,v 1.59 2020/01/29 18:39:01 maya Exp $ # # HDL_G -- I-O DATA HDL-G Kernel # @@ -326,9 +326,6 @@ ucom* at uplcom? portno ? uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/evbarm/conf/HPT5325 diff -u src/sys/arch/evbarm/conf/HPT5325:1.43 src/sys/arch/evbarm/conf/HPT5325:1.44 --- src/sys/arch/evbarm/conf/HPT5325:1.43 Sun Jan 19 01:25:04 2020 +++ src/sys/arch/evbarm/conf/HPT5325 Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: HPT5325,v 1.43 2020/01/19 01:25:04 thorpej Exp $ +# $NetBSD: HPT5325,v 1.44 2020/01/29 18:39:01 maya Exp $ # # This configuration supports for HP T5325 Thin Client # @@ -345,9 +345,6 @@ ucom* at uvscom? portno ? # RIM BlackBerry #uberry* at uhub? port ? -# Diamond Multimedia Rio 500 -#urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/evbarm/conf/MINI2440 diff -u src/sys/arch/evbarm/conf/MINI2440:1.27 src/sys/arch/evbarm/conf/MINI2440:1.28 --- src/sys/arch/evbarm/conf/MINI2440:1.27 Sun Jan 19 01:25:04 2020 +++ src/sys/arch/evbarm/conf/MINI2440 Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: MINI2440,v 1.27 2020/01/19 01:25:04 thorpej Exp $ +# $NetBSD: MINI2440,v 1.28 2020/01/29 18:39:01 maya Exp $ # # MINI2440 -- Friendly ARM evaluation board based on Samsung S3C2440 # @@ -320,9 +320,6 @@ umass* at uhub? port ? configuration ? i #uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter #ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -#urio* at uhub? port ? - # USB Handspring Visor #uvisor* at uhub? port ? #ucom* at uvisor? Index: src/sys/arch/evbarm/conf/MMNET_GENERIC diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.47 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.48 --- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.47 Sun Jan 19 01:25:04 2020 +++ src/sys/arch/evbarm/conf/MMNET_GENERIC Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: MMNET_GENERIC,v 1.47 2020/01/19 01:25:04 thorpej Exp $ +# $NetBSD: MMNET_GENERIC,v 1.48 2020/01/29 18:39:01 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.47 $" +#ident "GENERIC-$Revision: 1.48 $" maxusers 32 # estimated number of users @@ -446,9 +446,6 @@ ucom* at uplcom? portno ? uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -#urio* at uhub? port ? - # USB Handspring Visor #uvisor* at uhub? port ? #ucom* at uvisor? Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.69 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.70 --- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.69 Sun Jan 19 20:00:37 2020 +++ src/sys/arch/evbarm/conf/MPCSA_GENERIC Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: MPCSA_GENERIC,v 1.69 2020/01/19 20:00:37 thorpej Exp $ +# $NetBSD: MPCSA_GENERIC,v 1.70 2020/01/29 18:39:01 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.69 $" +#ident "GENERIC-$Revision: 1.70 $" maxusers 32 # estimated number of users @@ -506,9 +506,6 @@ ucom* at uplcom? portno ? uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -#urio* at uhub? port ? - # USB Handspring Visor #uvisor* at uhub? port ? #ucom* at uvisor? Index: src/sys/arch/evbarm/conf/POGO diff -u src/sys/arch/evbarm/conf/POGO:1.6 src/sys/arch/evbarm/conf/POGO:1.7 --- src/sys/arch/evbarm/conf/POGO:1.6 Fri Jan 17 05:20:21 2020 +++ src/sys/arch/evbarm/conf/POGO Wed Jan 29 18:39:01 2020 @@ -9,7 +9,6 @@ no options DEBUG no uaudio* #no umidi* no uberry* -no urio* no uvisor* no ukyopon* #no uscanner* Index: src/sys/arch/evbarm/conf/SHEEVAPLUG diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.65 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.66 --- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.65 Sun Jan 19 01:25:04 2020 +++ src/sys/arch/evbarm/conf/SHEEVAPLUG Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: SHEEVAPLUG,v 1.65 2020/01/19 01:25:04 thorpej Exp $ +# $NetBSD: SHEEVAPLUG,v 1.66 2020/01/29 18:39:01 maya Exp $ # # This configuration supports for generically Marvell SheevaPlug # @@ -343,9 +343,6 @@ ucom* at uvscom? portno ? # RIM BlackBerry uberry* at uhub? port ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/evbarm/conf/SMDK2410 diff -u src/sys/arch/evbarm/conf/SMDK2410:1.72 src/sys/arch/evbarm/conf/SMDK2410:1.73 --- src/sys/arch/evbarm/conf/SMDK2410:1.72 Sun Jan 19 01:25:04 2020 +++ src/sys/arch/evbarm/conf/SMDK2410 Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: SMDK2410,v 1.72 2020/01/19 01:25:04 thorpej Exp $ +# $NetBSD: SMDK2410,v 1.73 2020/01/29 18:39:01 maya Exp $ # # SMDK2410 -- Samsung's S3C2410 evaluation board. # @@ -295,9 +295,6 @@ ucom* at uplcom? portno ? uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/evbarm/conf/TS7200 diff -u src/sys/arch/evbarm/conf/TS7200:1.73 src/sys/arch/evbarm/conf/TS7200:1.74 --- src/sys/arch/evbarm/conf/TS7200:1.73 Wed Feb 6 11:58:31 2019 +++ src/sys/arch/evbarm/conf/TS7200 Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: TS7200,v 1.73 2019/02/06 11:58:31 rin Exp $ +# $NetBSD: TS7200,v 1.74 2020/01/29 18:39:01 maya Exp $ # # TS7200 - Kernel for Technologic Systems TS7200 ARM hardware # @@ -356,9 +356,6 @@ uhub* at uhub? port ? #ucom* at uvscom? portno ? #atu* at uhub? port ? # Atmel AT76C50XX 802.11b adapter -# Diamond Multimedia Rio 500 -# urio* at uhub? port ? - # USB Handspring Visor # uvisor* at uhub? port ? # ucom* at uvisor? Index: src/sys/arch/evbarm/conf/TWINTAIL diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.77 src/sys/arch/evbarm/conf/TWINTAIL:1.78 --- src/sys/arch/evbarm/conf/TWINTAIL:1.77 Sun Jan 19 20:00:37 2020 +++ src/sys/arch/evbarm/conf/TWINTAIL Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: TWINTAIL,v 1.77 2020/01/19 20:00:37 thorpej Exp $ +# $NetBSD: TWINTAIL,v 1.78 2020/01/29 18:39:01 maya Exp $ # # TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel # @@ -258,9 +258,6 @@ opio0 at obio? intr 2 #uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter #ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -#urio* at uhub? port ? - # USB Handspring Visor #uvisor* at uhub? port ? #ucom* at uvisor? Index: src/sys/arch/evbmips/conf/majors.evbmips diff -u src/sys/arch/evbmips/conf/majors.evbmips:1.34 src/sys/arch/evbmips/conf/majors.evbmips:1.35 --- src/sys/arch/evbmips/conf/majors.evbmips:1.34 Mon Jan 28 02:28:58 2019 +++ src/sys/arch/evbmips/conf/majors.evbmips Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.evbmips,v 1.34 2019/01/28 02:28:58 dholland Exp $ +# $NetBSD: majors.evbmips,v 1.35 2020/01/29 18:39:01 maya Exp $ # # Device majors for evbmips # @@ -62,7 +62,7 @@ device-major ses char 58 ses 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 Index: src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.28 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.29 --- src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.28 Sun Jan 19 20:00:37 2020 +++ src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: OPENBLOCKS266_OPT,v 1.28 2020/01/19 20:00:37 thorpej Exp $ +# $NetBSD: OPENBLOCKS266_OPT,v 1.29 2020/01/29 18:39:01 maya Exp $ # include "arch/evbppc/conf/OPENBLOCKS266" @@ -256,9 +256,6 @@ ucom* at uvscom? portno ? # RIM BlackBerry uberry* at uhub? port ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/evbppc/conf/PMPPC diff -u src/sys/arch/evbppc/conf/PMPPC:1.53 src/sys/arch/evbppc/conf/PMPPC:1.54 --- src/sys/arch/evbppc/conf/PMPPC:1.53 Sat Jan 25 18:38:35 2020 +++ src/sys/arch/evbppc/conf/PMPPC Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: PMPPC,v 1.53 2020/01/25 18:38:35 thorpej Exp $ +# $NetBSD: PMPPC,v 1.54 2020/01/29 18:39:01 maya Exp $ # # PMPPC # @@ -366,9 +366,6 @@ ucom* at uplcom? portno ? uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/evbppc/conf/majors.evbppc diff -u src/sys/arch/evbppc/conf/majors.evbppc:1.34 src/sys/arch/evbppc/conf/majors.evbppc:1.35 --- src/sys/arch/evbppc/conf/majors.evbppc:1.34 Mon Jan 28 02:28:58 2019 +++ src/sys/arch/evbppc/conf/majors.evbppc Wed Jan 29 18:39:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.evbppc,v 1.34 2019/01/28 02:28:58 dholland Exp $ +# $NetBSD: majors.evbppc,v 1.35 2020/01/29 18:39:01 maya Exp $ # # Device majors for evbppc # (When possible, make entries the same as macppc) @@ -53,7 +53,7 @@ device-major cy char 47 cy device-major audio char 48 audio device-major midi char 49 midi device-major sequencer char 50 sequencer -device-major urio char 51 urio +#device-major obsolete char 51 obsolete (urio) device-major uscanner char 52 uscanner # char 53 #device-major obsolete char 54 obsolete (isdn) Index: src/sys/arch/hpcarm/conf/majors.hpcarm diff -u src/sys/arch/hpcarm/conf/majors.hpcarm:1.15 src/sys/arch/hpcarm/conf/majors.hpcarm:1.16 --- src/sys/arch/hpcarm/conf/majors.hpcarm:1.15 Mon Jan 28 02:28:58 2019 +++ src/sys/arch/hpcarm/conf/majors.hpcarm Wed Jan 29 18:39:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.hpcarm,v 1.15 2019/01/28 02:28:58 dholland Exp $ +# $NetBSD: majors.hpcarm,v 1.16 2020/01/29 18:39:02 maya Exp $ # # Device majors for hpcarm # @@ -69,7 +69,7 @@ device-major raid char 71 block 71 rai 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 Index: src/sys/arch/hpcmips/conf/GENERIC diff -u src/sys/arch/hpcmips/conf/GENERIC:1.240 src/sys/arch/hpcmips/conf/GENERIC:1.241 --- src/sys/arch/hpcmips/conf/GENERIC:1.240 Fri Apr 26 21:40:30 2019 +++ src/sys/arch/hpcmips/conf/GENERIC Wed Jan 29 18:39:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.240 2019/04/26 21:40:30 sevan Exp $ +# $NetBSD: GENERIC,v 1.241 2020/01/29 18:39:02 maya Exp $ # # GENERIC machine description file # @@ -24,7 +24,7 @@ include "arch/hpcmips/conf/std.hpcmips. options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.240 $" +#ident "GENERIC-$Revision: 1.241 $" maxusers 16 @@ -624,9 +624,6 @@ ucom* at uplcom? portno ? umct* at uhub? port ? # MCT USB-RS232 serial adapter ucom* at umct? portno ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/hpcmips/conf/VR41XX diff -u src/sys/arch/hpcmips/conf/VR41XX:1.73 src/sys/arch/hpcmips/conf/VR41XX:1.74 --- src/sys/arch/hpcmips/conf/VR41XX:1.73 Sat Apr 13 08:22:59 2019 +++ src/sys/arch/hpcmips/conf/VR41XX Wed Jan 29 18:39:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: VR41XX,v 1.73 2019/04/13 08:22:59 isaki Exp $ +# $NetBSD: VR41XX,v 1.74 2020/01/29 18:39:02 maya Exp $ # # GENERIC machine description file # @@ -20,7 +20,7 @@ include "arch/hpcmips/conf/std.hpcmips" include "arch/hpcmips/conf/std.hpcmips.vr41" -#ident "GENERIC-$Revision: 1.73 $" +#ident "GENERIC-$Revision: 1.74 $" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary @@ -488,9 +488,6 @@ ucom* at uplcom? portno ? umct* at uhub? port ? # MCT USB-RS232 serial adapter ucom* at umct? portno ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/hpcmips/conf/majors.hpcmips diff -u src/sys/arch/hpcmips/conf/majors.hpcmips:1.33 src/sys/arch/hpcmips/conf/majors.hpcmips:1.34 --- src/sys/arch/hpcmips/conf/majors.hpcmips:1.33 Mon Jan 28 02:28:58 2019 +++ src/sys/arch/hpcmips/conf/majors.hpcmips Wed Jan 29 18:39:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.hpcmips,v 1.33 2019/01/28 02:28:58 dholland Exp $ +# $NetBSD: majors.hpcmips,v 1.34 2020/01/29 18:39:02 maya Exp $ # # Device majors for hpcmips # @@ -42,7 +42,7 @@ device-major txcom char 35 txcom device-major ucbsnd char 36 ucbsnd device-major ucom char 37 ucom device-major wsmux char 38 wsmux -device-major urio char 39 urio +#device-major obsolete char 39 obsolete (urio) device-major uscanner char 40 uscanner #device-major obsolete char 41 obsolete (isdn) #device-major obsolete char 42 obsolete (isdnctl) Index: src/sys/arch/hppa/conf/GENERIC diff -u src/sys/arch/hppa/conf/GENERIC:1.31 src/sys/arch/hppa/conf/GENERIC:1.32 --- src/sys/arch/hppa/conf/GENERIC:1.31 Sat Jan 25 18:38:36 2020 +++ src/sys/arch/hppa/conf/GENERIC Wed Jan 29 18:39:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.31 2020/01/25 18:38:36 thorpej Exp $ +# $NetBSD: GENERIC,v 1.32 2020/01/29 18:39:02 maya Exp $ # # GENERIC machine description file # @@ -23,7 +23,7 @@ include "arch/hppa/conf/std.hppa" options INCLUDE_CONFIG_FILE # embed config file in kernel binary options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel -#ident "GENERIC-$Revision: 1.31 $" +#ident "GENERIC-$Revision: 1.32 $" maxusers 32 # estimated number of users @@ -652,9 +652,6 @@ ucom* at uvscom? portno ? # RIM BlackBerry uberry* at uhub? port ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.486 src/sys/arch/i386/conf/ALL:1.487 --- src/sys/arch/i386/conf/ALL:1.486 Sat Jan 25 18:38:36 2020 +++ src/sys/arch/i386/conf/ALL Wed Jan 29 18:39:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.486 2020/01/25 18:38:36 thorpej Exp $ +# $NetBSD: ALL,v 1.487 2020/01/29 18:39:02 maya Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.486 $" +#ident "ALL-$Revision: 1.487 $" maxusers 64 # estimated number of users @@ -1403,9 +1403,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? Index: src/sys/arch/i386/conf/XEN3PAE_DOM0 diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.19 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.20 --- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.19 Sat Jan 25 18:38:36 2020 +++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Wed Jan 29 18:39:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3PAE_DOM0,v 1.19 2020/01/25 18:38:36 thorpej Exp $ +# $NetBSD: XEN3PAE_DOM0,v 1.20 2020/01/29 18:39:02 maya Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -642,9 +642,6 @@ ucom* at uplcom? portno ? uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/i386/conf/majors.i386 diff -u src/sys/arch/i386/conf/majors.i386:1.51 src/sys/arch/i386/conf/majors.i386:1.52 --- src/sys/arch/i386/conf/majors.i386:1.51 Mon Jan 28 02:28:58 2019 +++ src/sys/arch/i386/conf/majors.i386 Wed Jan 29 18:39:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.i386,v 1.51 2019/01/28 02:28:58 dholland Exp $ +# $NetBSD: majors.i386,v 1.52 2020/01/29 18:39:02 maya Exp $ # # Device majors for i386 # @@ -68,7 +68,7 @@ device-major ucom char 66 ucom device-major sysmon char 67 sysmon #device-major obsolete char 68 obsolete (vmegeneric) device-major ld char 69 block 19 ld -device-major urio char 70 urio +#device-major obsolete char 70 obsolete (urio) device-major bktr char 71 bktr device-major cz char 73 cz Index: src/sys/arch/ia64/conf/majors.ia64 diff -u src/sys/arch/ia64/conf/majors.ia64:1.17 src/sys/arch/ia64/conf/majors.ia64:1.18 --- src/sys/arch/ia64/conf/majors.ia64:1.17 Mon Jan 28 02:28:58 2019 +++ src/sys/arch/ia64/conf/majors.ia64 Wed Jan 29 18:39:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.ia64,v 1.17 2019/01/28 02:28:58 dholland Exp $ +# $NetBSD: majors.ia64,v 1.18 2020/01/29 18:39:02 maya Exp $ # # Device majors for ia64 # @@ -68,7 +68,7 @@ device-major ucom char 66 ucom device-major sysmon char 67 sysmon #device-major obsolete char 68 obsolete (vmegeneric) device-major ld char 69 block 19 ld -device-major urio char 70 urio +#device-major obsolete char 70 obsolete (urio) device-major bktr char 71 bktr device-major cz char 73 cz Index: src/sys/arch/landisk/conf/GENERIC diff -u src/sys/arch/landisk/conf/GENERIC:1.64 src/sys/arch/landisk/conf/GENERIC:1.65 --- src/sys/arch/landisk/conf/GENERIC:1.64 Sun Jan 19 01:25:06 2020 +++ src/sys/arch/landisk/conf/GENERIC Wed Jan 29 18:39:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.64 2020/01/19 01:25:06 thorpej Exp $ +# $NetBSD: GENERIC,v 1.65 2020/01/29 18:39:02 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.64 $" +#ident "GENERIC-$Revision: 1.65 $" maxusers 16 # estimated number of users @@ -352,9 +352,6 @@ ucom* at uplcom? portno ? uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/landisk/conf/majors.landisk diff -u src/sys/arch/landisk/conf/majors.landisk:1.9 src/sys/arch/landisk/conf/majors.landisk:1.10 --- src/sys/arch/landisk/conf/majors.landisk:1.9 Mon Jan 28 02:28:59 2019 +++ src/sys/arch/landisk/conf/majors.landisk Wed Jan 29 18:39:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.landisk,v 1.9 2019/01/28 02:28:59 dholland Exp $ +# $NetBSD: majors.landisk,v 1.10 2020/01/29 18:39:02 maya Exp $ # # Device majors for landisk # @@ -60,7 +60,7 @@ device-major ulpt char 66 ulpt device-major ugen char 67 ugen device-major ucom char 68 ucom device-major uscanner char 69 uscanner -device-major urio char 70 urio +#device-major obsolete char 70 obsolete (urio) device-major midi char 72 midi device-major sequencer char 73 sequencer Index: src/sys/arch/or1k/conf/majors.or1k diff -u src/sys/arch/or1k/conf/majors.or1k:1.2 src/sys/arch/or1k/conf/majors.or1k:1.3 --- src/sys/arch/or1k/conf/majors.or1k:1.2 Thu Apr 23 23:22:52 2015 +++ src/sys/arch/or1k/conf/majors.or1k Wed Jan 29 18:39:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.or1k,v 1.2 2015/04/23 23:22:52 pgoyette Exp $ +# $NetBSD: majors.or1k,v 1.3 2020/01/29 18:39:02 maya Exp $ # # Device majors for OpenRISC 1000 # @@ -61,7 +61,6 @@ device-major uhid char 81 uhid device-major ugen char 82 ugen device-major ulpt char 83 ulpt device-major ucom char 84 ucom -device-major urio char 85 urio device-major uscanner char 86 uscanner device-major agp char 90 agp Index: src/sys/arch/playstation2/conf/DEBUG diff -u src/sys/arch/playstation2/conf/DEBUG:1.25 src/sys/arch/playstation2/conf/DEBUG:1.26 --- src/sys/arch/playstation2/conf/DEBUG:1.25 Wed Feb 6 11:58:31 2019 +++ src/sys/arch/playstation2/conf/DEBUG Wed Jan 29 18:39:03 2020 @@ -1,7 +1,7 @@ # # kernel config file for debugging. # -# $NetBSD: DEBUG,v 1.25 2019/02/06 11:58:31 rin Exp $ +# $NetBSD: DEBUG,v 1.26 2020/01/29 18:39:03 maya Exp $ # include "arch/playstation2/conf/std.playstation2" @@ -97,9 +97,6 @@ ucom* at uplcom? portno ? umct* at uhub? port ? # MCT USB-RS232 serial adapter ucom* at umct? portno ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/playstation2/conf/majors.playstation2 diff -u src/sys/arch/playstation2/conf/majors.playstation2:1.23 src/sys/arch/playstation2/conf/majors.playstation2:1.24 --- src/sys/arch/playstation2/conf/majors.playstation2:1.23 Mon Jan 28 02:28:59 2019 +++ src/sys/arch/playstation2/conf/majors.playstation2 Wed Jan 29 18:39:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.playstation2,v 1.23 2019/01/28 02:28:59 dholland Exp $ +# $NetBSD: majors.playstation2,v 1.24 2020/01/29 18:39:03 maya Exp $ # # Device majors for playstation2 # @@ -39,7 +39,7 @@ device-major uhid char 32 uhid device-major ulpt char 33 ulpt device-major ugen char 34 ugen device-major ucom char 35 ucom -device-major urio char 36 urio +#device-major obsolete char 36 obsolete (urio) device-major uscanner char 37 uscanner device-major clockctl char 38 clockctl #device-major obsolete char 39 obsolete (systrace) Index: src/sys/arch/powerpc/conf/majors.powerpc diff -u src/sys/arch/powerpc/conf/majors.powerpc:1.14 src/sys/arch/powerpc/conf/majors.powerpc:1.15 --- src/sys/arch/powerpc/conf/majors.powerpc:1.14 Mon Jan 28 02:29:00 2019 +++ src/sys/arch/powerpc/conf/majors.powerpc Wed Jan 29 18:39:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.powerpc,v 1.14 2019/01/28 02:29:00 dholland Exp $ +# $NetBSD: majors.powerpc,v 1.15 2020/01/29 18:39:03 maya Exp $ # # Device majors for shared PowerPC # @@ -57,7 +57,7 @@ device-major audio char 48 audio device-major midi char 49 midi device-major sequencer char 50 sequencer -device-major urio char 51 urio +#device-major obsolete char 51 obsolete (urio) device-major uscanner char 52 uscanner device-major openfirm char 53 openfirm #device-major obsolete char 54 obsolete (isdn) Index: src/sys/arch/prep/conf/GENERIC diff -u src/sys/arch/prep/conf/GENERIC:1.190 src/sys/arch/prep/conf/GENERIC:1.191 --- src/sys/arch/prep/conf/GENERIC:1.190 Sun Jan 19 01:25:07 2020 +++ src/sys/arch/prep/conf/GENERIC Wed Jan 29 18:39:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.190 2020/01/19 01:25:07 thorpej Exp $ +# $NetBSD: GENERIC,v 1.191 2020/01/29 18:39:03 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/prep/conf/std.prep" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.190 $" +#ident "GENERIC-$Revision: 1.191 $" maxusers 32 @@ -460,9 +460,6 @@ ukphy* at mii? phy ? # generic unknown #uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter #ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -#urio* at uhub? port ? - # USB Handspring Visor #uvisor* at uhub? port ? #ucom* at uvisor? Index: src/sys/arch/sgimips/conf/majors.sgimips diff -u src/sys/arch/sgimips/conf/majors.sgimips:1.31 src/sys/arch/sgimips/conf/majors.sgimips:1.32 --- src/sys/arch/sgimips/conf/majors.sgimips:1.31 Mon Jan 28 02:29:00 2019 +++ src/sys/arch/sgimips/conf/majors.sgimips Wed Jan 29 18:39:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.sgimips,v 1.31 2019/01/28 02:29:00 dholland Exp $ +# $NetBSD: majors.sgimips,v 1.32 2020/01/29 18:39:03 maya Exp $ # # Device majors for sgimips # @@ -59,7 +59,7 @@ device-major audio char 64 audio device-major pci char 65 pci device-major irframe char 66 irframedrv device-major cir char 67 cir -device-major urio char 68 urio +#device-major obsolete char 68 obsolete (urio) device-major ucom char 69 ucom device-major ugen char 70 ugen device-major usb char 71 usb Index: src/sys/arch/sparc/conf/majors.sparc diff -u src/sys/arch/sparc/conf/majors.sparc:1.38 src/sys/arch/sparc/conf/majors.sparc:1.39 --- src/sys/arch/sparc/conf/majors.sparc:1.38 Mon Jan 28 02:29:00 2019 +++ src/sys/arch/sparc/conf/majors.sparc Wed Jan 29 18:39:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.sparc,v 1.38 2019/01/28 02:29:00 dholland Exp $ +# $NetBSD: majors.sparc,v 1.39 2020/01/29 18:39:03 maya Exp $ # # Device majors for sparc # @@ -74,7 +74,7 @@ device-major tctrl char 71 tctrl # sparc64: device-major ulpt char 80 ulpt # sparc64: device-major ugen char 81 ugen # sparc64: device-major ucom char 82 ucom -# sparc64: device-major urio char 83 urio +# sparc64: device-major urio char 83 obsolete (urio) # sparc64: device-major uscanner char 84 uscanner # sparc64: device-major radio char 85 radio Index: src/sys/arch/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.223 src/sys/arch/sparc64/conf/GENERIC:1.224 --- src/sys/arch/sparc64/conf/GENERIC:1.223 Sat Jan 25 18:38:36 2020 +++ src/sys/arch/sparc64/conf/GENERIC Wed Jan 29 18:39:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.223 2020/01/25 18:38:36 thorpej Exp $ +# $NetBSD: GENERIC,v 1.224 2020/01/29 18:39:03 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.223 $" +#ident "GENERIC-$Revision: 1.224 $" maxusers 64 @@ -644,9 +644,6 @@ ucom* at uplcom? portno ? uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - # USB Handspring Visor uvisor* at uhub? port ? ucom* at uvisor? Index: src/sys/arch/sparc64/conf/majors.sparc64 diff -u src/sys/arch/sparc64/conf/majors.sparc64:1.37 src/sys/arch/sparc64/conf/majors.sparc64:1.38 --- src/sys/arch/sparc64/conf/majors.sparc64:1.37 Mon Jan 28 02:29:00 2019 +++ src/sys/arch/sparc64/conf/majors.sparc64 Wed Jan 29 18:39:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.sparc64,v 1.37 2019/01/28 02:29:00 dholland Exp $ +# $NetBSD: majors.sparc64,v 1.38 2020/01/29 18:39:03 maya Exp $ # # Device majors for sparc64 # @@ -71,7 +71,7 @@ device-major uhid char 79 uhid device-major ulpt char 80 ulpt device-major ugen char 81 ugen device-major ucom char 82 ucom -device-major urio char 83 urio +#device-major obsolete char 83 obsolete (urio) device-major uscanner char 84 uscanner device-major radio char 85 radio Index: src/sys/arch/x68k/conf/GENERIC diff -u src/sys/arch/x68k/conf/GENERIC:1.196 src/sys/arch/x68k/conf/GENERIC:1.197 --- src/sys/arch/x68k/conf/GENERIC:1.196 Fri Apr 26 22:46:04 2019 +++ src/sys/arch/x68k/conf/GENERIC Wed Jan 29 18:39:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.196 2019/04/26 22:46:04 sevan Exp $ +# $NetBSD: GENERIC,v 1.197 2020/01/29 18:39:03 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.196 $" +#ident "GENERIC-$Revision: 1.197 $" makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk @@ -378,9 +378,6 @@ bmd* at intio0 addr 0xecebf0 # Nereid #uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter #ucom* at uvscom? portno ? -# Diamond Multimedia Rio 500 -#urio* at uhub? port ? - # USB Handspring Visor #uvisor* at uhub? port ? #ucom* at uvisor? Index: src/sys/arch/x68k/conf/majors.x68k diff -u src/sys/arch/x68k/conf/majors.x68k:1.30 src/sys/arch/x68k/conf/majors.x68k:1.31 --- src/sys/arch/x68k/conf/majors.x68k:1.30 Mon Jan 28 02:29:01 2019 +++ src/sys/arch/x68k/conf/majors.x68k Wed Jan 29 18:39:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.x68k,v 1.30 2019/01/28 02:29:01 dholland Exp $ +# $NetBSD: majors.x68k,v 1.31 2020/01/29 18:39:03 maya Exp $ # # Device majors for x68k # @@ -57,7 +57,7 @@ device-major ses char 55 ses device-major uhid char 56 uhid device-major ulpt char 57 ulpt device-major ucom char 58 ucom -device-major urio char 59 urio +#device-major obsolete char 59 obsolete (urio) device-major uscanner char 60 uscanner device-major sysmon char 61 sysmon device-major nsmb char 98 nsmb Index: src/sys/arch/zaurus/conf/majors.zaurus diff -u src/sys/arch/zaurus/conf/majors.zaurus:1.9 src/sys/arch/zaurus/conf/majors.zaurus:1.10 --- src/sys/arch/zaurus/conf/majors.zaurus:1.9 Mon Jan 28 02:29:01 2019 +++ src/sys/arch/zaurus/conf/majors.zaurus Wed Jan 29 18:39:04 2020 @@ -1,4 +1,4 @@ -# $NetBSD: majors.zaurus,v 1.9 2019/01/28 02:29:01 dholland Exp $ +# $NetBSD: majors.zaurus,v 1.10 2020/01/29 18:39:04 maya Exp $ # # Device majors for zaurus # @@ -69,7 +69,7 @@ device-major raid char 71 block 71 rai 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 Index: src/sys/dev/usb/FILES diff -u src/sys/dev/usb/FILES:1.13 src/sys/dev/usb/FILES:1.14 --- src/sys/dev/usb/FILES:1.13 Sun Dec 21 23:00:35 2014 +++ src/sys/dev/usb/FILES Wed Jan 29 18:39:04 2020 @@ -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 Index: src/sys/dev/usb/TODO.usbmp diff -u src/sys/dev/usb/TODO.usbmp:1.17 src/sys/dev/usb/TODO.usbmp:1.18 --- src/sys/dev/usb/TODO.usbmp:1.17 Fri Jan 17 15:00:20 2020 +++ src/sys/dev/usb/TODO.usbmp Wed Jan 29 18:39:04 2020 @@ -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_detac 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 Index: src/sys/dev/usb/usbdevices.config diff -u src/sys/dev/usb/usbdevices.config:1.36 src/sys/dev/usb/usbdevices.config:1.37 --- src/sys/dev/usb/usbdevices.config:1.36 Fri Sep 20 10:34:54 2019 +++ src/sys/dev/usb/usbdevices.config Wed Jan 29 18:39:04 2020 @@ -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?