svn commit: r190100 - in head: . share/man/man4 share/man/man5
sys/amd64/conf sys/arm/conf sys/boot/forth sys/conf
sys/dev/usb/image sys/i386/conf sys/modules/usb
sys/modules/usb/uscanner sys/pc98/...
Andrew Thompson
thompsa at FreeBSD.org
Thu Mar 19 13:33:27 PDT 2009
Author: thompsa
Date: Thu Mar 19 20:33:26 2009
New Revision: 190100
URL: http://svn.freebsd.org/changeset/base/190100
Log:
Remove the uscanner(4) driver, this follows the removal of the kernel scanner
driver in Linux 2.6. uscanner was just a simple wrapper around a fifo and
contained no logic, the default interface is now libusb (supported by sane).
Reviewed by: HPS
Deleted:
head/share/man/man4/uscanner.4
head/sys/dev/usb/image/uscanner.c
head/sys/modules/usb/uscanner/Makefile
Modified:
head/ObsoleteFiles.inc
head/UPDATING
head/share/man/man4/Makefile
head/share/man/man4/usb.4
head/share/man/man5/devfs.rules.5
head/sys/amd64/conf/GENERIC
head/sys/arm/conf/HL200
head/sys/arm/conf/KB920X
head/sys/boot/forth/loader.conf
head/sys/conf/NOTES
head/sys/conf/files
head/sys/i386/conf/GENERIC
head/sys/i386/conf/XBOX
head/sys/modules/usb/Makefile
head/sys/pc98/conf/GENERIC
head/sys/powerpc/conf/GENERIC
head/sys/sparc64/conf/GENERIC
head/sys/sun4v/conf/GENERIC
head/tools/tools/nanobsd/rescue/AMD64
head/tools/tools/nanobsd/rescue/I386
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Thu Mar 19 20:31:55 2009 (r190099)
+++ head/ObsoleteFiles.inc Thu Mar 19 20:33:26 2009 (r190100)
@@ -14,6 +14,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20090319: uscanner(4) has been removed
+OLD_FILES+=usr/share/man/man4/uscanner.4.gz
# 20090313: k8temp(4) renamed to amdtemp(4)
OLD_FILES+=usr/share/man/man4/k8temp.4.gz
# 20090308: libusb.so.1 renamed
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Thu Mar 19 20:31:55 2009 (r190099)
+++ head/UPDATING Thu Mar 19 20:33:26 2009 (r190100)
@@ -23,6 +23,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
ln -s aj /etc/malloc.conf.)
20090319:
+ The uscanner(4) driver has been removed from the kernel. This follows
+ Linux removing theirs in 2.6 and making libusb the default interface
+ (supported by sane).
+
+20090319:
The multicast forwarding code has been cleaned up. netstat(1)
only relies on KVM now for printing bandwidth upcall meters.
The IPv4 and IPv6 modules are split into ip_mroute_mod and
Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile Thu Mar 19 20:31:55 2009 (r190099)
+++ head/share/man/man4/Makefile Thu Mar 19 20:33:26 2009 (r190100)
@@ -421,7 +421,6 @@ MAN= aac.4 \
urio.4 \
${_urtw.4} \
usb.4 \
- uscanner.4 \
uslcom.4 \
utopia.4 \
uvisor.4 \
Modified: head/share/man/man4/usb.4
==============================================================================
--- head/share/man/man4/usb.4 Thu Mar 19 20:31:55 2009 (r190099)
+++ head/share/man/man4/usb.4 Thu Mar 19 20:33:26 2009 (r190100)
@@ -422,7 +422,6 @@ specifications can be found at:
.Xr ums 4 ,
.Xr uplcom 4 ,
.Xr urio 4 ,
-.Xr uscanner 4 ,
.Xr uvscom 4 ,
.Xr usbdevs 8
.Sh HISTORY
Modified: head/share/man/man5/devfs.rules.5
==============================================================================
--- head/share/man/man5/devfs.rules.5 Thu Mar 19 20:31:55 2009 (r190099)
+++ head/share/man/man5/devfs.rules.5 Thu Mar 19 20:33:26 2009 (r190100)
@@ -101,12 +101,12 @@ The first line declares and starts a new
and the number 10.
.Pp
To make all the
-.Xr uscanner 4
+.Xr ulpt 4
devices accessible to their owner and the
.Dq Li usb
group, a similar rule may be used:
.Pp
-.Dl "add path 'uscanner*' mode 0660 group usb"
+.Dl "add path 'ulpt*' mode 0660 group usb"
.Sh SEE ALSO
.Xr glob 3 ,
.Xr devfs 5 ,
Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/amd64/conf/GENERIC Thu Mar 19 20:33:26 2009 (r190100)
@@ -295,7 +295,6 @@ device ums # Mouse
device ural # Ralink Technology RT2500USB wireless NICs
device rum # Ralink Technology RT2501USB wireless NICs
device urio # Diamond Rio 500 MP3 player
-device uscanner # Scanners
# USB Serial devices
device uark # Technologies ARK3116 based serial adapters
device ubsa # Belkin F5U103 and compatible serial adapters
Modified: head/sys/arm/conf/HL200
==============================================================================
--- head/sys/arm/conf/HL200 Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/arm/conf/HL200 Thu Mar 19 20:33:26 2009 (r190100)
@@ -103,7 +103,6 @@ device umass # Disks/
device ural # Ralink Technology RT2500USB wireless NICs
device rum # Ralink Technology RT2501USB wireless NICs
device urio # Diamond Rio 500 MP3 player
-device uscanner # Scanners
# USB Ethernet, requires miibus
device miibus
device aue # ADMtek USB Ethernet
Modified: head/sys/arm/conf/KB920X
==============================================================================
--- head/sys/arm/conf/KB920X Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/arm/conf/KB920X Thu Mar 19 20:33:26 2009 (r190100)
@@ -104,7 +104,6 @@ device umass # Disks/
device ural # Ralink Technology RT2500USB wireless NICs
device rum # Ralink Technology RT2501USB wireless NICs
device urio # Diamond Rio 500 MP3 player
-device uscanner # Scanners
# USB Ethernet, requires miibus
device miibus
device aue # ADMtek USB Ethernet
Modified: head/sys/boot/forth/loader.conf
==============================================================================
--- head/sys/boot/forth/loader.conf Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/boot/forth/loader.conf Thu Mar 19 20:33:26 2009 (r190100)
@@ -379,7 +379,6 @@ ulpt_load="NO" # Printer
ums_load="NO" # Mouse
umass_load="NO" # Mass Storage Devices
umodem_load="NO" # Modems
-uscanner_load="NO" # Scanners
if_aue_load="NO" # ADMtek USB ethernet
if_axe_load="NO" # ASIX Electronics AX88172 USB ethernet
if_cue_load="NO" # CATC USB ethernet
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/conf/NOTES Thu Mar 19 20:33:26 2009 (r190100)
@@ -2413,8 +2413,6 @@ device umodem
device ums
# Diamond Rio 500 MP3 player
device urio
-# USB scanners
-device uscanner
#
# USB serial support
device ucom
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/conf/files Thu Mar 19 20:33:26 2009 (r190100)
@@ -1656,10 +1656,6 @@ dev/usb/template/usb_template_cdce.c opt
dev/usb/template/usb_template_msc.c optional usb_template
dev/usb/template/usb_template_mtp.c optional usb_template
#
-# USB image drivers
-#
-dev/usb/image/uscanner.c optional uscanner
-#
# USB END
#
dev/utopia/idtphy.c optional utopia
Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/i386/conf/GENERIC Thu Mar 19 20:33:26 2009 (r190100)
@@ -309,7 +309,6 @@ device ural # Ralink Technology RT2500
device rum # Ralink Technology RT2501USB wireless NICs
device zyd # ZyDAS zb1211/zb1211b wireless NICs
device urio # Diamond Rio 500 MP3 player
-device uscanner # Scanners
# USB Serial devices
device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device uark # Technologies ARK3116 based serial adapters
Modified: head/sys/i386/conf/XBOX
==============================================================================
--- head/sys/i386/conf/XBOX Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/i386/conf/XBOX Thu Mar 19 20:33:26 2009 (r190100)
@@ -91,7 +91,6 @@ device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
device urio # Diamond Rio 500 MP3 player
-device uscanner # Scanners
device miibus
device aue # ADMtek USB Ethernet
Modified: head/sys/modules/usb/Makefile
==============================================================================
--- head/sys/modules/usb/Makefile Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/modules/usb/Makefile Thu Mar 19 20:33:26 2009 (r190100)
@@ -29,7 +29,7 @@ SUBDIR = usb
#SUBDIR += ubt bluetooth_ng ubtfw
SUBDIR += ehci musb ohci uhci uss820dci ${_at91dci} ${_atmegadci}
SUBDIR += rum ural zyd
-SUBDIR += uhid ukbd ums udbp ufm uscanner
+SUBDIR += uhid ukbd ums udbp ufm
SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
umct umodem umoscom uplcom uslcom uvisor uvscom
SUBDIR += uether aue axe cdce cue kue rue udav
Modified: head/sys/pc98/conf/GENERIC
==============================================================================
--- head/sys/pc98/conf/GENERIC Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/pc98/conf/GENERIC Thu Mar 19 20:33:26 2009 (r190100)
@@ -265,7 +265,6 @@ device bpf # Berkeley packet filter
#device rum # Ralink Technology RT2501USB wireless NICs
#device zyd # ZyDAS zb1211/zb1211b wireless NICs
#device urio # Diamond Rio 500 MP3 player
-#device uscanner # Scanners
# USB Serial devices
#device uark # Technologies ARK3116 based serial adapters
#device ubsa # Belkin F5U103 and compatible serial adapters
Modified: head/sys/powerpc/conf/GENERIC
==============================================================================
--- head/sys/powerpc/conf/GENERIC Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/powerpc/conf/GENERIC Thu Mar 19 20:33:26 2009 (r190100)
@@ -140,7 +140,6 @@ device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da0
device ums # Mouse
device urio # Diamond Rio 500 MP3 player
-device uscanner # Scanners
# USB Ethernet
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/sparc64/conf/GENERIC Thu Mar 19 20:33:26 2009 (r190100)
@@ -230,7 +230,6 @@ device ukbd # Keyboard
#device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
#device urio # Diamond Rio 500 MP3 player
-#device uscanner # Scanners
# USB Ethernet, requires mii
#device aue # ADMtek USB Ethernet
#device axe # ASIX Electronics USB Ethernet
Modified: head/sys/sun4v/conf/GENERIC
==============================================================================
--- head/sys/sun4v/conf/GENERIC Thu Mar 19 20:31:55 2009 (r190099)
+++ head/sys/sun4v/conf/GENERIC Thu Mar 19 20:33:26 2009 (r190100)
@@ -191,7 +191,6 @@ device ulpt # Printer
#device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
#device urio # Diamond Rio 500 MP3 player
-#device uscanner # Scanners
# USB Ethernet, requires mii
#device aue # ADMtek USB Ethernet
#device axe # ASIX Electronics USB Ethernet
Modified: head/tools/tools/nanobsd/rescue/AMD64
==============================================================================
--- head/tools/tools/nanobsd/rescue/AMD64 Thu Mar 19 20:31:55 2009 (r190099)
+++ head/tools/tools/nanobsd/rescue/AMD64 Thu Mar 19 20:33:26 2009 (r190100)
@@ -296,7 +296,6 @@ device ums # Mouse
device ural # Ralink Technology RT2500USB wireless NICs
device rum # Ralink Technology RT2501USB wireless NICs
device urio # Diamond Rio 500 MP3 player
-device uscanner # Scanners
# USB Serial devices
device ucom # Generic com ttys
device uark # Technologies ARK3116 based serial adapters
Modified: head/tools/tools/nanobsd/rescue/I386
==============================================================================
--- head/tools/tools/nanobsd/rescue/I386 Thu Mar 19 20:31:55 2009 (r190099)
+++ head/tools/tools/nanobsd/rescue/I386 Thu Mar 19 20:33:26 2009 (r190100)
@@ -310,7 +310,6 @@ device ural # Ralink Technology RT2500
device rum # Ralink Technology RT2501USB wireless NICs
device zyd # ZyDAS zb1211/zb1211b wireless NICs
device urio # Diamond Rio 500 MP3 player
-device uscanner # Scanners
# USB Serial devices
device ucom # Generic com ttys
device u3g # USB-based 3G modems (Option, Huawei, Sierra)
More information about the svn-src-all
mailing list