diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2013-08-20 14:27:34 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2013-08-20 14:27:34 +0000 |
| commit | cc18e245ea95474eeddc071696fd3ee82acdc2e4 (patch) | |
| tree | 7a9fdc80881c5f5946ca0830981943efa004eb78 /sys/arch | |
| parent | cd625c9ed4d13a51a18655c873b22502f7ad625e (diff) | |
Remove uscanner(4). It was disabled in GENERIC more than 2.5 years ago.
No regression has been reported since libusb became the prefered
solution to work with USB scanners.
req. by mpi@
ok ian@ mpi@ miod@
Diffstat (limited to 'sys/arch')
38 files changed, 51 insertions, 89 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index 901d53c3247..bfe3eb94c17 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.71 2013/06/03 15:54:47 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.72 2013/08/20 14:27:24 ajacoutot Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -118,7 +118,6 @@ cdev_decl(cy); #include "ulpt.h" #include "urio.h" #include "ucom.h" -#include "uscanner.h" #include "pf.h" #ifdef USER_PCICONF #include "pci.h" @@ -204,7 +203,7 @@ struct cdevsw cdevsw[] = cdev_disk_init(1,diskmap), /* 63: disk mapper */ cdev_pppx_init(NPPPX,pppx), /* 64: pppx */ cdev_urio_init(NURIO,urio), /* 65: USB Diamond Rio 500 */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 66: USB scanners */ + cdev_notdef(), /* 66: was USB scanners */ cdev_fuse_init(NFUSE,fuse), /* 67: fuse */ }; int nchrdev = nitems(cdevsw); diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index e974cf315d5..6cbd1b0c602 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.230 2013/03/15 09:10:52 ratchov Exp $ +# $OpenBSD: GENERIC,v 1.231 2013/08/20 14:27:24 ajacoutot Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -112,7 +112,6 @@ upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable # USB Scanners #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c index 6f40caab4ed..110a6a8f610 100644 --- a/sys/arch/amd64/amd64/conf.c +++ b/sys/arch/amd64/amd64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.41 2013/06/03 15:54:47 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.42 2013/08/20 14:27:25 ajacoutot Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -153,7 +153,6 @@ cdev_decl(cy); #include "ulpt.h" #include "urio.h" #include "ucom.h" -#include "uscanner.h" #include "cz.h" cdev_decl(cztty); #include "radio.h" @@ -272,7 +271,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 74: ALTQ (deprecated) */ cdev_iop_init(NIOP,iop), /* 75: I2O IOP control interface */ cdev_radio_init(NRADIO, radio), /* 76: generic radio I/O */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 77: USB scanners */ + cdev_notdef(), /* 77: was USB scanners */ cdev_systrace_init(NSYSTRACE,systrace), /* 78: system call tracing */ cdev_bio_init(NBIO,bio), /* 79: ioctl tunnel */ cdev_notdef(), /* 80: gpr? XXX */ diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index c0e3bc1f2e8..0ce8c6df112 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.345 2013/08/15 15:01:48 edd Exp $ +# $OpenBSD: GENERIC,v 1.346 2013/08/20 14:27:25 ajacoutot Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -228,7 +228,6 @@ mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable # USB Scanners #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK index b07fd803a01..115a1a0ff42 100644 --- a/sys/arch/amd64/conf/RAMDISK +++ b/sys/arch/amd64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.57 2013/08/20 13:16:39 mpi Exp $ +# $OpenBSD: RAMDISK,v 1.58 2013/08/20 14:27:25 ajacoutot Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -106,7 +106,6 @@ wskbd* at ukbd? mux 1 #kue* at uhub? # Kawasaki KL5KUSB101B based Ethernet #upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' #urio* at uhub? # Diamond Multimedia Rio 500 -#uscanner* at uhub? # USB Scanners #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 401481ef28a..ac7235f99e9 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.126 2013/08/13 16:26:22 mikeb Exp $ +# $OpenBSD: RAMDISK_CD,v 1.127 2013/08/20 14:27:25 ajacoutot Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -117,7 +117,6 @@ url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' #urio* at uhub? # Diamond Multimedia Rio 500 -#uscanner* at uhub? # USB Scanners #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver ural* at uhub? # Ralink RT2500 diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c index cfadb9d09fe..90b1b3c2ffb 100644 --- a/sys/arch/arm/arm/conf.c +++ b/sys/arch/arm/arm/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.35 2013/06/03 17:33:58 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.36 2013/08/20 14:27:25 ajacoutot Exp $ */ /* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */ /* @@ -127,7 +127,6 @@ cdev_decl(pci); #include "uhid.h" #include "ulpt.h" #include "urio.h" -#include "uscanner.h" /* * Bluetooth devices @@ -351,7 +350,7 @@ struct cdevsw cdevsw[] = { cdev_ulpt_init(NULPT,ulpt), /* 66: USB printer */ cdev_urio_init(NURIO,urio), /* 67: Diamond Rio 500 */ cdev_tty_init(NUCOM,ucom), /* 68: USB tty */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 69: USB scanner */ + cdev_notdef(), /* 69: was USB scanners */ cdev_usbdev_init(NUGEN,ugen), /* 70: USB generic driver */ cdev_notdef(), /* 71 was: RAIDframe disk driver */ cdev_lkm_dummy(), /* 72: reserved */ diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC index 6d5c058e551..1b34df22a16 100644 --- a/sys/arch/armish/conf/GENERIC +++ b/sys/arch/armish/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.47 2012/09/27 14:01:35 jsg Exp $ +# $OpenBSD: GENERIC,v 1.48 2013/08/20 14:27:26 ajacoutot Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -143,7 +143,6 @@ udav* at uhub? # Davicom DM9601 based Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable # USB Scanners #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio diff --git a/sys/arch/armish/conf/RAMDISK b/sys/arch/armish/conf/RAMDISK index a8a80a952b4..308b0bf8e26 100644 --- a/sys/arch/armish/conf/RAMDISK +++ b/sys/arch/armish/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.25 2012/09/27 14:01:35 jsg Exp $ +# $OpenBSD: RAMDISK,v 1.26 2013/08/20 14:27:26 ajacoutot Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -136,7 +136,6 @@ udav* at uhub? # Davicom DM9601 based Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS #urio* at uhub? # Diamond Multimedia Rio 500 -#uscanner* at uhub? # USB Scanners #uyap* at uhub? # Y@P firmware loader #udsbr* at uhub? # D-Link DSB-R100 radio #radio* at udsbr? # USB radio diff --git a/sys/arch/beagle/conf/GENERIC b/sys/arch/beagle/conf/GENERIC index a848ea51518..e762b1c4619 100644 --- a/sys/arch/beagle/conf/GENERIC +++ b/sys/arch/beagle/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.21 2013/06/11 19:19:43 rapha Exp $ +# $OpenBSD: GENERIC,v 1.22 2013/08/20 14:27:26 ajacoutot Exp $ # # GENERIC machine description file # @@ -130,7 +130,6 @@ udav* at uhub? # Davicom DM9601 based Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable # USB Scanners #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio diff --git a/sys/arch/beagle/conf/RAMDISK b/sys/arch/beagle/conf/RAMDISK index 4847f415aa3..b4954fbaaa8 100644 --- a/sys/arch/beagle/conf/RAMDISK +++ b/sys/arch/beagle/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.23 2013/06/16 22:06:42 florian Exp $ +# $OpenBSD: RAMDISK,v 1.24 2013/08/20 14:27:26 ajacoutot Exp $ # # GENERIC machine description file # @@ -144,7 +144,6 @@ smsc* at uhub? # SMSC LAN95xx Ethernet # url* at uhub? # Realtek RTL8150L based adapters # wi* at uhub? # WaveLAN IEEE 802.11DS # urio* at uhub? # Diamond Multimedia Rio 500 -# uscanner* at uhub? # USB Scanners # #uyap* at uhub? # Y@P firmware loader # udsbr* at uhub? # D-Link DSB-R100 radio # radio* at udsbr? # USB radio diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index eee802ec79c..319d41e24b1 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.150 2013/08/05 09:04:15 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.151 2013/08/20 14:27:26 ajacoutot Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -154,7 +154,6 @@ udav* at uhub? # Davicom DM9601 based Ethernet upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable # USB Scanners uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK index 96599ec0fab..b57e29e2837 100644 --- a/sys/arch/hppa/conf/RAMDISK +++ b/sys/arch/hppa/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.96 2013/03/09 02:19:21 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.97 2013/08/20 14:27:26 ajacoutot Exp $ # # Diskless kernel config # @@ -152,7 +152,6 @@ udav* at uhub? # Davicom DM9601 based Ethernet upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' wi* at uhub? # WaveLAN IEEE 802.11DS #urio* at uhub? # Diamond Multimedia Rio 500 -#uscanner* at uhub? # USB Scanners #uyap* at uhub? # Y@P firmware loader #udsbr* at uhub? # D-Link DSB-R100 radio #radio* at udsbr? # USB radio diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c index d7f0c519236..821a2ca0115 100644 --- a/sys/arch/hppa/hppa/conf.c +++ b/sys/arch/hppa/hppa/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.56 2013/06/03 15:54:47 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.57 2013/08/20 14:27:27 ajacoutot Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -117,7 +117,6 @@ cdev_decl(pci); #include "ulpt.h" #include "urio.h" #include "ucom.h" -#include "uscanner.h" #include "bthub.h" #include "fuse.h" @@ -175,7 +174,7 @@ struct cdevsw cdevsw[] = cdev_ulpt_init(NULPT,ulpt), /* 43: USB printers */ cdev_urio_init(NURIO,urio), /* 44: USB Diamond Rio 500 */ cdev_tty_init(NUCOM,ucom), /* 45: USB tty */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 46: USB scanners */ + cdev_notdef(), /* 46: was USB scanners */ cdev_hotplug_init(NHOTPLUG,hotplug), /* 47: devices hot plugging */ cdev_lkm_dummy(), /* 48: */ cdev_lkm_dummy(), /* 49: */ diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC index a416377bc51..4c4d95d19ca 100644 --- a/sys/arch/hppa64/conf/GENERIC +++ b/sys/arch/hppa64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.28 2012/09/27 14:01:35 jsg Exp $ +# $OpenBSD: GENERIC,v 1.29 2013/08/20 14:27:27 ajacoutot Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -105,7 +105,6 @@ com1 at ssio? irq 3 #url* at uhub? # Realtek RTL8150L based adapters #wi* at uhub? # WaveLAN IEEE 802.11DS #urio* at uhub? # Diamond Multimedia Rio 500 -#uscanner* at uhub? # USB Scanners #uyap* at uhub? # Y@P firmware loader #udsbr* at uhub? # D-Link DSB-R100 radio #radio* at udsbr? # USB radio diff --git a/sys/arch/hppa64/conf/RAMDISK b/sys/arch/hppa64/conf/RAMDISK index cd37c45a59d..b1f4fec5de7 100644 --- a/sys/arch/hppa64/conf/RAMDISK +++ b/sys/arch/hppa64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.15 2013/03/09 02:19:21 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.16 2013/08/20 14:27:27 ajacoutot Exp $ # # Diskless kernel config # @@ -105,7 +105,6 @@ pcmcia* at cardslot? #url* at uhub? # Realtek RTL8150L based adapters #wi* at uhub? # WaveLAN IEEE 802.11DS #urio* at uhub? # Diamond Multimedia Rio 500 -#uscanner* at uhub? # USB Scanners #uyap* at uhub? # Y@P firmware loader #udsbr* at uhub? # D-Link DSB-R100 radio #radio* at udsbr? # USB radio diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c index 86a017168b2..4fc6226868b 100644 --- a/sys/arch/hppa64/hppa64/conf.c +++ b/sys/arch/hppa64/hppa64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.23 2013/06/03 15:54:47 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.24 2013/08/20 14:27:27 ajacoutot Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -117,7 +117,6 @@ cdev_decl(pci); #include "ulpt.h" #include "urio.h" #include "ucom.h" -#include "uscanner.h" #include "bthub.h" #include "fuse.h" @@ -175,7 +174,7 @@ struct cdevsw cdevsw[] = cdev_ulpt_init(NULPT,ulpt), /* 43: USB printers */ cdev_urio_init(NURIO,urio), /* 44: USB Diamond Rio 500 */ cdev_tty_init(NUCOM,ucom), /* 45: USB tty */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 46: USB scanners */ + cdev_notdef(), /* 46: was USB scanners */ cdev_hotplug_init(NHOTPLUG,hotplug), /* 47: devices hot plugging */ cdev_lkm_dummy(), /* 48: */ cdev_lkm_dummy(), /* 49: */ diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 91f22e4f01e..72607aabf16 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.751 2013/08/20 09:14:13 mpi Exp $ +# $OpenBSD: GENERIC,v 1.752 2013/08/20 14:27:27 ajacoutot Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -281,7 +281,6 @@ mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable # USB Scanners #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index d514f14a819..37421511e6e 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.199 2013/08/13 16:26:25 mikeb Exp $ +# $OpenBSD: RAMDISK_CD,v 1.200 2013/08/20 14:27:28 ajacoutot Exp $ machine i386 # architecture, used by config; REQUIRED @@ -137,7 +137,6 @@ udav* at uhub? # Davicom DM9601 based Ethernet mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS -#uscanner* at uhub? # USB Scanners #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver ural* at uhub? # Ralink RT2500 diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index a1a55c8d6c0..c92a3e9ed60 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.143 2013/06/03 15:54:47 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.144 2013/08/20 14:27:28 ajacoutot Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -155,7 +155,6 @@ cdev_decl(cy); #include "ulpt.h" #include "urio.h" #include "ucom.h" -#include "uscanner.h" #include "cz.h" cdev_decl(cztty); #include "radio.h" @@ -276,7 +275,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 74: ALTQ (deprecated) */ cdev_iop_init(NIOP,iop), /* 75: I2O IOP control interface */ cdev_radio_init(NRADIO, radio), /* 76: generic radio I/O */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 77: USB scanners */ + cdev_notdef(), /* 77: was USB scanners */ cdev_systrace_init(NSYSTRACE,systrace), /* 78: system call tracing */ cdev_bio_init(NBIO,bio), /* 79: ioctl tunnel */ cdev_ch_init(NGPR,gpr), /* 80: GPR400 SmartCard reader */ diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC index 426fbbf6845..5bffb47565e 100644 --- a/sys/arch/landisk/conf/GENERIC +++ b/sys/arch/landisk/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.38 2013/08/20 09:14:14 mpi Exp $ +# $OpenBSD: GENERIC,v 1.39 2013/08/20 14:27:28 ajacoutot Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -139,7 +139,6 @@ udav* at uhub? # Davicom DM9601 based Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 -#uscanner* at uhub? # USB Scanners #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c index ac8ecea7c0c..a5bc998f0c6 100644 --- a/sys/arch/landisk/landisk/conf.c +++ b/sys/arch/landisk/landisk/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.25 2013/06/03 15:54:47 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.26 2013/08/20 14:27:28 ajacoutot Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -117,7 +117,6 @@ cdev_decl(pci); #include "uhid.h" #include "ulpt.h" #include "urio.h" -#include "uscanner.h" /* * Bluetooth devices @@ -327,7 +326,7 @@ struct cdevsw cdevsw[] = { cdev_ulpt_init(NULPT,ulpt), /* 66: USB printer */ cdev_urio_init(NURIO,urio), /* 67: Diamond Rio 500 */ cdev_tty_init(NUCOM,ucom), /* 68: USB tty */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 69: USB scanner */ + cdev_notdef(), /* 69: was USB scanners */ cdev_usbdev_init(NUGEN,ugen), /* 70: USB generic driver */ cdev_notdef(), /* 71 was: RAIDframe disk driver */ cdev_lkm_dummy(), /* 72: reserved */ diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC index 7b3e943d238..a77e6ea969a 100644 --- a/sys/arch/loongson/conf/GENERIC +++ b/sys/arch/loongson/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.38 2013/01/14 21:18:47 pirofti Exp $ +# $OpenBSD: GENERIC,v 1.39 2013/08/20 14:27:29 ajacoutot Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -124,7 +124,6 @@ ucom* at uchcom? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable# USB Scanners uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c index f069653702a..e7f4cd154a5 100644 --- a/sys/arch/loongson/loongson/conf.c +++ b/sys/arch/loongson/loongson/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.15 2013/06/03 15:54:47 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.16 2013/08/20 14:27:29 ajacoutot Exp $ */ /* * Copyright (c) 1992, 1993 @@ -125,7 +125,6 @@ cdev_decl(pci); #include "ulpt.h" #include "urio.h" #include "ucom.h" -#include "uscanner.h" #include "bthub.h" #include "vscsi.h" @@ -210,7 +209,7 @@ struct cdevsw cdevsw[] = cdev_vscsi_init(NVSCSI,vscsi), /* 69: vscsi */ cdev_disk_init(1,diskmap), /* 70: disk mapper */ cdev_pppx_init(NPPPX,pppx), /* 71: pppx */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 72: USB scanners */ + cdev_notdef(), /* 72: was USB scanners */ cdev_fuse_init(NFUSE,fuse), /* 73: fuse */ }; diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index f34b6bb6b65..292d4b07236 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.224 2013/08/18 17:33:01 kettenis Exp $g +# $OpenBSD: GENERIC,v 1.225 2013/08/20 14:27:29 ajacoutot Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -269,7 +269,6 @@ mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable # USB Scanners #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index 3c51e6f70bd..f959c4d8317 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.95 2013/08/17 08:33:11 mpi Exp $ +# $OpenBSD: RAMDISK,v 1.96 2013/08/20 14:27:29 ajacoutot Exp $ # # PPC GENERIC config file # @@ -183,7 +183,6 @@ urtwn* at uhub? # Realtek RTL8188CU/RTL8192CU zyd* at uhub? # Zydas ZD1211 url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS -#uscanner* at uhub? # USB Scanner driver #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver umass* at uhub? # USB Mass Storage devices diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c index c77e09ba637..cf9822ce0e2 100644 --- a/sys/arch/macppc/macppc/conf.c +++ b/sys/arch/macppc/macppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.52 2013/06/03 17:33:58 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.53 2013/08/20 14:27:29 ajacoutot Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -108,7 +108,6 @@ cdev_decl(com); #include "ulpt.h" #include "urio.h" #include "ucom.h" -#include "uscanner.h" #include "inet.h" @@ -226,7 +225,7 @@ struct cdevsw cdevsw[] = { #endif cdev_notdef(), /* 72: ALTQ (deprecated) */ cdev_iop_init(NIOP,iop), /* 73: I2O IOP control interface */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 74: usb scanner */ + cdev_notdef(), /* 74: was USB scanners */ cdev_bktr_init(NBKTR,bktr), /* 75: Bt848 video capture device */ cdev_radio_init(NRADIO, radio), /* 76: generic radio I/O */ cdev_ptm_init(NPTY,ptm), /* 77: pseudo-tty ptm device */ diff --git a/sys/arch/octeon/octeon/conf.c b/sys/arch/octeon/octeon/conf.c index 6f6b3ae4b34..129af2a18bd 100644 --- a/sys/arch/octeon/octeon/conf.c +++ b/sys/arch/octeon/octeon/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.9 2013/06/03 17:33:58 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.10 2013/08/20 14:27:30 ajacoutot Exp $ */ /* * Copyright (c) 1992, 1993 @@ -132,7 +132,6 @@ cdev_decl(pci); #include "ulpt.h" #include "urio.h" #include "ucom.h" -#include "uscanner.h" #include "bthub.h" #include "vscsi.h" @@ -221,7 +220,7 @@ struct cdevsw cdevsw[] = cdev_vscsi_init(NVSCSI,vscsi), /* 69: vscsi */ cdev_disk_init(1,diskmap), /* 70: disk mapper */ cdev_pppx_init(NPPPX,pppx), /* 71: pppx */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 72: USB scanners */ + cdev_notdef(), /* 72: was USB scanners */ }; int nchrdev = nitems(cdevsw); diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27 index be8a6d3731a..ed4b877b0ab 100644 --- a/sys/arch/sgi/conf/GENERIC-IP27 +++ b/sys/arch/sgi/conf/GENERIC-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP27,v 1.44 2012/09/27 14:01:35 jsg Exp $ +# $OpenBSD: GENERIC-IP27,v 1.45 2013/08/20 14:27:30 ajacoutot Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. # @@ -114,7 +114,6 @@ audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable# USB Scanners uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30 index 9a161add436..30125e9a587 100644 --- a/sys/arch/sgi/conf/GENERIC-IP30 +++ b/sys/arch/sgi/conf/GENERIC-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP30,v 1.38 2012/09/27 14:01:35 jsg Exp $ +# $OpenBSD: GENERIC-IP30,v 1.39 2013/08/20 14:27:30 ajacoutot Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. # @@ -106,7 +106,6 @@ audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable# USB Scanners uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32 index c4ebf0f05bf..53c8a809398 100644 --- a/sys/arch/sgi/conf/GENERIC-IP32 +++ b/sys/arch/sgi/conf/GENERIC-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP32,v 1.29 2012/09/27 14:01:35 jsg Exp $ +# $OpenBSD: GENERIC-IP32,v 1.30 2013/08/20 14:27:30 ajacoutot Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. # @@ -98,7 +98,6 @@ audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable# USB Scanners uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c index 3e3073da2a7..43fd25c24c6 100644 --- a/sys/arch/sgi/sgi/conf.c +++ b/sys/arch/sgi/sgi/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.32 2013/06/03 15:54:47 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.33 2013/08/20 14:27:30 ajacoutot Exp $ */ /* * Copyright (c) 1992, 1993 @@ -126,7 +126,6 @@ cdev_decl(pci); #include "ulpt.h" #include "urio.h" #include "ucom.h" -#include "uscanner.h" #include "vscsi.h" #include "pppx.h" @@ -210,7 +209,7 @@ struct cdevsw cdevsw[] = cdev_disk_init(1,diskmap), /* 69: disk mapper */ cdev_pppx_init(NPPPX,pppx), /* 70: pppx */ cdev_notdef(), /* 71: */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 72: USB scanners */ + cdev_notdef(), /* 72: was USB scanners */ cdev_fuse_init(NFUSE,fuse), /* 73: fuse */ }; diff --git a/sys/arch/socppc/conf/GENERIC b/sys/arch/socppc/conf/GENERIC index 9b47869a7a5..d87e0da45a6 100644 --- a/sys/arch/socppc/conf/GENERIC +++ b/sys/arch/socppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.23 2012/09/27 14:01:35 jsg Exp $ +# $OpenBSD: GENERIC,v 1.24 2013/08/20 14:27:30 ajacoutot Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -81,7 +81,6 @@ rsu* at uhub? # Realtek RTL8188SU/RTL8191SU/RTL8192SU urtwn* at uhub? # Realtek RTL8188CU/RTL8192CU zyd* at uhub? # Zydas ZD1211 urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable # USB Scanners ugen* at uhub? # USB Generic driver uthum* at uhidev? # TEMPerHUM sensor utwitch* at uhidev? # YUREX BBU sensor diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c index 1f6e6be6381..d3fb13c6211 100644 --- a/sys/arch/socppc/socppc/conf.c +++ b/sys/arch/socppc/socppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.17 2013/06/03 15:54:47 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.18 2013/08/20 14:27:31 ajacoutot Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -113,7 +113,6 @@ cdev_decl(pci); #include "ulpt.h" #include "urio.h" #include "ucom.h" -#include "uscanner.h" #include "bthub.h" #include "vscsi.h" @@ -202,7 +201,7 @@ struct cdevsw cdevsw[] = { #endif cdev_notdef(), /* 72 */ cdev_notdef(), /* 73 */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 74: usb scanner */ + cdev_notdef(), /* 74: was USB scanners */ cdev_notdef(), /* 75 */ cdev_notdef(), /* 76 */ cdev_ptm_init(NPTY,ptm), /* 77: pseudo-tty ptm device */ diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 56b2b69b603..120a2da8a62 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.271 2013/08/20 09:05:21 dlg Exp $ +# $OpenBSD: GENERIC,v 1.272 2013/08/20 14:27:31 ajacoutot Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -229,7 +229,6 @@ zyd* at uhub? # Zydas ZD1211 url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable # USB Scanners #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c index 5d76cb6b504..0a6873d357b 100644 --- a/sys/arch/sparc64/sparc64/conf.c +++ b/sys/arch/sparc64/sparc64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.68 2013/08/08 21:13:07 kettenis Exp $ */ +/* $OpenBSD: conf.c,v 1.69 2013/08/20 14:27:31 ajacoutot Exp $ */ /* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */ /* @@ -107,7 +107,6 @@ cdev_decl(pci); #include "ulpt.h" #include "urio.h" #include "ucom.h" -#include "uscanner.h" #include "bthub.h" @@ -256,7 +255,7 @@ struct cdevsw cdevsw[] = cdev_ulpt_init(NULPT,ulpt), /* 93: USB printers */ cdev_urio_init(NURIO,urio), /* 94: USB Diamond Rio 500 */ cdev_tty_init(NUCOM,ucom), /* 95: USB tty */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 96: USB scanners */ + cdev_notdef(), /* 96: was USB scanners */ cdev_notdef(), /* 97 */ cdev_notdef(), /* 98 */ cdev_notdef(), /* 99 */ diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index e50424b23da..a977debdc5c 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.88 2012/09/27 14:01:35 jsg Exp $ +# $OpenBSD: GENERIC,v 1.89 2013/08/20 14:27:31 ajacoutot Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -123,7 +123,6 @@ zyd* at uhub? # Zydas ZD1211 url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS urio* at uhub? # Diamond Multimedia Rio 500 -uscanner* at uhub? disable # USB Scanners #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK index 34c962ad54f..cc75f2bb512 100644 --- a/sys/arch/zaurus/conf/RAMDISK +++ b/sys/arch/zaurus/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.44 2012/09/27 14:01:35 jsg Exp $ +# $OpenBSD: RAMDISK,v 1.45 2013/08/20 14:27:31 ajacoutot Exp $ machine zaurus arm @@ -88,7 +88,6 @@ ural* at uhub? # Ralink RT2500 url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS upl* at uhub? # Prolific PL2301/PL2302 host-to-host -#uscanner* at uhub? # USB Scanner driver #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver umass* at uhub? # USB Mass Storage devices |