Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove uscanner(4) driver
details: https://anonhg.NetBSD.org/src/rev/b3375ceccaf8
branches: trunk
changeset: 984245:b3375ceccaf8
user: nia <nia%NetBSD.org@localhost>
date: Tue Jun 29 10:22:33 2021 +0000
description:
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.
diffstat:
distrib/sets/lists/man/mi | 8 +-
etc/MAKEDEV.tmpl | 9 +-
share/man/man4/Makefile | 4 +-
share/man/man4/usb.4 | 6 +-
share/man/man4/uscanner.4 | 97 ---
share/man/man4/usscanner.4 | 3 +-
sys/arch/aarch64/conf/majors.aarch64 | 4 +-
sys/arch/algor/conf/P4032 | 7 +-
sys/arch/algor/conf/P5064 | 7 +-
sys/arch/algor/conf/P6032 | 7 +-
sys/arch/algor/conf/majors.algor | 4 +-
sys/arch/alpha/conf/GENERIC | 7 +-
sys/arch/alpha/conf/majors.alpha | 4 +-
sys/arch/amd64/conf/ALL | 7 +-
sys/arch/amd64/conf/XEN3_DOM0 | 7 +-
sys/arch/amd64/conf/majors.amd64 | 4 +-
sys/arch/arm/conf/majors.arm32 | 4 +-
sys/arch/cats/conf/GENERIC | 5 +-
sys/arch/cobalt/conf/majors.cobalt | 4 +-
sys/arch/epoc32/conf/majors.epoc32 | 4 +-
sys/arch/evbarm/conf/HDL_G | 5 +-
sys/arch/evbarm/conf/HPT5325 | 5 +-
sys/arch/evbarm/conf/MINI2440 | 5 +-
sys/arch/evbarm/conf/MMNET_GENERIC | 7 +-
sys/arch/evbarm/conf/MPCSA_GENERIC | 7 +-
sys/arch/evbarm/conf/POGO | 1 -
sys/arch/evbarm/conf/SHEEVAPLUG | 5 +-
sys/arch/evbarm/conf/SMDK2410 | 5 +-
sys/arch/evbarm/conf/TS7200 | 5 +-
sys/arch/evbarm/conf/TWINTAIL | 5 +-
sys/arch/evbmips/conf/majors.evbmips | 4 +-
sys/arch/evbppc/conf/OPENBLOCKS266_OPT | 5 +-
sys/arch/evbppc/conf/PMPPC | 5 +-
sys/arch/evbppc/conf/majors.evbppc | 4 +-
sys/arch/hpcarm/conf/majors.hpcarm | 4 +-
sys/arch/hpcmips/conf/GENERIC | 7 +-
sys/arch/hpcmips/conf/TX3922 | 5 +-
sys/arch/hpcmips/conf/VR41XX | 7 +-
sys/arch/hpcmips/conf/majors.hpcmips | 4 +-
sys/arch/hppa/conf/GENERIC | 7 +-
sys/arch/i386/conf/ALL | 7 +-
sys/arch/i386/conf/XEN3PAE_DOM0 | 5 +-
sys/arch/i386/conf/majors.i386 | 4 +-
sys/arch/ia64/conf/majors.ia64 | 4 +-
sys/arch/landisk/conf/GENERIC | 7 +-
sys/arch/landisk/conf/majors.landisk | 4 +-
sys/arch/ofppc/conf/GENERIC | 5 +-
sys/arch/or1k/conf/majors.or1k | 4 +-
sys/arch/playstation2/conf/DEBUG | 5 +-
sys/arch/playstation2/conf/majors.playstation2 | 4 +-
sys/arch/powerpc/conf/majors.powerpc | 4 +-
sys/arch/prep/conf/GENERIC | 8 +-
sys/arch/sandpoint/conf/GENERIC | 6 +-
sys/arch/sgimips/conf/majors.sgimips | 4 +-
sys/arch/sparc64/conf/majors.sparc64 | 4 +-
sys/arch/x68k/conf/GENERIC | 7 +-
sys/arch/x68k/conf/majors.x68k | 4 +-
sys/arch/zaurus/conf/majors.zaurus | 4 +-
sys/dev/DEVNAMES | 4 +-
sys/dev/usb/FILES | 1 -
sys/dev/usb/TODO.usbmp | 7 +-
sys/dev/usb/files.usb | 8 +-
sys/dev/usb/usbdevices.config | 5 +-
sys/dev/usb/uscanner.c | 726 -------------------------
sys/rump/librump/rumpkern/devsw.c | 2 -
65 files changed, 103 insertions(+), 1044 deletions(-)
diffs (truncated from 2221 to 300 lines):
diff -r 37a719d40f6e -r b3375ceccaf8 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Tue Jun 29 10:12:35 2021 +0000
+++ b/distrib/sets/lists/man/mi Tue Jun 29 10:22:33 2021 +0000
@@ -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
diff -r 37a719d40f6e -r b3375ceccaf8 etc/MAKEDEV.tmpl
--- a/etc/MAKEDEV.tmpl Tue Jun 29 10:12:35 2021 +0000
+++ b/etc/MAKEDEV.tmpl Tue Jun 29 10:22:33 2021 +0000
@@ -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 @@
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 @@
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
diff -r 37a719d40f6e -r b3375ceccaf8 share/man/man4/Makefile
--- a/share/man/man4/Makefile Tue Jun 29 10:12:35 2021 +0000
+++ b/share/man/man4/Makefile Tue Jun 29 10:22:33 2021 +0000
@@ -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 @@
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
diff -r 37a719d40f6e -r b3375ceccaf8 share/man/man4/usb.4
--- a/share/man/man4/usb.4 Tue Jun 29 10:12:35 2021 +0000
+++ b/share/man/man4/usb.4 Tue Jun 29 10:22:33 2021 +0000
@@ -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 @@
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
diff -r 37a719d40f6e -r b3375ceccaf8 share/man/man4/uscanner.4
--- a/share/man/man4/uscanner.4 Tue Jun 29 10:12:35 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-.\" $NetBSD: uscanner.4,v 1.12 2011/09/20 19:31:47 wiz Exp $
-.\"
-.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Lennart Augustsson.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd September 10, 2000
-.Dt USCANNER 4
-.Os
-.Sh NAME
-.Nm uscanner
-.Nd minimal USB support for scanners
-.Sh SYNOPSIS
-.Cd "uscanner* at uhub?"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides minimal support for USB scanners.
-The driver recognizes a number of USB scanners, but to
-actually scan anything there needs to be software that knows
-about the particular scanner.
-The SANE package provides support for some scanners.
-.Sh HARDWARE
-The
-.Nm
-driver works with the following scanners:
-.Ss Epson
-.Bl -tag -width Dv -offset indent -compact
-.It GT-7000
-.It Perfection 610U
-.It Perfection 636U
-.It Perfection 1200U
-.It Perfection 1200U Photo
-.It Perfection 1260
-.It Perfection 1660
-.It Perfection 2400
-.El
-.Ss HP
-.Bl -tag -width Fl -offset indent -compact
-.It ScanJet 4100C
-.It ScanJet 5200C
-.\" .It ScanJet 5300C
-.It ScanJet 6300C
-.El
-.\" .Ss Microtek
-.\" .Bl -tag -width -offset indent -compact
-.\" .It ScanMaker X6USB
-.\" .El
-.Pp
-Many other scanners are recognized, but there is no software support
-for them yet.
-.Sh SEE ALSO
-.Xr scanimage 1 ,
-.Xr usb 4 ,
-.Xr usscanner 4
-.Rs
-.%T USB Scanners under Linux
-.%U http://www.buzzard.org.uk/jonathan/scanners-usb.html
-.Re
-.Sh HISTORY
-The
-.Nm
-driver
-appeared in
-.Nx 1.6 .
-.Sh BUGS
-This driver should not really exist.
-The scanners it recognizes can be accessed through the
-.Xr ugen 4
-driver instead.
-A proper scanner driver would provide a uniform interface to scanners
-instead of exposing the innards of the scanner.
-The reason the driver exists is to have something that is compatible
-with the Linux driver.
diff -r 37a719d40f6e -r b3375ceccaf8 share/man/man4/usscanner.4
--- a/share/man/man4/usscanner.4 Tue Jun 29 10:12:35 2021 +0000
+++ b/share/man/man4/usscanner.4 Tue Jun 29 10:22:33 2021 +0000
@@ -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 @@
.Sh SEE ALSO
.Xr scsi 4 ,
.Xr usb 4 ,
-.Xr uscanner 4 ,
.Pa pkgsrc/graphics/sane-backends
.Sh HISTORY
The
diff -r 37a719d40f6e -r b3375ceccaf8 sys/arch/aarch64/conf/majors.aarch64
--- a/sys/arch/aarch64/conf/majors.aarch64 Tue Jun 29 10:12:35 2021 +0000
+++ b/sys/arch/aarch64/conf/majors.aarch64 Tue Jun 29 10:22:33 2021 +0000
@@ -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 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)
diff -r 37a719d40f6e -r b3375ceccaf8 sys/arch/algor/conf/P4032
--- a/sys/arch/algor/conf/P4032 Tue Jun 29 10:12:35 2021 +0000
+++ b/sys/arch/algor/conf/P4032 Tue Jun 29 10:22:33 2021 +0000
@@ -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 @@
#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 @@
#ukyopon* at uhub? port ?
#ucom* at ukyopon? portno ?
-# USB scanners
-#uscanner* at uhub? port ?
-
# USB Generic driver
#ugen* at uhub? port ?
diff -r 37a719d40f6e -r b3375ceccaf8 sys/arch/algor/conf/P5064
--- a/sys/arch/algor/conf/P5064 Tue Jun 29 10:12:35 2021 +0000
+++ b/sys/arch/algor/conf/P5064 Tue Jun 29 10:22:33 2021 +0000
@@ -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 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P5064-$Revision: 1.93 $"
+#ident "P5064-$Revision: 1.94 $"
maxusers 32
Home |
Main Index |
Thread Index |
Old Index