summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ObsoleteFiles.inc2
-rw-r--r--UPDATING5
-rw-r--r--share/man/man4/Makefile1
-rw-r--r--share/man/man4/usb.41
-rw-r--r--share/man/man4/uscanner.4164
-rw-r--r--share/man/man5/devfs.rules.54
-rw-r--r--sys/amd64/conf/GENERIC1
-rw-r--r--sys/arm/conf/HL2001
-rw-r--r--sys/arm/conf/KB920X1
-rw-r--r--sys/boot/forth/loader.conf1
-rw-r--r--sys/conf/NOTES2
-rw-r--r--sys/conf/files4
-rw-r--r--sys/dev/usb/image/uscanner.c641
-rw-r--r--sys/i386/conf/GENERIC1
-rw-r--r--sys/i386/conf/XBOX1
-rw-r--r--sys/modules/usb/Makefile2
-rw-r--r--sys/modules/usb/uscanner/Makefile36
-rw-r--r--sys/pc98/conf/GENERIC1
-rw-r--r--sys/powerpc/conf/GENERIC1
-rw-r--r--sys/sparc64/conf/GENERIC1
-rw-r--r--sys/sun4v/conf/GENERIC1
-rw-r--r--tools/tools/nanobsd/rescue/AMD641
-rw-r--r--tools/tools/nanobsd/rescue/I3861
23 files changed, 10 insertions, 864 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 1832566..3ddda76 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -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
diff --git a/UPDATING b/UPDATING
index 3864a0d..e4cc7c3 100644
--- a/UPDATING
+++ b/UPDATING
@@ -23,6 +23,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW:
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
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 88bdbc6..07fb89e 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -421,7 +421,6 @@ MAN= aac.4 \
urio.4 \
${_urtw.4} \
usb.4 \
- uscanner.4 \
uslcom.4 \
utopia.4 \
uvisor.4 \
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index f9af2f4..665ab57 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -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
diff --git a/share/man/man4/uscanner.4 b/share/man/man4/uscanner.4
deleted file mode 100644
index c135732..0000000
--- a/share/man/man4/uscanner.4
+++ /dev/null
@@ -1,164 +0,0 @@
-.\" Copyright (c) 2000, Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
-.\" All rights reserved.
-.\"
-.\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by Bill Paul.
-.\" 4. Neither the name of the author nor the names of any co-contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY NICK HIBMA 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 NICK HIBMA OR THE VOICES IN HIS HEAD
-.\" 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd December 23, 2008
-.Dt USCANNER 4
-.Os
-.Sh NAME
-.Nm uscanner
-.Nd USB Scanners
-.Sh SYNOPSIS
-To compile this driver into the kernel,
-place the following line in your
-kernel configuration file:
-.Bd -ragged -offset indent
-.Cd "device uscanner"
-.Ed
-.Pp
-Alternatively, to load the driver as a
-module at boot time, place the following line in
-.Xr loader.conf 5 :
-.Bd -literal -offset indent
-uscanner_load="YES"
-.Ed
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for scanners that attach to the USB port.
-For each scanner attached it will provide an entry like
-.Pa /dev/uscanner0
-in
-.Pa /dev .
-User-space programs, e.g. SANE,
-can in turn use the device entry throgh a suitable
-backend driver (see
-.Nm ports/graphics/sane-backends )
-to control the scanner itself.
-.Pp
-In case of multifunction USB devices (e.g. scanner/printer/card reader),
-this driver only attaches to the USB interface that controls
-the scanner; for the other USB interface you need separate drivers, e.g.
-.Nm ulpt ,
-.Nm umass ,
-and so on.
-.Pp
-.Nm usb
-and one of
-.Nm uhci
-or
-.Nm ohci
-must be configured in the kernel as well.
-.Sh HARDWARE
-Because there is no standard device class for USB scanners, this driver
-will only recognise devices whose USB IDs are explicitly listed in the
-table in the driver itself.
-.Pp
-The following devices are supported to date:
-.Pp
-.Bl -bullet -compact
-.It
-Acer Acerscan: 320U, 620U, 640U, 640BT, 1240U, C310U;
-.It
-AGFA SnapScan: 1212U, 1236U, e20, e25, e26, e40, e50, e52, SnapScan Touch;
-.It
-Avision 1200U
-.It
-Canon CanoScan: D660U, N656U, N676U, N1220U, LIDE 20, LIDE 25, LIDE 30;
-.It
-Epson Perfection: 610, 636U / 636Photo, 640U, 1200U / 1200Photo,
-1240U / 1240Photo, 1250, 1260, 1270,
-1600, 1640SU, 1650, 1660, 1670,
-2480,
-3200, 3500, 3590,
-4200, 4990;
-.It
-Epson: GT-8400UF, GT-9300UF, GT-9700F;
-.It
-Epson Stylus: Photo RX425, CX3650, DX-5000, DX-5050, CX5400, DX-6000,
-DX-6050, DX-8400/50 (and possibly more in the CX-5000 and DX-3800..DX-7000
-family);
-.It
-Hewlett Packard: Photosmart S20
-.It
-Hewlett Packard Scanjet: 2200C,
-3300C, 3400CSE,
-4100C, 4200C, 4300C,
-4470C,
-5200C, 5300C, 5400C,
-6200C, 6300C,
-8200C, 8250C, 8290C;
-.It
-KYE ColorPage Vivid-Pro
-.It
-Microtek Phantom: 336CX, C6;
-.It
-Microtek ScanMaker: V6UL V6USL, X6U;
-.It
-Minolta 5400
-.It
-Mustek: 600 CU, 1200 CU, 1200 UB, 1200 USB;
-.It
-Mustek BearPaw: 1200F, 1200TA;
-.It
-NatSemi BearPaw 1200
-.It
-Nikon CoolScan LS40 ED
-.It
-Primax 6200
-.It
-Primax Colorado: 1200u, 600u, USB 19200, USB 9600;
-.It
-Primax: G2-200, G2-300, G2-600, G2600, G2E-300, G2E-3002, G2E-600, G2E600,
-G2X-300,
-G600,
-ReadyScan 636i;
-.It
-Ultima 1200 UB Plus
-.It
-UMAX Astra: 1220U, 1236U, 2000U, 2100U, 2200U, 3400;
-.It
-Visioneer OneTouch: 3000, 5300, 7600, 6100, 6200, 8100, 8600;
-.El
-.Sh SEE ALSO
-.Xr ohci 4 ,
-.Xr uhci 4 ,
-.Xr usb 4
-.\".Sh HISTORY
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-driver was written by
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
-.Pp
-This manual page was written by
-.An Jeroen Ruigrok van der Werven Aq asmodai@FreeBSD.org .
diff --git a/share/man/man5/devfs.rules.5 b/share/man/man5/devfs.rules.5
index 3722cea..cc641ec 100644
--- a/share/man/man5/devfs.rules.5
+++ b/share/man/man5/devfs.rules.5
@@ -101,12 +101,12 @@ The first line declares and starts a new ruleset, with the name
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 ,
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 197de84..2a097a6 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -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
diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200
index 5bbce3f..de322ec 100644
--- a/sys/arm/conf/HL200
+++ b/sys/arm/conf/HL200
@@ -103,7 +103,6 @@ device umass # Disks/Mass storage - Requires scbus and da
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
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index 00af54b..1f688f8 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -104,7 +104,6 @@ device umass # Disks/Mass storage - Requires scbus and da
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
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index d6a8516..cfab0e9 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -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
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index b4951f9..318caa2 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2413,8 +2413,6 @@ device umodem
device ums
# Diamond Rio 500 MP3 player
device urio
-# USB scanners
-device uscanner
#
# USB serial support
device ucom
diff --git a/sys/conf/files b/sys/conf/files
index 8863887..475dc9c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1656,10 +1656,6 @@ dev/usb/template/usb_template_cdce.c optional usb_template
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
diff --git a/sys/dev/usb/image/uscanner.c b/sys/dev/usb/image/uscanner.c
deleted file mode 100644
index 946b35e..0000000
--- a/sys/dev/usb/image/uscanner.c
+++ /dev/null
@@ -1,641 +0,0 @@
-/* $NetBSD: uscanner.c,v 1.30 2002/07/11 21:14:36 augustss Exp$ */
-
-/* Also already merged from NetBSD:
- * $NetBSD: uscanner.c,v 1.33 2002/09/23 05:51:24 simonb Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology
- * and Nick Hibma (n_hibma@qubesoft.com).
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * 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.
- */
-
-#include "usbdevs.h"
-#include <dev/usb/usb.h>
-#include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_error.h>
-
-#define USB_DEBUG_VAR uscanner_debug
-
-#include <dev/usb/usb_core.h>
-#include <dev/usb/usb_debug.h>
-#include <dev/usb/usb_process.h>
-#include <dev/usb/usb_request.h>
-#include <dev/usb/usb_lookup.h>
-#include <dev/usb/usb_util.h>
-#include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_mbuf.h>
-#include <dev/usb/usb_dev.h>
-
-#if USB_DEBUG
-static int uscanner_debug = 0;
-
-SYSCTL_NODE(_hw_usb2, OID_AUTO, uscanner, CTLFLAG_RW, 0, "USB uscanner");
-SYSCTL_INT(_hw_usb2_uscanner, OID_AUTO, debug, CTLFLAG_RW, &uscanner_debug,
- 0, "uscanner debug level");
-#endif
-
-/*
- * uscanner transfers macros definition.
- */
-#define USCANNER_BSIZE (1 << 15)
-#define USCANNER_IFQ_MAXLEN 2
-
-/*
- * Transfers stallings handling flags definition.
- */
-#define USCANNER_FLAG_READ_STALL 0x01
-#define USCANNER_FLAG_WRITE_STALL 0x02
-
-/*
- * uscanner_info flags definition.
- */
-#define USCANNER_FLAG_KEEP_OPEN 0x04
-
-enum {
- USCANNER_BULK_DT_WR,
- USCANNER_BULK_DT_RD,
- USCANNER_BULK_CS_WR,
- USCANNER_BULK_CS_RD,
- USCANNER_N_TRANSFER = 4,
-};
-
-struct uscanner_softc {
- struct usb2_fifo_sc sc_fifo;
- struct mtx sc_mtx;
-
- struct usb2_xfer *sc_xfer[USCANNER_N_TRANSFER];
-
- uint8_t sc_flags; /* Used to prevent stalls */
-};
-
-/*
- * Prototypes for driver handling routines (sorted by use).
- */
-static device_probe_t uscanner_probe;
-static device_attach_t uscanner_attach;
-static device_detach_t uscanner_detach;
-
-/*
- * Prototypes for xfer transfer callbacks.
- */
-static usb2_callback_t uscanner_read_callback;
-static usb2_callback_t uscanner_read_clear_stall_callback;
-static usb2_callback_t uscanner_write_callback;
-static usb2_callback_t uscanner_write_clear_stall_callback;
-
-/*
- * Prototypes for the character device handling routines.
- */
-static usb2_fifo_close_t uscanner_close;
-static usb2_fifo_cmd_t uscanner_start_read;
-static usb2_fifo_cmd_t uscanner_start_write;
-static usb2_fifo_cmd_t uscanner_stop_read;
-static usb2_fifo_cmd_t uscanner_stop_write;
-static usb2_fifo_open_t uscanner_open;
-
-static struct usb2_fifo_methods uscanner_fifo_methods = {
- .f_close = &uscanner_close,
- .f_open = &uscanner_open,
- .f_start_read = &uscanner_start_read,
- .f_start_write = &uscanner_start_write,
- .f_stop_read = &uscanner_stop_read,
- .f_stop_write = &uscanner_stop_write,
- .basename[0] = "uscanner",
-};
-
-/*
- * xfer transfers array. Resolve-stalling callbacks are marked as control
- * transfers.
- */
-static const struct usb2_config uscanner_config[USCANNER_N_TRANSFER] = {
- [USCANNER_BULK_DT_WR] = {
- .type = UE_BULK,
- .endpoint = UE_ADDR_ANY,
- .direction = UE_DIR_OUT,
- .mh.bufsize = USCANNER_BSIZE,
- .mh.flags = {.pipe_bof = 1,.proxy_buffer = 1,},
- .mh.callback = &uscanner_write_callback,
- },
-
- [USCANNER_BULK_DT_RD] = {
- .type = UE_BULK,
- .endpoint = UE_ADDR_ANY,
- .direction = UE_DIR_IN,
- .mh.bufsize = USCANNER_BSIZE,
- .mh.flags = {.pipe_bof = 1,.proxy_buffer = 1,.short_xfer_ok = 1,},
- .mh.callback = &uscanner_read_callback,
- },
-
- [USCANNER_BULK_CS_WR] = {
- .type = UE_CONTROL,
- .endpoint = 0x00, /* Control pipe */
- .direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
- .mh.callback = &uscanner_write_clear_stall_callback,
- .mh.timeout = 1000,
- .mh.interval = 50, /* 50ms */
- },
-
- [USCANNER_BULK_CS_RD] = {
- .type = UE_CONTROL,
- .endpoint = 0x00,
- .direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
- .mh.callback = &uscanner_read_clear_stall_callback,
- .mh.timeout = 1000,
- .mh.interval = 50, /* 50ms */
- },
-};
-
-static devclass_t uscanner_devclass;
-
-static device_method_t uscanner_methods[] = {
- DEVMETHOD(device_probe, uscanner_probe),
- DEVMETHOD(device_attach, uscanner_attach),
- DEVMETHOD(device_detach, uscanner_detach),
- {0, 0}
-};
-
-static driver_t uscanner_driver = {
- .name = "uscanner",
- .methods = uscanner_methods,
- .size = sizeof(struct uscanner_softc),
-};
-
-DRIVER_MODULE(uscanner, uhub, uscanner_driver, uscanner_devclass, NULL, 0);
-MODULE_DEPEND(uscanner, usb, 1, 1, 1);
-
-/*
- * USB scanners device IDs
- */
-static const struct usb2_device_id uscanner_devs[] = {
- /* Acer */
- {USB_VPI(USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_320U, 0)},
- {USB_VPI(USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_640U, 0)},
- {USB_VPI(USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_640BT, 0)},
- {USB_VPI(USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_620U, 0)},
- {USB_VPI(USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_1240U, 0)},
- {USB_VPI(USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U, 0)},
- {USB_VPI(USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_4300U, 0)},
- /* AGFA */
- {USB_VPI(USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1236U, 0)},
- {USB_VPI(USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U, 0)},
- {USB_VPI(USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U2, 0)},
- {USB_VPI(USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANTOUCH, 0)},
- {USB_VPI(USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE40, 0)},
- {USB_VPI(USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE50, 0)},
- {USB_VPI(USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE20, 0)},
- {USB_VPI(USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE25, 0)},
- {USB_VPI(USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE26, 0)},
- {USB_VPI(USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE52, 0)},
- /* Avision */
- {USB_VPI(USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U, 0)},
- /* Canon */
- {USB_VPI(USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U, 0)},
- {USB_VPI(USB_VENDOR_CANON, USB_PRODUCT_CANON_N676U, 0)},
- {USB_VPI(USB_VENDOR_CANON, USB_PRODUCT_CANON_N1220U, 0)},
- {USB_VPI(USB_VENDOR_CANON, USB_PRODUCT_CANON_D660U, 0)},
- {USB_VPI(USB_VENDOR_CANON, USB_PRODUCT_CANON_N1240U, 0)},
- {USB_VPI(USB_VENDOR_CANON, USB_PRODUCT_CANON_LIDE25, 0)},
- /* Epson */
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_636, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_610, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1200, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1240, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1250, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1270, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1640, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_640U, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1650, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1660, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1670, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1260, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_RX425, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3200, USCANNER_FLAG_KEEP_OPEN)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F, USCANNER_FLAG_KEEP_OPEN)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_CX5400, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX7400, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9300UF, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2480, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3500, USCANNER_FLAG_KEEP_OPEN)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3590, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4200, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4800, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4990, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_5000, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_6000, 0)},
- {USB_VPI(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX8400, 0)},
- /* HP */
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_2200C, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_3300C, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_3400CSE, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_4100C, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_4200C, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_4300C, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_4470C, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_4670V, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_S20, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_5200C, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_5300C, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_5400C, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_6200C, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_6300C, 0)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_82x0C, 0)},
- /* Kye */
- {USB_VPI(USB_VENDOR_KYE, USB_PRODUCT_KYE_VIVIDPRO, 0)},
- /* Microtek */
- {USB_VPI(USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U, 0)},
- {USB_VPI(USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX, 0)},
- {USB_VPI(USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX2, 0)},
- {USB_VPI(USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_C6, 0)},
- {USB_VPI(USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL, 0)},
- {USB_VPI(USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL2, 0)},
- {USB_VPI(USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6UL, 0)},
- /* Minolta */
- {USB_VPI(USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_5400, 0)},
- /* Mustek */
- {USB_VPI(USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU, 0)},
- {USB_VPI(USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_BEARPAW1200F, 0)},
- {USB_VPI(USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_BEARPAW1200TA, 0)},
- {USB_VPI(USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600USB, 0)},
- {USB_VPI(USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600CU, 0)},
- {USB_VPI(USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USB, 0)},
- {USB_VPI(USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200UB, 0)},
- {USB_VPI(USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USBPLUS, 0)},
- {USB_VPI(USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CUPLUS, 0)},
- /* National */
- {USB_VPI(USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200, 0)},
- {USB_VPI(USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW2400, 0)},
- /* Nikon */
- {USB_VPI(USB_VENDOR_NIKON, USB_PRODUCT_NIKON_LS40, 0)},
- /* Primax */
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300, 0)},
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300, 0)},
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2300, 0)},
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E3002, 0)},
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_9600, 0)},
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_600U, 0)},
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_6200, 0)},
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_19200, 0)},
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_1200U, 0)},
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G600, 0)},
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_636I, 0)},
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2600, 0)},
- {USB_VPI(USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E600, 0)},
- /* Scanlogic */
- {USB_VPI(USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX, 0)},
- /* Ultima */
- {USB_VPI(USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS, 0)},
- /* UMAX */
- {USB_VPI(USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U, 0)},
- {USB_VPI(USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U, 0)},
- {USB_VPI(USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U, 0)},
- {USB_VPI(USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2100U, 0)},
- {USB_VPI(USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U, 0)},
- {USB_VPI(USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA3400, 0)},
- /* Visioneer */
- {USB_VPI(USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_3000, 0)},
- {USB_VPI(USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_5300, 0)},
- {USB_VPI(USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_7600, 0)},
- {USB_VPI(USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6100, 0)},
- {USB_VPI(USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6200, 0)},
- {USB_VPI(USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8100, 0)},
- {USB_VPI(USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8600, 0)}
-};
-
-/*
- * uscanner device probing method.
- */
-static int
-uscanner_probe(device_t dev)
-{
- struct usb2_attach_arg *uaa;
-
- DPRINTFN(11, "\n");
-
- uaa = device_get_ivars(dev);
- if (uaa->usb2_mode != USB_MODE_HOST) {
- return (ENXIO);
- }
- /* Give other class drivers a chance for multifunctional scanners. */
- if (uaa->use_generic == 0) {
- return (ENXIO);
- }
- return (usb2_lookup_id_by_uaa(uscanner_devs, sizeof(uscanner_devs), uaa));
-}
-
-/*
- * uscanner device attaching method.
- */
-static int
-uscanner_attach(device_t dev)
-{
- struct usb2_attach_arg *uaa;
- struct uscanner_softc *sc;
- int unit;
- int error;
-
- uaa = device_get_ivars(dev);
- sc = device_get_softc(dev);
- unit = device_get_unit(dev);
-
- /*
- * A first path softc structure filling. sc_fifo and
- * sc_xfer are initialised later.
- */
- sc->sc_flags = USB_GET_DRIVER_INFO(uaa);
- mtx_init(&sc->sc_mtx, "uscanner mutex", NULL, MTX_DEF | MTX_RECURSE);
-
- /*
- * Announce the device:
- */
- device_set_usb2_desc(dev);
-
- /*
- * Setup the transfer.
- */
- if ((error = usb2_transfer_setup(uaa->device, &uaa->info.bIfaceIndex, sc->sc_xfer,
- uscanner_config, USCANNER_N_TRANSFER, sc, &sc->sc_mtx))) {
- device_printf(dev, "could not setup transfers, "
- "error=%s\n", usb2_errstr(error));
- goto detach;
- }
-
- error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx,
- &uscanner_fifo_methods, &sc->sc_fifo,
- unit, 0 - 1, uaa->info.bIfaceIndex,
- UID_ROOT, GID_OPERATOR, 0644);
- if (error) {
- goto detach;
- }
- return (0);
-
-detach:
- uscanner_detach(dev);
- return (ENOMEM);
-}
-
-/*
- * uscanner device detaching method.
- */
-static int
-uscanner_detach(device_t dev)
-{
- struct uscanner_softc *sc;
-
- sc = device_get_softc(dev);
-
- usb2_fifo_detach(&sc->sc_fifo);
- usb2_transfer_unsetup(sc->sc_xfer, USCANNER_N_TRANSFER);
- mtx_destroy(&sc->sc_mtx);
-
- return (0);
-}
-
-/*
- * Reading callback. Implemented as an "in" bulk transfer.
- */
-static void
-uscanner_read_callback(struct usb2_xfer *xfer)
-{
- struct uscanner_softc *sc;
- struct usb2_fifo *f;
-
- sc = xfer->priv_sc;
- f = sc->sc_fifo.fp[USB_FIFO_RX];
-
- switch (USB_GET_STATE(xfer)) {
- case USB_ST_TRANSFERRED:
- usb2_fifo_put_data(f, xfer->frbuffers, 0,
- xfer->actlen, 1);
-
- case USB_ST_SETUP:
- /*
- * If reading is in stall, just jump to clear stall callback and
- * solve the situation.
- */
- if (sc->sc_flags & USCANNER_FLAG_READ_STALL) {
- usb2_transfer_start(sc->sc_xfer[USCANNER_BULK_CS_RD]);
- break;
- }
- if (usb2_fifo_put_bytes_max(f) != 0) {
- xfer->frlengths[0] = xfer->max_data_length;
- usb2_start_hardware(xfer);
- }
- break;
-
- default: /* Error */
- if (xfer->error != USB_ERR_CANCELLED) {
- sc->sc_flags |= USCANNER_FLAG_READ_STALL;
- usb2_transfer_start(sc->sc_xfer[USCANNER_BULK_CS_RD]);
- }
- break;
- }
-}
-
-/*
- * Removing stall on reading callback.
- */
-static void
-uscanner_read_clear_stall_callback(struct usb2_xfer *xfer)
-{
- struct uscanner_softc *sc = xfer->priv_sc;
- struct usb2_xfer *xfer_other = sc->sc_xfer[USCANNER_BULK_DT_RD];
-
- if (usb2_clear_stall_callback(xfer, xfer_other)) {
- DPRINTF("stall cleared\n");
- sc->sc_flags &= ~USCANNER_FLAG_READ_STALL;
- usb2_transfer_start(xfer_other);
- }
-}
-
-/*
- * Writing callback. Implemented as an "out" bulk transfer.
- */
-static void
-uscanner_write_callback(struct usb2_xfer *xfer)
-{
- struct uscanner_softc *sc;
- struct usb2_fifo *f;
- uint32_t actlen;
-
- sc = xfer->priv_sc;
- f = sc->sc_fifo.fp[USB_FIFO_TX];
-
- switch (USB_GET_STATE(xfer)) {
- case USB_ST_SETUP:
- case USB_ST_TRANSFERRED:
- /*
- * If writing is in stall, just jump to clear stall callback and
- * solve the situation.
- */
- if (sc->sc_flags & USCANNER_FLAG_WRITE_STALL) {
- usb2_transfer_start(sc->sc_xfer[USCANNER_BULK_CS_WR]);
- break;
- }
- /*
- * Write datas, setup and perform hardware transfer.
- */
- if (usb2_fifo_get_data(f, xfer->frbuffers, 0,
- xfer->max_data_length, &actlen, 0)) {
- xfer->frlengths[0] = actlen;
- usb2_start_hardware(xfer);
- }
- break;
-
- default: /* Error */
- if (xfer->error != USB_ERR_CANCELLED) {
- sc->sc_flags |= USCANNER_FLAG_WRITE_STALL;
- usb2_transfer_start(sc->sc_xfer[USCANNER_BULK_CS_WR]);
- }
- break;
- }
-}
-
-/*
- * Removing stall on writing callback.
- */
-static void
-uscanner_write_clear_stall_callback(struct usb2_xfer *xfer)
-{
- struct uscanner_softc *sc = xfer->priv_sc;
- struct usb2_xfer *xfer_other = sc->sc_xfer[USCANNER_BULK_DT_WR];
-
- if (usb2_clear_stall_callback(xfer, xfer_other)) {
- DPRINTF("stall cleared\n");
- sc->sc_flags &= ~USCANNER_FLAG_WRITE_STALL;
- usb2_transfer_start(xfer_other);
- }
-}
-
-/*
- * uscanner character device opening method.
- */
-static int
-uscanner_open(struct usb2_fifo *fifo, int fflags)
-{
- struct uscanner_softc *sc;
-
- sc = fifo->priv_sc0;
-
- if (!(sc->sc_flags & USCANNER_FLAG_KEEP_OPEN)) {
- if (fflags & FWRITE) {
- sc->sc_flags |= USCANNER_FLAG_WRITE_STALL;
- }
- if (fflags & FREAD) {
- sc->sc_flags |= USCANNER_FLAG_READ_STALL;
- }
- }
- if (fflags & FREAD) {
- if (usb2_fifo_alloc_buffer(fifo,
- sc->sc_xfer[USCANNER_BULK_DT_RD]->max_data_length,
- USCANNER_IFQ_MAXLEN)) {
- return (ENOMEM);
- }
- }
- if (fflags & FWRITE) {
- if (usb2_fifo_alloc_buffer(fifo,
- sc->sc_xfer[USCANNER_BULK_DT_WR]->max_data_length,
- USCANNER_IFQ_MAXLEN)) {
- return (ENOMEM);
- }
- }
- return (0);
-}
-
-static void
-uscanner_close(struct usb2_fifo *fifo, int fflags)
-{
- if (fflags & (FREAD | FWRITE)) {
- usb2_fifo_free_buffer(fifo);
- }
-}
-
-/*
- * uscanner character device start reading method.
- */
-static void
-uscanner_start_read(struct usb2_fifo *fifo)
-{
- struct uscanner_softc *sc;
-
- sc = fifo->priv_sc0;
- usb2_transfer_start(sc->sc_xfer[USCANNER_BULK_DT_RD]);
-}
-
-/*
- * uscanner character device start writing method.
- */
-static void
-uscanner_start_write(struct usb2_fifo *fifo)
-{
- struct uscanner_softc *sc;
-
- sc = fifo->priv_sc0;
- usb2_transfer_start(sc->sc_xfer[USCANNER_BULK_DT_WR]);
-}
-
-/*
- * uscanner character device stop reading method.
- */
-static void
-uscanner_stop_read(struct usb2_fifo *fifo)
-{
- struct uscanner_softc *sc;
-
- sc = fifo->priv_sc0;
- usb2_transfer_stop(sc->sc_xfer[USCANNER_BULK_CS_RD]);
- usb2_transfer_stop(sc->sc_xfer[USCANNER_BULK_DT_RD]);
-}
-
-/*
- * uscanner character device stop writing method.
- */
-static void
-uscanner_stop_write(struct usb2_fifo *fifo)
-{
- struct uscanner_softc *sc;
-
- sc = fifo->priv_sc0;
- usb2_transfer_stop(sc->sc_xfer[USCANNER_BULK_CS_WR]);
- usb2_transfer_stop(sc->sc_xfer[USCANNER_BULK_DT_WR]);
-}
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 2915cc6..70aac72 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -309,7 +309,6 @@ device ural # Ralink Technology RT2500USB wireless NICs
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
diff --git a/sys/i386/conf/XBOX b/sys/i386/conf/XBOX
index 3867165..0a2e8c0 100644
--- a/sys/i386/conf/XBOX
+++ b/sys/i386/conf/XBOX
@@ -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
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index a002111..04bc8af 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -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
diff --git a/sys/modules/usb/uscanner/Makefile b/sys/modules/usb/uscanner/Makefile
deleted file mode 100644
index 4534a3e..0000000
--- a/sys/modules/usb/uscanner/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# $FreeBSD$
-#
-# Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
-#
-# 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 AUTHOR 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 AUTHOR 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.
-#
-
-S= ${.CURDIR}/../../..
-
-.PATH: $S/dev/usb/image
-
-KMOD= uscanner
-SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h vnode_if.h usbdevs.h \
- uscanner.c
-
-.include <bsd.kmod.mk>
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index a393748..b6adce6 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -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
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index b87f899..a85ded0 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -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
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 0c051fb..46c363e 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -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
diff --git a/sys/sun4v/conf/GENERIC b/sys/sun4v/conf/GENERIC
index fac7e04..2291087 100644
--- a/sys/sun4v/conf/GENERIC
+++ b/sys/sun4v/conf/GENERIC
@@ -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
diff --git a/tools/tools/nanobsd/rescue/AMD64 b/tools/tools/nanobsd/rescue/AMD64
index 02233bc..6a476a3 100644
--- a/tools/tools/nanobsd/rescue/AMD64
+++ b/tools/tools/nanobsd/rescue/AMD64
@@ -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
diff --git a/tools/tools/nanobsd/rescue/I386 b/tools/tools/nanobsd/rescue/I386
index 95b542c..3f8df45 100644
--- a/tools/tools/nanobsd/rescue/I386
+++ b/tools/tools/nanobsd/rescue/I386
@@ -310,7 +310,6 @@ device ural # Ralink Technology RT2500USB wireless NICs
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)
OpenPOWER on IntegriCloud