diff options
Diffstat (limited to 'sys')
41 files changed, 53 insertions, 776 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 diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb index e210db08fd6..adf90c085e2 100644 --- a/sys/dev/usb/files.usb +++ b/sys/dev/usb/files.usb @@ -1,4 +1,4 @@ -# $OpenBSD: files.usb,v 1.107 2013/08/20 09:14:17 mpi Exp $ +# $OpenBSD: files.usb,v 1.108 2013/08/20 14:27:33 ajacoutot Exp $ # $NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $ # # Config file and device description for machine-independent USB code. @@ -319,12 +319,6 @@ device uticom: ucombus attach uticom at uhub file dev/usb/uticom.c uticom -# Scanners -# Generic scanner support -device uscanner -attach uscanner at uhub -file dev/usb/uscanner.c uscanner needs-flag - # Prism3 WI @ USB attach wi at uhub with wi_usb file dev/usb/if_wi_usb.c wi_usb diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c deleted file mode 100644 index 7cabf53865b..00000000000 --- a/sys/dev/usb/uscanner.c +++ /dev/null @@ -1,678 +0,0 @@ -/* $OpenBSD: uscanner.c,v 1.48 2013/04/15 09:23:02 mglocker Exp $ */ -/* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 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 (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. - * - * 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 <sys/param.h> -#include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> -#include <sys/device.h> -#include <sys/tty.h> -#include <sys/file.h> -#include <sys/selinfo.h> -#include <sys/vnode.h> -#include <sys/poll.h> -#include <sys/conf.h> - -#include <dev/usb/usb.h> -#include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> - -#include <dev/usb/usbdevs.h> - -#ifdef USCANNER_DEBUG -#define DPRINTF(x) do { if (uscannerdebug) printf x; } while (0) -#define DPRINTFN(n,x) do { if (uscannerdebug>(n)) printf x; } while (0) -int uscannerdebug = 0; -#else -#define DPRINTF(x) -#define DPRINTFN(n,x) -#endif - -struct uscan_info { - struct usb_devno devno; - u_int flags; -#define USC_KEEP_OPEN 1 -}; - -/* Table of scanners that may work with this driver. */ -static const struct uscan_info uscanner_devs[] = { - /* Acer Peripherals */ - {{ USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_320U }, 0 }, - {{ USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_640U }, 0 }, - {{ USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_620U }, 0 }, - {{ USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U }, 0 }, - - /* AGFA */ - {{ USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1236U }, 0 }, - {{ USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U }, 0 }, - {{ USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U2 }, 0 }, - {{ USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANTOUCH }, 0 }, - {{ USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE40 }, 0 }, - {{ USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE50 }, 0 }, - {{ USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE20 }, 0 }, - {{ USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE25 }, 0 }, - {{ USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE26 }, 0 }, - {{ USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANE52 }, 0 }, - - /* Avision */ - {{ USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U }, 0 }, - - /* Canon */ - {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U }, 0 }, - {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N670U }, 0 }, - {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N1220U }, 0 }, - {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N1240U }, 0 }, - - /* Kye */ - {{ USB_VENDOR_KYE, USB_PRODUCT_KYE_VIVIDPRO }, 0 }, - - /* HP */ - {{ USB_VENDOR_HP, USB_PRODUCT_HP_2200C }, 0 }, - {{ USB_VENDOR_HP, USB_PRODUCT_HP_3300C }, 0 }, - {{ USB_VENDOR_HP, USB_PRODUCT_HP_3400CSE }, 0 }, - {{ USB_VENDOR_HP, USB_PRODUCT_HP_4100C }, 0 }, - {{ USB_VENDOR_HP, USB_PRODUCT_HP_4200C }, 0 }, - {{ USB_VENDOR_HP, USB_PRODUCT_HP_4300C }, 0 }, - {{ USB_VENDOR_HP, USB_PRODUCT_HP_S20 }, 0 }, - {{ USB_VENDOR_HP, USB_PRODUCT_HP_5200C }, 0 }, - {{ USB_VENDOR_HP, USB_PRODUCT_HP_6200C }, 0 }, - {{ USB_VENDOR_HP, USB_PRODUCT_HP_6300C }, 0 }, - - /* Mustek */ - {{ USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU }, 0 }, - {{ USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_BEARPAW1200F }, 0 }, - {{ USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600USB }, 0 }, - {{ USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600CU }, 0 }, - {{ USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USB }, 0 }, - {{ USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200UB }, 0 }, - {{ USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USBPLUS }, 0 }, - {{ USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CUPLUS }, 0 }, - - /* National */ - {{ USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200 }, 0 }, - {{ USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW2400 }, 0 }, - - /* Primax */ - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300 }, 0 }, - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300 }, 0 }, - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2300 }, 0 }, - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E3002 }, 0 }, - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_9600 }, 0 }, - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_600U }, 0 }, - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_6200 }, 0 }, - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_19200 }, 0 }, - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_1200U }, 0 }, - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G600 }, 0 }, - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_636I }, 0 }, - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2600 }, 0 }, - {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E600 }, 0 }, - - /* Epson */ - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_636 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_610 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1200 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1240 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1260 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1640 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1660 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_640U }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1650 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2400 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX3800 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX4000 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX5000 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX6000 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_CX5400 }, 0 }, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F }, USC_KEEP_OPEN }, - - /* UMAX */ - {{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U }, 0 }, - {{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U }, 0 }, - {{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U }, 0 }, - {{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U }, 0 }, - {{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA3400 }, 0 }, - - /* Visioneer */ - {{ USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_3000 }, 0 }, - {{ USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_5300 }, 0 }, - {{ USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_7600 }, 0 }, - {{ USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6100 }, 0 }, - {{ USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6200 }, 0 }, - {{ USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8100 }, 0 }, - {{ USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_8600 }, 0 }, - - /* Ultima */ - {{ USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS }, 0 }, - -}; -#define uscanner_lookup(v, p) ((const struct uscan_info *)usb_lookup(uscanner_devs, v, p)) - -#define USCANNER_BUFFERSIZE 1024 - -struct uscanner_softc { - struct device sc_dev; /* base device */ - struct usbd_device *sc_udev; - struct usbd_interface *sc_iface; - - u_int sc_dev_flags; - - struct usbd_pipe *sc_bulkin_pipe; - int sc_bulkin; - struct usbd_xfer *sc_bulkin_xfer; - void *sc_bulkin_buffer; - int sc_bulkin_bufferlen; - int sc_bulkin_datalen; - - struct usbd_pipe *sc_bulkout_pipe; - int sc_bulkout; - struct usbd_xfer *sc_bulkout_xfer; - void *sc_bulkout_buffer; - int sc_bulkout_bufferlen; - int sc_bulkout_datalen; - - struct selinfo sc_selq; - - u_char sc_state; -#define USCANNER_OPEN 0x01 /* opened */ - - int sc_refcnt; - u_char sc_dying; -}; - -int uscanner_do_read(struct uscanner_softc *, struct uio *, int); -int uscanner_do_write(struct uscanner_softc *, struct uio *, int); -void uscanner_do_close(struct uscanner_softc *); - -#define USCANNERUNIT(n) (minor(n)) - -int uscanner_match(struct device *, void *, void *); -void uscanner_attach(struct device *, struct device *, void *); -int uscanner_detach(struct device *, int); -int uscanner_activate(struct device *, int); - -struct cfdriver uscanner_cd = { - NULL, "uscanner", DV_DULL -}; - -const struct cfattach uscanner_ca = { - sizeof(struct uscanner_softc), - uscanner_match, - uscanner_attach, - uscanner_detach, - uscanner_activate, -}; - -int -uscanner_match(struct device *parent, void *match, void *aux) -{ - struct usb_attach_arg *uaa = aux; - usb_interface_descriptor_t *id; - - if (uaa->iface == NULL) - return UMATCH_NONE; /* do not grab the entire device */ - - if (uscanner_lookup(uaa->vendor, uaa->product) == NULL) - return UMATCH_NONE; /* not in the list of known devices */ - id = usbd_get_interface_descriptor(uaa->iface); - if (id == NULL) - return UMATCH_NONE; - - /* - * There isn't a specific UICLASS for scanners, many vendors use - * UICLASS_VENDOR, so detecting the right interface is not so easy. - * But certainly we can exclude PRINTER and MASS - which some - * multifunction devices implement. - */ - if (id->bInterfaceClass == UICLASS_PRINTER || - id->bInterfaceClass == UICLASS_MASS) - return UMATCH_NONE; - - return UMATCH_VENDOR_PRODUCT; -} - -void -uscanner_attach(struct device *parent, struct device *self, void *aux) -{ - struct uscanner_softc *sc = (struct uscanner_softc *)self; - struct usb_attach_arg *uaa = aux; - usb_interface_descriptor_t *id = 0; - usb_endpoint_descriptor_t *ed, *ed_bulkin = NULL, *ed_bulkout = NULL; - int i; - usbd_status err; - int ifnum; - - sc->sc_dev_flags = uscanner_lookup(uaa->vendor, uaa->product)->flags; - - sc->sc_udev = uaa->device; - - id = usbd_get_interface_descriptor(uaa->iface); - ifnum = id->bInterfaceNumber; - - err = usbd_device2interface_handle(sc->sc_udev, ifnum, &sc->sc_iface); - if (!err && sc->sc_iface) - id = usbd_get_interface_descriptor(sc->sc_iface); - if (err || id == 0) { - printf("%s: could not get interface descriptor, err=%d,id=%p\n", - sc->sc_dev.dv_xname, err, id); - return; - } - - /* Find the two first bulk endpoints */ - for (i = 0 ; i < id->bNumEndpoints; i++) { - ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i); - if (ed == 0) { - printf("%s: could not read endpoint descriptor\n", - sc->sc_dev.dv_xname); - return; - } - - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN - && (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) { - ed_bulkin = ed; - } else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT - && (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) { - ed_bulkout = ed; - } - - if (ed_bulkin && ed_bulkout) /* found all we need */ - break; - } - - /* Verify that we goething sensible */ - if (ed_bulkin == NULL || ed_bulkout == NULL) { - printf("%s: bulk-in and/or bulk-out endpoint not found\n", - sc->sc_dev.dv_xname); - return; - } - - sc->sc_bulkin = ed_bulkin->bEndpointAddress; - sc->sc_bulkout = ed_bulkout->bEndpointAddress; -} - -int -uscanneropen(dev_t dev, int flag, int mode, struct proc *p) -{ - struct uscanner_softc *sc; - int unit = USCANNERUNIT(dev); - usbd_status err; - - if (unit >= uscanner_cd.cd_ndevs) - return (ENXIO); - sc = uscanner_cd.cd_devs[unit]; - if (sc == NULL) - return (ENXIO); - - DPRINTFN(5, ("uscanneropen: flag=%d, mode=%d, unit=%d\n", - flag, mode, unit)); - - if (sc->sc_dying) - return (ENXIO); - - if (sc->sc_state & USCANNER_OPEN) - return (EBUSY); - - sc->sc_state |= USCANNER_OPEN; - - sc->sc_bulkin_buffer = malloc(USCANNER_BUFFERSIZE, M_USBDEV, M_WAITOK); - sc->sc_bulkout_buffer = malloc(USCANNER_BUFFERSIZE, M_USBDEV, M_WAITOK); - /* No need to check buffers for NULL since we have WAITOK */ - - sc->sc_bulkin_bufferlen = USCANNER_BUFFERSIZE; - sc->sc_bulkout_bufferlen = USCANNER_BUFFERSIZE; - - /* We have decided on which endpoints to use, now open the pipes */ - if (sc->sc_bulkin_pipe == NULL) { - err = usbd_open_pipe(sc->sc_iface, sc->sc_bulkin, - USBD_EXCLUSIVE_USE, &sc->sc_bulkin_pipe); - if (err) { - printf("%s: cannot open bulk-in pipe (addr %d)\n", - sc->sc_dev.dv_xname, sc->sc_bulkin); - uscanner_do_close(sc); - return (EIO); - } - } - if (sc->sc_bulkout_pipe == NULL) { - err = usbd_open_pipe(sc->sc_iface, sc->sc_bulkout, - USBD_EXCLUSIVE_USE, &sc->sc_bulkout_pipe); - if (err) { - printf("%s: cannot open bulk-out pipe (addr %d)\n", - sc->sc_dev.dv_xname, sc->sc_bulkout); - uscanner_do_close(sc); - return (EIO); - } - } - - sc->sc_bulkin_xfer = usbd_alloc_xfer(sc->sc_udev); - if (sc->sc_bulkin_xfer == NULL) { - uscanner_do_close(sc); - return (ENOMEM); - } - sc->sc_bulkout_xfer = usbd_alloc_xfer(sc->sc_udev); - if (sc->sc_bulkout_xfer == NULL) { - uscanner_do_close(sc); - return (ENOMEM); - } - - return (0); /* success */ -} - -int -uscannerclose(dev_t dev, int flag, int mode, struct proc *p) -{ - struct uscanner_softc *sc; - - sc = uscanner_cd.cd_devs[USCANNERUNIT(dev)]; - - DPRINTFN(5, ("uscannerclose: flag=%d, mode=%d, unit=%d\n", - flag, mode, USCANNERUNIT(dev))); - -#ifdef DIAGNOSTIC - if (!(sc->sc_state & USCANNER_OPEN)) { - printf("uscannerclose: not open\n"); - return (EINVAL); - } -#endif - - uscanner_do_close(sc); - - return (0); -} - -void -uscanner_do_close(struct uscanner_softc *sc) -{ - if (sc->sc_bulkin_xfer) { - usbd_free_xfer(sc->sc_bulkin_xfer); - sc->sc_bulkin_xfer = NULL; - } - if (sc->sc_bulkout_xfer) { - usbd_free_xfer(sc->sc_bulkout_xfer); - sc->sc_bulkout_xfer = NULL; - } - - if (!(sc->sc_dev_flags & USC_KEEP_OPEN)) { - if (sc->sc_bulkin_pipe != NULL) { - usbd_abort_pipe(sc->sc_bulkin_pipe); - usbd_close_pipe(sc->sc_bulkin_pipe); - sc->sc_bulkin_pipe = NULL; - } - if (sc->sc_bulkout_pipe != NULL) { - usbd_abort_pipe(sc->sc_bulkout_pipe); - usbd_close_pipe(sc->sc_bulkout_pipe); - sc->sc_bulkout_pipe = NULL; - } - } - - if (sc->sc_bulkin_buffer) { - free(sc->sc_bulkin_buffer, M_USBDEV); - sc->sc_bulkin_buffer = NULL; - } - if (sc->sc_bulkout_buffer) { - free(sc->sc_bulkout_buffer, M_USBDEV); - sc->sc_bulkout_buffer = NULL; - } - - sc->sc_state &= ~USCANNER_OPEN; -} - -int -uscanner_do_read(struct uscanner_softc *sc, struct uio *uio, int flag) -{ - u_int32_t n, tn; - usbd_status err; - int error = 0; - - DPRINTFN(5, ("%s: uscannerread\n", sc->sc_dev.dv_xname)); - - if (sc->sc_dying) - return (EIO); - - while ((n = min(sc->sc_bulkin_bufferlen, uio->uio_resid)) != 0) { - DPRINTFN(1, ("uscannerread: start transfer %d bytes\n",n)); - tn = n; - - err = usbd_bulk_transfer( - sc->sc_bulkin_xfer, sc->sc_bulkin_pipe, - USBD_SHORT_XFER_OK, USBD_NO_TIMEOUT, - sc->sc_bulkin_buffer, &tn, - "uscnrb"); - if (err) { - if (err == USBD_INTERRUPTED) - error = EINTR; - else if (err == USBD_TIMEOUT) - error = ETIMEDOUT; - else - error = EIO; - break; - } - DPRINTFN(1, ("uscannerread: got %d bytes\n", tn)); - error = uiomove(sc->sc_bulkin_buffer, tn, uio); - if (error || tn < n) - break; - } - - return (error); -} - -int -uscannerread(dev_t dev, struct uio *uio, int flag) -{ - struct uscanner_softc *sc; - int error; - - sc = uscanner_cd.cd_devs[USCANNERUNIT(dev)]; - - sc->sc_refcnt++; - error = uscanner_do_read(sc, uio, flag); - if (--sc->sc_refcnt < 0) - usb_detach_wakeup(&sc->sc_dev); - - return (error); -} - -int -uscanner_do_write(struct uscanner_softc *sc, struct uio *uio, int flag) -{ - u_int32_t n; - int error = 0; - usbd_status err; - - DPRINTFN(5, ("%s: uscanner_do_write\n", sc->sc_dev.dv_xname)); - - if (sc->sc_dying) - return (EIO); - - while ((n = min(sc->sc_bulkout_bufferlen, uio->uio_resid)) != 0) { - error = uiomove(sc->sc_bulkout_buffer, n, uio); - if (error) - break; - DPRINTFN(1, ("uscanner_do_write: transfer %d bytes\n", n)); - err = usbd_bulk_transfer( - sc->sc_bulkout_xfer, sc->sc_bulkout_pipe, - 0, USBD_NO_TIMEOUT, - sc->sc_bulkout_buffer, &n, - "uscnwb"); - if (err) { - if (err == USBD_INTERRUPTED) - error = EINTR; - else - error = EIO; - break; - } - } - - return (error); -} - -int -uscannerwrite(dev_t dev, struct uio *uio, int flag) -{ - struct uscanner_softc *sc; - int error; - - sc = uscanner_cd.cd_devs[USCANNERUNIT(dev)]; - - sc->sc_refcnt++; - error = uscanner_do_write(sc, uio, flag); - if (--sc->sc_refcnt < 0) - usb_detach_wakeup(&sc->sc_dev); - return (error); -} - -int -uscanner_activate(struct device *self, int act) -{ - struct uscanner_softc *sc = (struct uscanner_softc *)self; - - switch (act) { - case DVACT_DEACTIVATE: - sc->sc_dying = 1; - break; - } - return (0); -} - -int -uscanner_detach(struct device *self, int flags) -{ - struct uscanner_softc *sc = (struct uscanner_softc *)self; - int s; - int maj, mn; - - DPRINTF(("uscanner_detach: sc=%p flags=%d\n", sc, flags)); - - sc->sc_dev_flags = 0; /* make close really close device */ - - /* Abort all pipes. Causes processes waiting for transfer to wake. */ - if (sc->sc_bulkin_pipe != NULL) - usbd_abort_pipe(sc->sc_bulkin_pipe); - if (sc->sc_bulkout_pipe != NULL) - usbd_abort_pipe(sc->sc_bulkout_pipe); - - s = splusb(); - if (--sc->sc_refcnt >= 0) { - /* Wait for processes to go away. */ - usb_detach_wait(&sc->sc_dev); - } - splx(s); - - /* locate the major number */ - for (maj = 0; maj < nchrdev; maj++) - if (cdevsw[maj].d_open == uscanneropen) - break; - - /* Nuke the vnodes for any open instances (calls close). */ - mn = self->dv_unit * USB_MAX_ENDPOINTS; - vdevgone(maj, mn, mn + USB_MAX_ENDPOINTS - 1, VCHR); - - return (0); -} - -int -uscannerpoll(dev_t dev, int events, struct proc *p) -{ - struct uscanner_softc *sc; - int revents = 0; - - sc = uscanner_cd.cd_devs[USCANNERUNIT(dev)]; - - if (sc->sc_dying) - return (POLLERR); - - /* - * We have no easy way of determining if a read will - * yield any data or a write will happen. - * Pretend they will. - */ - revents |= events & - (POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM); - - return (revents); -} - -int -uscannerioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) -{ - return (EINVAL); -} - -void filt_uscannerdetach(struct knote *); -int uscannerkqfilter(dev_t, struct knote *); - -void -filt_uscannerdetach(struct knote *kn) -{ - struct uscanner_softc *sc = (void *)kn->kn_hook; - - SLIST_REMOVE(&sc->sc_selq.si_note, kn, knote, kn_selnext); -} - -struct filterops uscanner_seltrue_filtops = - { 1, NULL, filt_uscannerdetach, filt_seltrue }; - -int -uscannerkqfilter(dev_t dev, struct knote *kn) -{ - struct uscanner_softc *sc; - struct klist *klist; - - sc = uscanner_cd.cd_devs[USCANNERUNIT(dev)]; - - if (sc->sc_dying) - return (ENXIO); - - switch (kn->kn_filter) { - case EVFILT_READ: - case EVFILT_WRITE: - /* - * We have no easy way of determining if a read will - * yield any data or a write will happen. - * Pretend they will. - */ - klist = &sc->sc_selq.si_note; - kn->kn_fop = &uscanner_seltrue_filtops; - break; - - default: - return (EINVAL); - } - - kn->kn_hook = (void *)sc; - - SLIST_INSERT_HEAD(klist, kn, kn_selnext); - - return (0); -} diff --git a/sys/sys/conf.h b/sys/sys/conf.h index cb317613f70..13794b1a16a 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.124 2013/06/21 21:30:38 syl Exp $ */ +/* $OpenBSD: conf.h,v 1.125 2013/08/20 14:27:32 ajacoutot Exp $ */ /* $NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $ */ /*- @@ -656,7 +656,6 @@ cdev_decl(ugen); cdev_decl(uhid); cdev_decl(ucom); cdev_decl(ulpt); -cdev_decl(uscanner); cdev_decl(urio); cdev_decl(hotplug); |