Module Name: src
Committed By: nia
Date: Tue Jun 29 10:22:37 UTC 2021
Modified Files:
src/distrib/sets/lists/man: mi
src/etc: MAKEDEV.tmpl
src/share/man/man4: Makefile usb.4 usscanner.4
src/sys/arch/aarch64/conf: majors.aarch64
src/sys/arch/algor/conf: P4032 P5064 P6032 majors.algor
src/sys/arch/alpha/conf: GENERIC 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 TX3922 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/ofppc/conf: GENERIC
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/sandpoint/conf: GENERIC
src/sys/arch/sgimips/conf: majors.sgimips
src/sys/arch/sparc64/conf: majors.sparc64
src/sys/arch/x68k/conf: GENERIC majors.x68k
src/sys/arch/zaurus/conf: majors.zaurus
src/sys/dev: DEVNAMES
src/sys/dev/usb: FILES TODO.usbmp files.usb usbdevices.config
src/sys/rump/librump/rumpkern: devsw.c
Removed Files:
src/share/man/man4: uscanner.4
src/sys/dev/usb: uscanner.c
Log Message:
Remove uscanner(4) driver
This exists for compatibility with a Linux interface which was apparently
deprecated in Linux 2.6. There are various mailing list threads going
back to 2004 where the usefulness of this driver is discussed, but
the conclusion is that scanner software has all moved to using ugen(4)
instead, and enabling this driver will not help you scan things.
To generate a diff of this commit:
cvs rdiff -u -r1.1722 -r1.1723 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.222 -r1.223 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.713 -r1.714 src/share/man/man4/Makefile
cvs rdiff -u -r1.117 -r1.118 src/share/man/man4/usb.4
cvs rdiff -u -r1.12 -r0 src/share/man/man4/uscanner.4
cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/usscanner.4
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/conf/majors.aarch64
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/algor/conf/P4032
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/algor/conf/P5064
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/algor/conf/P6032
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/algor/conf/majors.algor
cvs rdiff -u -r1.411 -r1.412 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/alpha/conf/majors.alpha
cvs rdiff -u -r1.166 -r1.167 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.192 -r1.193 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amd64/conf/majors.amd64
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/arm/conf/majors.arm32
cvs rdiff -u -r1.183 -r1.184 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/cobalt/conf/majors.cobalt
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/epoc32/conf/majors.epoc32
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/HDL_G
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/MINI2440
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/POGO
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/evbarm/conf/SMDK2410
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/evbarm/conf/TS7200
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/evbarm/conf/TWINTAIL
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbmips/conf/majors.evbmips
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbppc/conf/PMPPC
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbppc/conf/majors.evbppc
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcarm/conf/majors.hpcarm
cvs rdiff -u -r1.244 -r1.245 src/sys/arch/hpcmips/conf/GENERIC
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/hpcmips/conf/TX3922
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/hpcmips/conf/VR41XX
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/hpcmips/conf/majors.hpcmips
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.498 -r1.499 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/i386/conf/majors.i386
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/ia64/conf/majors.ia64
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/landisk/conf/majors.landisk
cvs rdiff -u -r1.175 -r1.176 src/sys/arch/ofppc/conf/GENERIC
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/or1k/conf/majors.or1k
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/playstation2/conf/DEBUG
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/playstation2/conf/majors.playstation2
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/conf/majors.powerpc
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/prep/conf/GENERIC
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sgimips/conf/majors.sgimips
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sparc64/conf/majors.sparc64
cvs rdiff -u -r1.203 -r1.204 src/sys/arch/x68k/conf/GENERIC
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/x68k/conf/majors.x68k
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/zaurus/conf/majors.zaurus
cvs rdiff -u -r1.330 -r1.331 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/FILES
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/TODO.usbmp
cvs rdiff -u -r1.176 -r1.177 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/usb/usbdevices.config
cvs rdiff -u -r1.85 -r0 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpkern/devsw.c
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/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1722 src/distrib/sets/lists/man/mi:1.1723
--- src/distrib/sets/lists/man/mi:1.1722 Thu Jun 3 13:16:41 2021
+++ src/distrib/sets/lists/man/mi Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1722 2021/06/03 13:16:41 wiz Exp $
+# $NetBSD: mi,v 1.1723 2021/06/29 10:22:34 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1936,7 +1936,7 @@
./usr/share/man/cat4/usb.0 man-sys-catman .cat
./usr/share/man/cat4/usbnet.0 man-sys-catman .cat
./usr/share/man/cat4/usbtask.0 man-sys-catman .cat
-./usr/share/man/cat4/uscanner.0 man-sys-catman .cat
+./usr/share/man/cat4/uscanner.0 man-obsolete obsolete
./usr/share/man/cat4/userconf.0 man-sys-catman .cat
./usr/share/man/cat4/uslsa.0 man-sys-catman .cat
./usr/share/man/cat4/usmsc.0 man-sys-catman .cat
@@ -5096,7 +5096,7 @@
./usr/share/man/html4/usb.html man-sys-htmlman html
./usr/share/man/html4/usbnet.html man-sys-htmlman html
./usr/share/man/html4/usbtask.html man-sys-htmlman html
-./usr/share/man/html4/uscanner.html man-sys-htmlman html
+./usr/share/man/html4/uscanner.html man-obsolete obsolete
./usr/share/man/html4/userconf.html man-sys-htmlman html
./usr/share/man/html4/uslsa.html man-sys-htmlman html
./usr/share/man/html4/usmsc.html man-sys-htmlman html
@@ -8180,7 +8180,7 @@
./usr/share/man/man4/usb.4 man-sys-man .man
./usr/share/man/man4/usbnet.4 man-sys-man .man
./usr/share/man/man4/usbtask.4 man-sys-man .man
-./usr/share/man/man4/uscanner.4 man-sys-man .man
+./usr/share/man/man4/uscanner.4 man-obsolete obsolete
./usr/share/man/man4/userconf.4 man-sys-man .man
./usr/share/man/man4/uslsa.4 man-sys-man .man
./usr/share/man/man4/usmsc.4 man-sys-man .man
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.222 src/etc/MAKEDEV.tmpl:1.223
--- src/etc/MAKEDEV.tmpl:1.222 Sun Dec 6 02:57:29 2020
+++ src/etc/MAKEDEV.tmpl Tue Jun 29 10:22:33 2021
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.222 2020/12/06 02:57:29 jmcneill Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.223 2021/06/29 10:22:33 nia 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
-# uscanner* USB scanners
# ttyHS* USB Option N.V. modems
# ttyU* USB modems
# ttyY* USB serial adapters
@@ -924,7 +923,6 @@ usbs)
makedev ttyU0 ttyU1 ttyU2 ttyU3 ttyU4 ttyU5 ttyU6 ttyU7
makedev ttyY0 ttyY1
makedev ttyHS0
- 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))
;;
-uscanner[0-9]*)
- unit=${i#uscanner}
- mkdev uscanner$unit c %uscanner_chr% $unit
- ;;
-
utoppy[0-9]*)
unit=${i#utoppy}
mkdev utoppy$unit c %utoppy_chr% $unit
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.713 src/share/man/man4/Makefile:1.714
--- src/share/man/man4/Makefile:1.713 Mon May 17 04:07:42 2021
+++ src/share/man/man4/Makefile Tue Jun 29 10:22:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.713 2021/05/17 04:07:42 yamaguchi Exp $
+# $NetBSD: Makefile,v 1.714 2021/06/29 10:22:37 nia Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -88,7 +88,7 @@ MAN+= atu.4 aubtfwl.4 aue.4 axe.4 axen.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 url.4 urndis.4 urtw.4 urtwn.4 \
- usb.4 usbnet.4 uscanner.4 uslsa.4 usmsc.4 usscanner.4 \
+ usb.4 usbnet.4 uslsa.4 usmsc.4 usscanner.4 \
ustir.4 uthum.4 utoppy.4 uts.4 uvideo.4 uvisor.4 uvscom.4 uxrcom.4 \
xhci.4
Index: src/share/man/man4/usb.4
diff -u src/share/man/man4/usb.4:1.117 src/share/man/man4/usb.4:1.118
--- src/share/man/man4/usb.4:1.117 Sat Mar 27 08:01:21 2021
+++ src/share/man/man4/usb.4 Tue Jun 29 10:22:37 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: usb.4,v 1.117 2021/03/27 08:01:21 nia Exp $
+.\" $NetBSD: usb.4,v 1.118 2021/06/29 10:22:37 nia 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 March 27, 2021
+.Dd June 27, 2021
.Dt USB 4
.Os
.Sh NAME
@@ -213,8 +213,6 @@ Battery charging iOS devices via USB
USB IrDA bridges
.It Xr upl 4
Prolific based host-to-host adapters
-.It Xr uscanner 4
-USB scanner support
.It Xr usscanner 4
SCSI-over-USB scanners
.It Xr ustir 4
Index: src/share/man/man4/usscanner.4
diff -u src/share/man/man4/usscanner.4:1.6 src/share/man/man4/usscanner.4:1.7
--- src/share/man/man4/usscanner.4:1.6 Wed Apr 30 13:10:54 2008
+++ src/share/man/man4/usscanner.4 Tue Jun 29 10:22:37 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: usscanner.4,v 1.6 2008/04/30 13:10:54 martin Exp $
+.\" $NetBSD: usscanner.4,v 1.7 2021/06/29 10:22:37 nia Exp $
.\"
.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -53,7 +53,6 @@ driver works with the following scanners
.Sh SEE ALSO
.Xr scsi 4 ,
.Xr usb 4 ,
-.Xr uscanner 4 ,
.Pa pkgsrc/graphics/sane-backends
.Sh HISTORY
The
Index: src/sys/arch/aarch64/conf/majors.aarch64
diff -u src/sys/arch/aarch64/conf/majors.aarch64:1.6 src/sys/arch/aarch64/conf/majors.aarch64:1.7
--- src/sys/arch/aarch64/conf/majors.aarch64:1.6 Sat Apr 4 16:06:10 2020
+++ src/sys/arch/aarch64/conf/majors.aarch64 Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.aarch64,v 1.6 2020/04/04 16:06:10 jdolecek Exp $
+# $NetBSD: majors.aarch64,v 1.7 2021/06/29 10:22:34 nia Exp $
#
# Device majors for arm32
#
@@ -69,7 +69,7 @@ device-major ugen char 72 ugen
device-major wsmux char 73 wsmux
device-major ucom char 74 ucom
#device-major obsolete char 75 obsolete (urio)
-device-major uscanner char 76 uscanner
+#device-major obsolete char 76 obsolete (uscanner)
device-major openfirm char 77 openfirm
device-major biconsdev char 78 biconsdev
#device-major obsolete char 79 obsolete (isdn)
Index: src/sys/arch/algor/conf/P4032
diff -u src/sys/arch/algor/conf/P4032:1.82 src/sys/arch/algor/conf/P4032:1.83
--- src/sys/arch/algor/conf/P4032:1.82 Sat May 16 13:46:10 2020
+++ src/sys/arch/algor/conf/P4032 Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: P4032,v 1.82 2020/05/16 13:46:10 maya Exp $
+# $NetBSD: P4032,v 1.83 2021/06/29 10:22:34 nia Exp $
#
# Algorithmics P-4032 kernel.
#
@@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P4032-$Revision: 1.82 $"
+#ident "P4032-$Revision: 1.83 $"
maxusers 32
@@ -289,9 +289,6 @@ ukphy* at mii? phy ? # generic unknown
#ukyopon* at uhub? port ?
#ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB Generic driver
#ugen* at uhub? port ?
Index: src/sys/arch/algor/conf/P5064
diff -u src/sys/arch/algor/conf/P5064:1.93 src/sys/arch/algor/conf/P5064:1.94
--- src/sys/arch/algor/conf/P5064:1.93 Sat May 16 13:46:10 2020
+++ src/sys/arch/algor/conf/P5064 Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: P5064,v 1.93 2020/05/16 13:46:10 maya Exp $
+# $NetBSD: P5064,v 1.94 2021/06/29 10:22:34 nia Exp $
#
# Algorithmics P-5064 kernel.
#
@@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P5064-$Revision: 1.93 $"
+#ident "P5064-$Revision: 1.94 $"
maxusers 32
@@ -354,9 +354,6 @@ fd* at fdc? drive ?
#ukyopon* at uhub? port ?
#ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB Generic driver
#ugen* at uhub? port ?
Index: src/sys/arch/algor/conf/P6032
diff -u src/sys/arch/algor/conf/P6032:1.83 src/sys/arch/algor/conf/P6032:1.84
--- src/sys/arch/algor/conf/P6032:1.83 Sat May 16 13:46:10 2020
+++ src/sys/arch/algor/conf/P6032 Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: P6032,v 1.83 2020/05/16 13:46:10 maya Exp $
+# $NetBSD: P6032,v 1.84 2021/06/29 10:22:34 nia Exp $
#
# Algorithmics P-6032 kernel.
#
@@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P6032-$Revision: 1.83 $"
+#ident "P6032-$Revision: 1.84 $"
maxusers 32
@@ -358,9 +358,6 @@ fd* at fdc? drive ?
#ukyopon* at uhub? port ?
#ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB Generic driver
#ugen* at uhub? port ?
Index: src/sys/arch/algor/conf/majors.algor
diff -u src/sys/arch/algor/conf/majors.algor:1.29 src/sys/arch/algor/conf/majors.algor:1.30
--- src/sys/arch/algor/conf/majors.algor:1.29 Sat Apr 4 16:06:11 2020
+++ src/sys/arch/algor/conf/majors.algor Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.algor,v 1.29 2020/04/04 16:06:11 jdolecek Exp $
+# $NetBSD: majors.algor,v 1.30 2021/06/29 10:22:34 nia Exp $
#
# Device majors for algor
#
@@ -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 obsolete char 62 obsolete (urio)
-device-major uscanner char 63 uscanner
+#device-major obsolete char 63 obsolete (uscanner)
device-major altq char 64 altq
device-major mlx char 65 mlx
device-major clockctl char 66 clockctl
Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.411 src/sys/arch/alpha/conf/GENERIC:1.412
--- src/sys/arch/alpha/conf/GENERIC:1.411 Fri May 28 07:33:02 2021
+++ src/sys/arch/alpha/conf/GENERIC Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.411 2021/05/28 07:33:02 msaitoh Exp $
+# $NetBSD: GENERIC,v 1.412 2021/06/29 10:22:34 nia Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.411 $"
+ident "GENERIC-$Revision: 1.412 $"
maxusers 32
@@ -625,9 +625,6 @@ ucom* at uftdi? portno ?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# D-Link DSB-R100 USB FM radio tuner
udsbr* at uhub? port ?
radio* at udsbr?
Index: src/sys/arch/alpha/conf/majors.alpha
diff -u src/sys/arch/alpha/conf/majors.alpha:1.36 src/sys/arch/alpha/conf/majors.alpha:1.37
--- src/sys/arch/alpha/conf/majors.alpha:1.36 Sat Apr 4 16:06:11 2020
+++ src/sys/arch/alpha/conf/majors.alpha Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.alpha,v 1.36 2020/04/04 16:06:11 jdolecek Exp $
+# $NetBSD: majors.alpha,v 1.37 2021/06/29 10:22:34 nia Exp $
#
# Device majors for alpha
#
@@ -61,7 +61,7 @@ device-major ld char 59 block 17 ld
device-major cy char 60 cy
device-major cz char 61 cz
#device-major obsolete char 62 obsolete (urio)
-device-major uscanner char 63 uscanner
+#device-major obsolete char 63 obsolete (uscanner)
device-major altq char 64 altq
device-major mlx char 65 mlx
device-major pci char 66 pci
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.166 src/sys/arch/amd64/conf/ALL:1.167
--- src/sys/arch/amd64/conf/ALL:1.166 Mon Mar 1 17:53:29 2021
+++ src/sys/arch/amd64/conf/ALL Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.166 2021/03/01 17:53:29 jakllsch Exp $
+# $NetBSD: ALL,v 1.167 2021/06/29 10:22:34 nia 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.166 $"
+#ident "ALL-$Revision: 1.167 $"
maxusers 64 # estimated number of users
@@ -1318,9 +1318,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.192 src/sys/arch/amd64/conf/XEN3_DOM0:1.193
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.192 Fri Mar 5 20:30:56 2021
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.192 2021/03/05 20:30:56 gdt Exp $
+# $NetBSD: XEN3_DOM0,v 1.193 2021/06/29 10:22:34 nia Exp $
# XEN3_DOM0 machine description file
#
@@ -14,7 +14,7 @@ include "arch/amd64/conf/std.xen"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "XEN3_DOM0-$Revision: 1.192 $"
+#ident "XEN3_DOM0-$Revision: 1.193 $"
maxusers 32 # estimated number of users
@@ -1088,9 +1088,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/amd64/conf/majors.amd64
diff -u src/sys/arch/amd64/conf/majors.amd64:1.34 src/sys/arch/amd64/conf/majors.amd64:1.35
--- src/sys/arch/amd64/conf/majors.amd64:1.34 Sat Apr 4 16:06:11 2020
+++ src/sys/arch/amd64/conf/majors.amd64 Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.amd64,v 1.34 2020/04/04 16:06:11 jdolecek Exp $
+# $NetBSD: majors.amd64,v 1.35 2021/06/29 10:22:34 nia Exp $
#
# Device majors for amd64
#
@@ -69,7 +69,7 @@ device-major bktr char 71 bktr
device-major cz char 73 cz
device-major ses char 74 ses
-device-major uscanner char 75 uscanner
+#device-major obsolete char 75 obsolete (uscanner)
device-major iop char 76 iop
device-major altq char 77 altq
device-major mlx char 78 mlx
Index: src/sys/arch/arm/conf/majors.arm32
diff -u src/sys/arch/arm/conf/majors.arm32:1.41 src/sys/arch/arm/conf/majors.arm32:1.42
--- src/sys/arch/arm/conf/majors.arm32:1.41 Sat Apr 4 16:06:11 2020
+++ src/sys/arch/arm/conf/majors.arm32 Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.arm32,v 1.41 2020/04/04 16:06:11 jdolecek Exp $
+# $NetBSD: majors.arm32,v 1.42 2021/06/29 10:22:34 nia Exp $
#
# Device majors for arm32
#
@@ -72,7 +72,7 @@ device-major ugen char 72 ugen
device-major wsmux char 73 wsmux
device-major ucom char 74 ucom
#device-major obsolete char 75 obsolete (urio)
-device-major uscanner char 76 uscanner
+#device-major obsolete char 76 obsolete (uscanner)
device-major openfirm char 77 openfirm
device-major biconsdev char 78 biconsdev
#device-major obsolete char 79 obsolete (isdn)
Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.183 src/sys/arch/cats/conf/GENERIC:1.184
--- src/sys/arch/cats/conf/GENERIC:1.183 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/cats/conf/GENERIC Tue Jun 29 10:22:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.183 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: GENERIC,v 1.184 2021/06/29 10:22:34 nia Exp $
#
# GENERIC machine description file
#
@@ -403,9 +403,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
scsibus* at usscanner? channel ?
Index: src/sys/arch/cobalt/conf/majors.cobalt
diff -u src/sys/arch/cobalt/conf/majors.cobalt:1.35 src/sys/arch/cobalt/conf/majors.cobalt:1.36
--- src/sys/arch/cobalt/conf/majors.cobalt:1.35 Sat Apr 4 16:06:12 2020
+++ src/sys/arch/cobalt/conf/majors.cobalt Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.cobalt,v 1.35 2020/04/04 16:06:12 jdolecek Exp $
+# $NetBSD: majors.cobalt,v 1.36 2021/06/29 10:22:35 nia Exp $
#
# Device majors for cobalt
#
@@ -49,7 +49,7 @@ device-major ulpt char 42 ulpt
device-major ugen char 43 ugen
device-major ucom char 44 ucom
#device-major obsolete char 45 obsolete (urio)
-device-major uscanner char 46 uscanner
+#device-major obsolete char 46 obsolete (uscanner)
device-major audio char 47 audio
device-major midi char 48 midi
device-major sequencer char 49 sequencer
Index: src/sys/arch/epoc32/conf/majors.epoc32
diff -u src/sys/arch/epoc32/conf/majors.epoc32:1.6 src/sys/arch/epoc32/conf/majors.epoc32:1.7
--- src/sys/arch/epoc32/conf/majors.epoc32:1.6 Sat Apr 4 16:06:12 2020
+++ src/sys/arch/epoc32/conf/majors.epoc32 Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.epoc32,v 1.6 2020/04/04 16:06:12 jdolecek Exp $
+# $NetBSD: majors.epoc32,v 1.7 2021/06/29 10:22:35 nia Exp $
#
# Device majors for epoc32
#
@@ -69,7 +69,7 @@ device-major ugen char 72 ugen
device-major wsmux char 73 wsmux
device-major ucom char 74 ucom
#device-major obsolete char 75 obsolete (urio)
-device-major uscanner char 76 uscanner
+#device-major obsolete char 76 obsolete (uscanner)
device-major openfirm char 77 openfirm
device-major biconsdev char 78 biconsdev
#device-major obsolete char 79 obsolete (isdn)
Index: src/sys/arch/evbarm/conf/HDL_G
diff -u src/sys/arch/evbarm/conf/HDL_G:1.65 src/sys/arch/evbarm/conf/HDL_G:1.66
--- src/sys/arch/evbarm/conf/HDL_G:1.65 Wed Jan 20 01:20:26 2021
+++ src/sys/arch/evbarm/conf/HDL_G Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.65 2021/01/20 01:20:26 nia Exp $
+# $NetBSD: HDL_G,v 1.66 2021/06/29 10:22:35 nia Exp $
#
# HDL_G -- I-O DATA HDL-G Kernel
#
@@ -331,9 +331,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.51 src/sys/arch/evbarm/conf/HPT5325:1.52
--- src/sys/arch/evbarm/conf/HPT5325:1.51 Wed Jan 20 01:20:26 2021
+++ src/sys/arch/evbarm/conf/HPT5325 Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: HPT5325,v 1.51 2021/01/20 01:20:26 nia Exp $
+# $NetBSD: HPT5325,v 1.52 2021/06/29 10:22:35 nia Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@@ -349,9 +349,6 @@ ucom* at uvisor?
#ukyopon* at uhub? port ?
#ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/evbarm/conf/MINI2440
diff -u src/sys/arch/evbarm/conf/MINI2440:1.32 src/sys/arch/evbarm/conf/MINI2440:1.33
--- src/sys/arch/evbarm/conf/MINI2440:1.32 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/MINI2440 Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: MINI2440,v 1.32 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: MINI2440,v 1.33 2021/06/29 10:22:35 nia Exp $
#
# MINI2440 -- Friendly ARM evaluation board based on Samsung S3C2440
#
@@ -328,9 +328,6 @@ umass* at uhub? port ? configuration ? i
#ukyopon* at uhub? port ?
#ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
#usscanner* at uhub? port ?
Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.53 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.54
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.53 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.53 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: MMNET_GENERIC,v 1.54 2021/06/29 10:22:35 nia 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.53 $"
+#ident "GENERIC-$Revision: 1.54 $"
maxusers 32 # estimated number of users
@@ -453,9 +453,6 @@ ucom* at uvscom? portno ?
#ukyopon* at uhub? port ?
#ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
#usscanner* at uhub? port ?
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.74 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.75
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.74 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.74 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.75 2021/06/29 10:22:35 nia 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.74 $"
+#ident "GENERIC-$Revision: 1.75 $"
maxusers 32 # estimated number of users
@@ -513,9 +513,6 @@ ucom* at uvscom? portno ?
#ukyopon* at uhub? port ?
#ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
#usscanner* at uhub? port ?
Index: src/sys/arch/evbarm/conf/POGO
diff -u src/sys/arch/evbarm/conf/POGO:1.10 src/sys/arch/evbarm/conf/POGO:1.11
--- src/sys/arch/evbarm/conf/POGO:1.10 Thu Jan 21 06:18:22 2021
+++ src/sys/arch/evbarm/conf/POGO Tue Jun 29 10:22:35 2021
@@ -9,7 +9,6 @@ no uaudio*
no uberry*
no uvisor*
no ukyopon*
-#no uscanner*
no usscanner*
no utoppy*
no udsbr*
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.73 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.74
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.73 Wed Jan 20 01:20:26 2021
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.73 2021/01/20 01:20:26 nia Exp $
+# $NetBSD: SHEEVAPLUG,v 1.74 2021/06/29 10:22:35 nia Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -347,9 +347,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/evbarm/conf/SMDK2410
diff -u src/sys/arch/evbarm/conf/SMDK2410:1.77 src/sys/arch/evbarm/conf/SMDK2410:1.78
--- src/sys/arch/evbarm/conf/SMDK2410:1.77 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/SMDK2410 Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: SMDK2410,v 1.77 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: SMDK2410,v 1.78 2021/06/29 10:22:35 nia Exp $
#
# SMDK2410 -- Samsung's S3C2410 evaluation board.
#
@@ -303,9 +303,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/evbarm/conf/TS7200
diff -u src/sys/arch/evbarm/conf/TS7200:1.76 src/sys/arch/evbarm/conf/TS7200:1.77
--- src/sys/arch/evbarm/conf/TS7200:1.76 Sat May 16 13:46:11 2020
+++ src/sys/arch/evbarm/conf/TS7200 Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: TS7200,v 1.76 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: TS7200,v 1.77 2021/06/29 10:22:35 nia Exp $
#
# TS7200 - Kernel for Technologic Systems TS7200 ARM hardware
#
@@ -364,9 +364,6 @@ uhub* at uhub? port ?
#ukyopon* at uhub? port ?
#ucom* at ukyopon? portno ?
-# USB scanners
-# uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
# usscanner* at uhub? port ?
Index: src/sys/arch/evbarm/conf/TWINTAIL
diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.83 src/sys/arch/evbarm/conf/TWINTAIL:1.84
--- src/sys/arch/evbarm/conf/TWINTAIL:1.83 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/TWINTAIL Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: TWINTAIL,v 1.83 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: TWINTAIL,v 1.84 2021/06/29 10:22:35 nia Exp $
#
# TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
#
@@ -266,9 +266,6 @@ opio0 at obio? intr 2
#ukyopon* at uhub? port ?
#ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
#usscanner* at uhub? port ?
Index: src/sys/arch/evbmips/conf/majors.evbmips
diff -u src/sys/arch/evbmips/conf/majors.evbmips:1.37 src/sys/arch/evbmips/conf/majors.evbmips:1.38
--- src/sys/arch/evbmips/conf/majors.evbmips:1.37 Fri Jul 24 12:07:09 2020
+++ src/sys/arch/evbmips/conf/majors.evbmips Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.evbmips,v 1.37 2020/07/24 12:07:09 jmcneill Exp $
+# $NetBSD: majors.evbmips,v 1.38 2021/06/29 10:22:35 nia Exp $
#
# Device majors for evbmips
#
@@ -63,7 +63,7 @@ device-major ld char 59 block 17 ld
device-major cy char 60 cy
device-major cz char 61 cz
#device-major obsolete char 62 obsolete (urio)
-device-major uscanner char 63 uscanner
+#device-major obsolete char 63 obsolete (uscanner)
device-major altq char 64 altq
device-major mlx char 65 mlx
device-major pci char 66 pci
Index: src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.30 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.31
--- src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.30 Sat May 16 13:46:11 2020
+++ src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS266_OPT,v 1.30 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: OPENBLOCKS266_OPT,v 1.31 2021/06/29 10:22:35 nia Exp $
#
include "arch/evbppc/conf/OPENBLOCKS266"
@@ -264,9 +264,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/evbppc/conf/PMPPC
diff -u src/sys/arch/evbppc/conf/PMPPC:1.55 src/sys/arch/evbppc/conf/PMPPC:1.56
--- src/sys/arch/evbppc/conf/PMPPC:1.55 Sat May 16 13:46:11 2020
+++ src/sys/arch/evbppc/conf/PMPPC Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: PMPPC,v 1.55 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: PMPPC,v 1.56 2021/06/29 10:22:35 nia Exp $
#
# PMPPC
#
@@ -374,9 +374,6 @@ ucom* at uvisor?
#ukyopon* at uhub? port ?
#ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
#scsibus* at usscanner? channel ?
Index: src/sys/arch/evbppc/conf/majors.evbppc
diff -u src/sys/arch/evbppc/conf/majors.evbppc:1.36 src/sys/arch/evbppc/conf/majors.evbppc:1.37
--- src/sys/arch/evbppc/conf/majors.evbppc:1.36 Sat Apr 4 16:06:13 2020
+++ src/sys/arch/evbppc/conf/majors.evbppc Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.evbppc,v 1.36 2020/04/04 16:06:13 jdolecek Exp $
+# $NetBSD: majors.evbppc,v 1.37 2021/06/29 10:22:35 nia Exp $
#
# Device majors for evbppc
# (When possible, make entries the same as macppc)
@@ -54,7 +54,7 @@ device-major audio char 48 audio
device-major midi char 49 midi
device-major sequencer char 50 sequencer
#device-major obsolete char 51 obsolete (urio)
-device-major uscanner char 52 uscanner
+#device-major obsolete char 52 obsolete (uscanner)
# char 53
#device-major obsolete char 54 obsolete (isdn)
#device-major obsolete char 55 obsolete (isdnctl)
Index: src/sys/arch/hpcarm/conf/majors.hpcarm
diff -u src/sys/arch/hpcarm/conf/majors.hpcarm:1.17 src/sys/arch/hpcarm/conf/majors.hpcarm:1.18
--- src/sys/arch/hpcarm/conf/majors.hpcarm:1.17 Sat Apr 4 16:06:13 2020
+++ src/sys/arch/hpcarm/conf/majors.hpcarm Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.hpcarm,v 1.17 2020/04/04 16:06:13 jdolecek Exp $
+# $NetBSD: majors.hpcarm,v 1.18 2021/06/29 10:22:35 nia Exp $
#
# Device majors for hpcarm
#
@@ -70,7 +70,7 @@ device-major ugen char 72 ugen
device-major wsmux char 73 wsmux
device-major ucom char 74 ucom
#device-major obsolete char 75 obsolete (urio)
-device-major uscanner char 76 uscanner
+#device-major obsolete char 76 obsolete (uscanner)
device-major openfirm char 77 openfirm
device-major biconsdev char 78 biconsdev
#device-major obsolete char 79 obsolete (isdn)
Index: src/sys/arch/hpcmips/conf/GENERIC
diff -u src/sys/arch/hpcmips/conf/GENERIC:1.244 src/sys/arch/hpcmips/conf/GENERIC:1.245
--- src/sys/arch/hpcmips/conf/GENERIC:1.244 Tue Jan 12 08:03:19 2021
+++ src/sys/arch/hpcmips/conf/GENERIC Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.244 2021/01/12 08:03:19 skrll Exp $
+# $NetBSD: GENERIC,v 1.245 2021/06/29 10:22:35 nia 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.244 $"
+#ident "GENERIC-$Revision: 1.245 $"
maxusers 16
@@ -632,9 +632,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
scsibus* at usscanner? channel ?
Index: src/sys/arch/hpcmips/conf/TX3922
diff -u src/sys/arch/hpcmips/conf/TX3922:1.111 src/sys/arch/hpcmips/conf/TX3922:1.112
--- src/sys/arch/hpcmips/conf/TX3922:1.111 Sat May 16 13:46:11 2020
+++ src/sys/arch/hpcmips/conf/TX3922 Tue Jun 29 10:22:35 2021
@@ -1,7 +1,7 @@
#
# Distribution kernel (TOSHIBA TX3922 based model) kernel config file
#
-# $NetBSD: TX3922,v 1.111 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: TX3922,v 1.112 2021/06/29 10:22:35 nia Exp $
#
include "arch/hpcmips/conf/std.hpcmips"
@@ -242,9 +242,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB Generic driver
ugen* at uhub? port ?
Index: src/sys/arch/hpcmips/conf/VR41XX
diff -u src/sys/arch/hpcmips/conf/VR41XX:1.75 src/sys/arch/hpcmips/conf/VR41XX:1.76
--- src/sys/arch/hpcmips/conf/VR41XX:1.75 Sat May 16 13:46:11 2020
+++ src/sys/arch/hpcmips/conf/VR41XX Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: VR41XX,v 1.75 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: VR41XX,v 1.76 2021/06/29 10:22:35 nia 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.75 $"
+#ident "GENERIC-$Revision: 1.76 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -496,9 +496,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
scsibus* at usscanner? channel ?
Index: src/sys/arch/hpcmips/conf/majors.hpcmips
diff -u src/sys/arch/hpcmips/conf/majors.hpcmips:1.35 src/sys/arch/hpcmips/conf/majors.hpcmips:1.36
--- src/sys/arch/hpcmips/conf/majors.hpcmips:1.35 Sat Apr 4 16:06:13 2020
+++ src/sys/arch/hpcmips/conf/majors.hpcmips Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.hpcmips,v 1.35 2020/04/04 16:06:13 jdolecek Exp $
+# $NetBSD: majors.hpcmips,v 1.36 2021/06/29 10:22:35 nia Exp $
#
# Device majors for hpcmips
#
@@ -43,7 +43,7 @@ device-major ucbsnd char 36 ucbsnd
device-major ucom char 37 ucom
device-major wsmux char 38 wsmux
#device-major obsolete char 39 obsolete (urio)
-device-major uscanner char 40 uscanner
+#device-major obsolete char 40 obsolete (uscanner)
#device-major obsolete char 41 obsolete (isdn)
#device-major obsolete char 42 obsolete (isdnctl)
#device-major obsolete char 43 obsolete (isdnbchan)
Index: src/sys/arch/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.37 src/sys/arch/hppa/conf/GENERIC:1.38
--- src/sys/arch/hppa/conf/GENERIC:1.37 Thu Jan 21 06:51:55 2021
+++ src/sys/arch/hppa/conf/GENERIC Tue Jun 29 10:22:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.37 2021/01/21 06:51:55 nia Exp $
+# $NetBSD: GENERIC,v 1.38 2021/06/29 10:22:35 nia 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.37 $"
+#ident "GENERIC-$Revision: 1.38 $"
maxusers 32 # estimated number of users
@@ -664,9 +664,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.498 src/sys/arch/i386/conf/ALL:1.499
--- src/sys/arch/i386/conf/ALL:1.498 Mon Mar 1 17:53:29 2021
+++ src/sys/arch/i386/conf/ALL Tue Jun 29 10:22:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.498 2021/03/01 17:53:29 jakllsch Exp $
+# $NetBSD: ALL,v 1.499 2021/06/29 10:22:36 nia 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.498 $"
+#ident "ALL-$Revision: 1.499 $"
maxusers 64 # estimated number of users
@@ -1412,9 +1412,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.34 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.35
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.34 Wed Jan 20 13:22:08 2021
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Tue Jun 29 10:22:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.34 2021/01/20 13:22:08 nia Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.35 2021/06/29 10:22:36 nia Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -645,9 +645,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/i386/conf/majors.i386
diff -u src/sys/arch/i386/conf/majors.i386:1.53 src/sys/arch/i386/conf/majors.i386:1.54
--- src/sys/arch/i386/conf/majors.i386:1.53 Sat Apr 4 16:06:14 2020
+++ src/sys/arch/i386/conf/majors.i386 Tue Jun 29 10:22:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.i386,v 1.53 2020/04/04 16:06:14 jdolecek Exp $
+# $NetBSD: majors.i386,v 1.54 2021/06/29 10:22:36 nia Exp $
#
# Device majors for i386
#
@@ -73,7 +73,7 @@ device-major bktr char 71 bktr
device-major cz char 73 cz
device-major ses char 74 ses
-device-major uscanner char 75 uscanner
+#device-major obsolete char 75 obsolete (uscanner)
device-major iop char 76 iop
device-major altq char 77 altq
device-major mlx char 78 mlx
Index: src/sys/arch/ia64/conf/majors.ia64
diff -u src/sys/arch/ia64/conf/majors.ia64:1.19 src/sys/arch/ia64/conf/majors.ia64:1.20
--- src/sys/arch/ia64/conf/majors.ia64:1.19 Sat Apr 4 16:06:14 2020
+++ src/sys/arch/ia64/conf/majors.ia64 Tue Jun 29 10:22:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.ia64,v 1.19 2020/04/04 16:06:14 jdolecek Exp $
+# $NetBSD: majors.ia64,v 1.20 2021/06/29 10:22:36 nia Exp $
#
# Device majors for ia64
#
@@ -73,7 +73,7 @@ device-major bktr char 71 bktr
device-major cz char 73 cz
device-major ses char 74 ses
-device-major uscanner char 75 uscanner
+#device-major obsolete char 75 obsolete (uscanner)
device-major iop char 76 iop
device-major altq char 77 altq
device-major mlx char 78 mlx
Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.70 src/sys/arch/landisk/conf/GENERIC:1.71
--- src/sys/arch/landisk/conf/GENERIC:1.70 Wed Jan 20 13:22:08 2021
+++ src/sys/arch/landisk/conf/GENERIC Tue Jun 29 10:22:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.70 2021/01/20 13:22:08 nia Exp $
+# $NetBSD: GENERIC,v 1.71 2021/06/29 10:22:36 nia 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.70 $"
+#ident "GENERIC-$Revision: 1.71 $"
maxusers 16 # estimated number of users
@@ -358,9 +358,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/landisk/conf/majors.landisk
diff -u src/sys/arch/landisk/conf/majors.landisk:1.11 src/sys/arch/landisk/conf/majors.landisk:1.12
--- src/sys/arch/landisk/conf/majors.landisk:1.11 Sat Apr 4 16:06:14 2020
+++ src/sys/arch/landisk/conf/majors.landisk Tue Jun 29 10:22:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.landisk,v 1.11 2020/04/04 16:06:14 jdolecek Exp $
+# $NetBSD: majors.landisk,v 1.12 2021/06/29 10:22:36 nia Exp $
#
# Device majors for landisk
#
@@ -59,7 +59,7 @@ device-major uhid char 65 uhid
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 obsolete char 69 obsolete (uscanner)
#device-major obsolete char 70 obsolete (urio)
device-major midi char 72 midi
Index: src/sys/arch/ofppc/conf/GENERIC
diff -u src/sys/arch/ofppc/conf/GENERIC:1.175 src/sys/arch/ofppc/conf/GENERIC:1.176
--- src/sys/arch/ofppc/conf/GENERIC:1.175 Thu Jan 21 06:51:55 2021
+++ src/sys/arch/ofppc/conf/GENERIC Tue Jun 29 10:22:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.175 2021/01/21 06:51:55 nia Exp $
+# $NetBSD: GENERIC,v 1.176 2021/06/29 10:22:36 nia Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.175 $"
+#ident "GENERIC-$Revision: 1.176 $"
maxusers 32
@@ -370,7 +370,6 @@ uhso* at uhub? port ? configuration ?
#ukyopon* at uhub? port ? # Kyocera AIR-EDGE PHONE
#ucom* at ukyopon? portno ?
-#uscanner* at uhub? port ? # USB scanners
ugen* at uhub? port ? configuration ? interface ? # USB Generic driver
# USB 802.11 adapters
Index: src/sys/arch/or1k/conf/majors.or1k
diff -u src/sys/arch/or1k/conf/majors.or1k:1.4 src/sys/arch/or1k/conf/majors.or1k:1.5
--- src/sys/arch/or1k/conf/majors.or1k:1.4 Sat Apr 4 16:06:15 2020
+++ src/sys/arch/or1k/conf/majors.or1k Tue Jun 29 10:22:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.or1k,v 1.4 2020/04/04 16:06:15 jdolecek Exp $
+# $NetBSD: majors.or1k,v 1.5 2021/06/29 10:22:36 nia Exp $
#
# Device majors for OpenRISC 1000
#
@@ -61,7 +61,7 @@ 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 uscanner char 86 uscanner
+#device-major obsolete char 86 obsolete (uscanner)
device-major agp char 90 agp
device-major pci char 91 pci
Index: src/sys/arch/playstation2/conf/DEBUG
diff -u src/sys/arch/playstation2/conf/DEBUG:1.27 src/sys/arch/playstation2/conf/DEBUG:1.28
--- src/sys/arch/playstation2/conf/DEBUG:1.27 Sat May 16 13:46:11 2020
+++ src/sys/arch/playstation2/conf/DEBUG Tue Jun 29 10:22:36 2021
@@ -1,7 +1,7 @@
#
# kernel config file for debugging.
#
-# $NetBSD: DEBUG,v 1.27 2020/05/16 13:46:11 maya Exp $
+# $NetBSD: DEBUG,v 1.28 2021/06/29 10:22:36 nia Exp $
#
include "arch/playstation2/conf/std.playstation2"
@@ -105,9 +105,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
scsibus* at usscanner? channel ?
Index: src/sys/arch/playstation2/conf/majors.playstation2
diff -u src/sys/arch/playstation2/conf/majors.playstation2:1.25 src/sys/arch/playstation2/conf/majors.playstation2:1.26
--- src/sys/arch/playstation2/conf/majors.playstation2:1.25 Sat Apr 4 16:06:16 2020
+++ src/sys/arch/playstation2/conf/majors.playstation2 Tue Jun 29 10:22:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.playstation2,v 1.25 2020/04/04 16:06:16 jdolecek Exp $
+# $NetBSD: majors.playstation2,v 1.26 2021/06/29 10:22:36 nia Exp $
#
# Device majors for playstation2
#
@@ -40,7 +40,7 @@ device-major ulpt char 33 ulpt
device-major ugen char 34 ugen
device-major ucom char 35 ucom
#device-major obsolete char 36 obsolete (urio)
-device-major uscanner char 37 uscanner
+#device-major obsolete char 37 obsolete (uscanner)
device-major clockctl char 38 clockctl
#device-major obsolete char 39 obsolete (systrace)
device-major cgd char 40 block 10 cgd
Index: src/sys/arch/powerpc/conf/majors.powerpc
diff -u src/sys/arch/powerpc/conf/majors.powerpc:1.16 src/sys/arch/powerpc/conf/majors.powerpc:1.17
--- src/sys/arch/powerpc/conf/majors.powerpc:1.16 Sat Apr 4 16:06:16 2020
+++ src/sys/arch/powerpc/conf/majors.powerpc Tue Jun 29 10:22:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.powerpc,v 1.16 2020/04/04 16:06:16 jdolecek Exp $
+# $NetBSD: majors.powerpc,v 1.17 2021/06/29 10:22:36 nia Exp $
#
# Device majors for shared PowerPC
#
@@ -58,7 +58,7 @@ device-major midi char 49 midi
device-major sequencer char 50 sequencer
#device-major obsolete char 51 obsolete (urio)
-device-major uscanner char 52 uscanner
+#device-major obsolete char 52 obsolete (uscanner)
device-major openfirm char 53 openfirm
#device-major obsolete char 54 obsolete (isdn)
#device-major obsolete char 55 obsolete (isdnctl)
Index: src/sys/arch/prep/conf/GENERIC
diff -u src/sys/arch/prep/conf/GENERIC:1.195 src/sys/arch/prep/conf/GENERIC:1.196
--- src/sys/arch/prep/conf/GENERIC:1.195 Thu Jan 21 06:51:56 2021
+++ src/sys/arch/prep/conf/GENERIC Tue Jun 29 10:22:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.195 2021/01/21 06:51:56 nia Exp $
+# $NetBSD: GENERIC,v 1.196 2021/06/29 10:22:36 nia 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.195 $"
+#ident "GENERIC-$Revision: 1.196 $"
maxusers 32
@@ -472,10 +472,6 @@ ukphy* at mii? phy ? # generic unknown
# USB Generic driver
#ugen* at uhub? port ?
-# USB scanners
-#uscanner* at uhub? port ?
-
-
# Audio device
# ISA Plug-and-Play audio devices
Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.107 src/sys/arch/sandpoint/conf/GENERIC:1.108
--- src/sys/arch/sandpoint/conf/GENERIC:1.107 Thu Jan 21 06:51:56 2021
+++ src/sys/arch/sandpoint/conf/GENERIC Tue Jun 29 10:22:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.107 2021/01/21 06:51:56 nia Exp $
+# $NetBSD: GENERIC,v 1.108 2021/06/29 10:22:37 nia Exp $
#
# machine description file for GENERIC NAS
#
@@ -22,7 +22,7 @@ include "arch/sandpoint/conf/std.sandpo
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.107 $"
+#ident "GENERIC-$Revision: 1.108 $"
maxusers 32
@@ -255,8 +255,6 @@ ulpt* at uhub? port ? configuration ? in
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
-# USB scanners
-#uscanner* at uhub? port ?
ugen* at uhub? port ? configuration ? interface ? # USB Generic driver
# SCSI bus support
Index: src/sys/arch/sgimips/conf/majors.sgimips
diff -u src/sys/arch/sgimips/conf/majors.sgimips:1.33 src/sys/arch/sgimips/conf/majors.sgimips:1.34
--- src/sys/arch/sgimips/conf/majors.sgimips:1.33 Sat Apr 4 16:06:16 2020
+++ src/sys/arch/sgimips/conf/majors.sgimips Tue Jun 29 10:22:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.sgimips,v 1.33 2020/04/04 16:06:16 jdolecek Exp $
+# $NetBSD: majors.sgimips,v 1.34 2021/06/29 10:22:37 nia Exp $
#
# Device majors for sgimips
#
@@ -67,7 +67,7 @@ device-major uhid char 72 uhid
device-major ulpt char 73 ulpt
device-major midi char 74 midi
device-major sequencer char 75 sequencer
-device-major uscanner char 76 uscanner
+#device-major obsolete char 76 obsolete (uscanner)
device-major ksyms char 77 ksyms
device-major lpt char 78 lpt
device-major sysmon char 79 sysmon
Index: src/sys/arch/sparc64/conf/majors.sparc64
diff -u src/sys/arch/sparc64/conf/majors.sparc64:1.39 src/sys/arch/sparc64/conf/majors.sparc64:1.40
--- src/sys/arch/sparc64/conf/majors.sparc64:1.39 Sat Apr 4 16:06:16 2020
+++ src/sys/arch/sparc64/conf/majors.sparc64 Tue Jun 29 10:22:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.sparc64,v 1.39 2020/04/04 16:06:16 jdolecek Exp $
+# $NetBSD: majors.sparc64,v 1.40 2021/06/29 10:22:37 nia Exp $
#
# Device majors for sparc64
#
@@ -72,7 +72,7 @@ device-major ulpt char 80 ulpt
device-major ugen char 81 ugen
device-major ucom char 82 ucom
#device-major obsolete char 83 obsolete (urio)
-device-major uscanner char 84 uscanner
+#device-major obsolete char 84 obsolete (uscanner)
device-major radio char 85 radio
device-major wsdisplay char 90 wsdisplay
Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.203 src/sys/arch/x68k/conf/GENERIC:1.204
--- src/sys/arch/x68k/conf/GENERIC:1.203 Thu Jan 21 06:51:56 2021
+++ src/sys/arch/x68k/conf/GENERIC Tue Jun 29 10:22:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.203 2021/01/21 06:51:56 nia Exp $
+# $NetBSD: GENERIC,v 1.204 2021/06/29 10:22:37 nia 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.203 $"
+#ident "GENERIC-$Revision: 1.204 $"
makeoptions COPTS="-O2 -fno-reorder-blocks -fno-omit-frame-pointer"
# See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for
@@ -389,9 +389,6 @@ bmd* at intio0 addr 0xecebf0 # Nereid
#ukyopon* at uhub? port ?
#ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB scanners that use SCSI emulation, e.g., HP5300
#usscanner* at uhub? port ?
#scsibus* at usscanner? channel ?
Index: src/sys/arch/x68k/conf/majors.x68k
diff -u src/sys/arch/x68k/conf/majors.x68k:1.32 src/sys/arch/x68k/conf/majors.x68k:1.33
--- src/sys/arch/x68k/conf/majors.x68k:1.32 Sat Apr 4 16:06:17 2020
+++ src/sys/arch/x68k/conf/majors.x68k Tue Jun 29 10:22:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.x68k,v 1.32 2020/04/04 16:06:17 jdolecek Exp $
+# $NetBSD: majors.x68k,v 1.33 2021/06/29 10:22:37 nia Exp $
#
# Device majors for x68k
#
@@ -58,7 +58,7 @@ device-major uhid char 56 uhid
device-major ulpt char 57 ulpt
device-major ucom char 58 ucom
#device-major obsolete char 59 obsolete (urio)
-device-major uscanner char 60 uscanner
+#device-major obsolete char 60 obsolete (uscanner)
device-major sysmon char 61 sysmon
#device-major obsolete char 98 obsolete (nsmb)
Index: src/sys/arch/zaurus/conf/majors.zaurus
diff -u src/sys/arch/zaurus/conf/majors.zaurus:1.11 src/sys/arch/zaurus/conf/majors.zaurus:1.12
--- src/sys/arch/zaurus/conf/majors.zaurus:1.11 Sat Apr 4 16:06:17 2020
+++ src/sys/arch/zaurus/conf/majors.zaurus Tue Jun 29 10:22:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: majors.zaurus,v 1.11 2020/04/04 16:06:17 jdolecek Exp $
+# $NetBSD: majors.zaurus,v 1.12 2021/06/29 10:22:37 nia Exp $
#
# Device majors for zaurus
#
@@ -70,7 +70,7 @@ device-major ugen char 72 ugen
device-major wsmux char 73 wsmux
device-major ucom char 74 ucom
#device-major obsolete char 75 obsolete (urio)
-device-major uscanner char 76 uscanner
+#device-major obsolete char 76 obsolete (uscanner)
device-major openfirm char 77 openfirm
device-major biconsdev char 78 biconsdev
#device-major obsolete char 79 obsolete (isdn)
Index: src/sys/dev/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.330 src/sys/dev/DEVNAMES:1.331
--- src/sys/dev/DEVNAMES:1.330 Mon Mar 1 18:18:39 2021
+++ src/sys/dev/DEVNAMES Tue Jun 29 10:22:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.330 2021/03/01 18:18:39 jakllsch Exp $
+# $NetBSD: DEVNAMES,v 1.331 2021/06/29 10:22:33 nia Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -1424,7 +1424,6 @@ upc MI
upl MI
uplcom MI
ural MI
-urio MI
url MI
urlphy MI
urndis MI
@@ -1432,7 +1431,6 @@ urtw MI
urtwn MI
usb MI
usbus MI Attribute
-uscanner MI
usscanner MI
ustir MI
ut vax
Index: src/sys/dev/usb/FILES
diff -u src/sys/dev/usb/FILES:1.16 src/sys/dev/usb/FILES:1.17
--- src/sys/dev/usb/FILES:1.16 Sat May 16 13:46:12 2020
+++ src/sys/dev/usb/FILES Tue Jun 29 10:22:37 2021
@@ -69,7 +69,6 @@ usbdi.h API for usbdi.c
usbdi_util.c utilities built on top of usbdi.h
usbdi_util.h API for usbdi_util.c
usbdivar.h internal defines and structures for usbdi.c
-uscanner.c minimal USB scanner driver
usscanner.c driver for some SCSI-over-USB scanners
usbhid.h USB HID class definitions
uts.c USB touchscreen driver
Index: src/sys/dev/usb/TODO.usbmp
diff -u src/sys/dev/usb/TODO.usbmp:1.20 src/sys/dev/usb/TODO.usbmp:1.21
--- src/sys/dev/usb/TODO.usbmp:1.20 Thu Jun 24 23:00:14 2021
+++ src/sys/dev/usb/TODO.usbmp Tue Jun 29 10:22:37 2021
@@ -1,4 +1,4 @@
-$NetBSD: TODO.usbmp,v 1.20 2021/06/24 23:00:14 mrg Exp $
+$NetBSD: TODO.usbmp,v 1.21 2021/06/29 10:22:37 nia Exp $
the majority of the USB MP device interface is documented in usbdivar.h.
@@ -27,12 +27,10 @@ usb_detach_{waitold,wakeup} to usb_detac
- uhso.c
- uirda.c
- ulpt.c
- - uscanner.c
- usscanner.c
- ustir.c
- utoppy.c
-
use usb_delay_ms_locked() in places
@@ -71,7 +69,6 @@ splusb drivers to convert:
- ukbd.c
- ulpt.c
- usbdi.h
- - uscanner.c
- usscanner.c
- ustir.c
- utoppy.c
@@ -98,7 +95,6 @@ missing D_MPSAFE drivers:
- uhso
- ulpt
- usb
- - uscanner
- utoppy
missing CALLOUT_MPSAFE drivers:
@@ -154,7 +150,6 @@ driver testing: STATUS
- upl working
- uberry
- uipad
- - uscanner ? (must take kernel lock for scsipi)
- usscanner
- utoppy
- udsbr
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.176 src/sys/dev/usb/files.usb:1.177
--- src/sys/dev/usb/files.usb:1.176 Mon Jul 13 04:44:03 2020
+++ src/sys/dev/usb/files.usb Tue Jun 29 10:22:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.176 2020/07/13 04:44:03 mrg Exp $
+# $NetBSD: files.usb,v 1.177 2021/06/29 10:22:37 nia Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -460,12 +460,6 @@ device uchcom: ucombus
attach uchcom at usbdevif
file dev/usb/uchcom.c uchcom
-# Scanners
-# Generic scanner support
-device uscanner
-attach uscanner at usbdevif
-file dev/usb/uscanner.c uscanner needs-flag
-
# Avision SCSI over USB, HP5300
device usscanner: scsi
attach usscanner at usbdevif
Index: src/sys/dev/usb/usbdevices.config
diff -u src/sys/dev/usb/usbdevices.config:1.41 src/sys/dev/usb/usbdevices.config:1.42
--- src/sys/dev/usb/usbdevices.config:1.41 Sun Aug 16 02:38:06 2020
+++ src/sys/dev/usb/usbdevices.config Tue Jun 29 10:22:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: usbdevices.config,v 1.41 2020/08/16 02:38:06 riastradh Exp $
+# $NetBSD: usbdevices.config,v 1.42 2021/06/29 10:22:37 nia Exp $
#
# This file contains all USB related configuration.
# It is suitable for inclusion in a kernel config(5) file.
@@ -206,9 +206,6 @@ ucom* at uvisor?
ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ? # Scanners supported via ugen(4) mostly.
-
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
scsibus* at usscanner?
Index: src/sys/rump/librump/rumpkern/devsw.c
diff -u src/sys/rump/librump/rumpkern/devsw.c:1.10 src/sys/rump/librump/rumpkern/devsw.c:1.11
--- src/sys/rump/librump/rumpkern/devsw.c:1.10 Sun Jan 27 08:53:30 2019
+++ src/sys/rump/librump/rumpkern/devsw.c Tue Jun 29 10:22:33 2021
@@ -98,11 +98,9 @@ struct devsw_conv devsw_conv0[] = {
{ "sysmon", -1, 67, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "vmegeneric", -1, 68, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "ld", 19, 69, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
- { "urio", -1, 70, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "bktr", -1, 71, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "cz", -1, 73, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "ses", -1, 74, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
- { "uscanner", -1, 75, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "iop", -1, 76, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "altq", -1, 77, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "mlx", -1, 78, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
