[src/trunk]: src/sys/arch Disable uscanner in all kernel configs

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch Disable uscanner in all kernel configs
From: gdt <gdt%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 20:03:28 +0000
details:   https://anonhg.NetBSD.org/src/rev/c49c29bba598
branches:  trunk
changeset: 344285:c49c29bba598
user:      gdt <gdt%NetBSD.org@localhost>
date:      Sat Mar 19 23:21:02 2016 +0000

description:
Disable uscanner in all kernel configs

As discussed on current-users@, SANE uses ugen via libusb and not
uscanner, so users are not well served by having uscanner.  Consensus
is that addressing how to adjust permissions for scanners should not
block restoring basic functionionality.

(Compile-tested only, but there are multiple reports of this being the
right approach.)

diffstat:

 sys/arch/alpha/conf/GENERIC            |  6 +++---
 sys/arch/amd64/conf/GENERIC            |  6 +++---
 sys/arch/amd64/conf/XEN3_DOM0          |  4 ++--
 sys/arch/cats/conf/GENERIC             |  4 ++--
 sys/arch/evbarm/conf/HDL_G             |  4 ++--
 sys/arch/evbarm/conf/HPT5325           |  4 ++--
 sys/arch/evbarm/conf/SHEEVAPLUG        |  4 ++--
 sys/arch/evbarm/conf/SMDK2410          |  4 ++--
 sys/arch/evbppc/conf/OPENBLOCKS266_OPT |  4 ++--
 sys/arch/evbppc/conf/PMPPC             |  4 ++--
 sys/arch/hpcmips/conf/GENERIC          |  6 +++---
 sys/arch/hpcmips/conf/TX3922           |  4 ++--
 sys/arch/hpcmips/conf/VR41XX           |  6 +++---
 sys/arch/hppa/conf/GENERIC             |  6 +++---
 sys/arch/i386/conf/GENERIC             |  6 +++---
 sys/arch/i386/conf/XEN3_DOM0           |  4 ++--
 sys/arch/landisk/conf/GENERIC          |  6 +++---
 sys/arch/macppc/conf/GENERIC           |  6 +++---
 sys/arch/sgimips/conf/GENERIC32_IP3x   |  6 +++---
 sys/arch/sparc64/conf/GENERIC          |  6 +++---
 20 files changed, 50 insertions(+), 50 deletions(-)

diffs (truncated from 453 to 300 lines):

diff -r e467533f7dc3 -r c49c29bba598 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.367 2016/01/20 12:49:21 jklos Exp $
+# $NetBSD: GENERIC,v 1.368 2016/03/19 23:21:02 gdt Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-ident          "GENERIC-$Revision: 1.367 $"
+ident          "GENERIC-$Revision: 1.368 $"
 
 maxusers 32
 
@@ -641,7 +641,7 @@
 ucom*  at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # Y@P firmware loader
 uyap* at uhub? port ?
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.426 2016/03/16 16:13:16 christos Exp $
+# $NetBSD: GENERIC,v 1.427 2016/03/19 23:21:02 gdt Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.426 $"
+#ident                 "GENERIC-$Revision: 1.427 $"
 
 maxusers       64              # estimated number of users
 
@@ -1005,7 +1005,7 @@
 ucom*  at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # USB 802.11 adapters
 athn*  at uhub? port ?         # Atheros AR9002U
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.116 2015/11/10 13:01:41 tnn Exp $
+# $NetBSD: XEN3_DOM0,v 1.117 2016/03/19 23:21:02 gdt Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -661,7 +661,7 @@
 ucom*  at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/cats/conf/GENERIC
--- a/sys/arch/cats/conf/GENERIC        Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/cats/conf/GENERIC        Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.156 2015/08/08 06:36:25 maxv Exp $
+# $NetBSD: GENERIC,v 1.157 2016/03/19 23:21:02 gdt Exp $
 #
 # GENERIC machine description file
 # 
@@ -428,7 +428,7 @@
 ucom*  at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/evbarm/conf/HDL_G
--- a/sys/arch/evbarm/conf/HDL_G        Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/evbarm/conf/HDL_G        Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.44 2015/08/12 07:53:57 maxv Exp $
+# $NetBSD: HDL_G,v 1.45 2016/03/19 23:21:02 gdt Exp $
 #
 #       HDL_G -- I-O DATA HDL-G Kernel
 #
@@ -356,7 +356,7 @@
 ucom*  at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/evbarm/conf/HPT5325
--- a/sys/arch/evbarm/conf/HPT5325      Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/evbarm/conf/HPT5325      Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: HPT5325,v 1.25 2015/08/08 06:36:25 maxv Exp $
+#      $NetBSD: HPT5325,v 1.26 2016/03/19 23:21:02 gdt Exp $
 #
 #  This configuration supports for HP T5325 Thin Client
 #
@@ -372,7 +372,7 @@
 #ucom* at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/evbarm/conf/SHEEVAPLUG
--- a/sys/arch/evbarm/conf/SHEEVAPLUG   Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/evbarm/conf/SHEEVAPLUG   Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: SHEEVAPLUG,v 1.47 2015/09/26 11:16:12 maxv Exp $
+#      $NetBSD: SHEEVAPLUG,v 1.48 2016/03/19 23:21:02 gdt Exp $
 #
 #  This configuration supports for generically Marvell SheevaPlug
 #
@@ -373,7 +373,7 @@
 ucom*  at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/evbarm/conf/SMDK2410
--- a/sys/arch/evbarm/conf/SMDK2410     Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/evbarm/conf/SMDK2410     Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: SMDK2410,v 1.58 2015/08/12 07:53:57 maxv Exp $
+#      $NetBSD: SMDK2410,v 1.59 2016/03/19 23:21:02 gdt Exp $
 #
 #      SMDK2410 -- Samsung's S3C2410 evaluation board.
 #
@@ -313,7 +313,7 @@
 ucom*  at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/evbppc/conf/OPENBLOCKS266_OPT
--- a/sys/arch/evbppc/conf/OPENBLOCKS266_OPT    Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/evbppc/conf/OPENBLOCKS266_OPT    Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: OPENBLOCKS266_OPT,v 1.18 2014/10/15 08:14:44 uebayasi Exp $
+#      $NetBSD: OPENBLOCKS266_OPT,v 1.19 2016/03/19 23:21:02 gdt Exp $
 #
 
 include                "arch/evbppc/conf/OPENBLOCKS266"
@@ -267,7 +267,7 @@
 ucom*  at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/evbppc/conf/PMPPC
--- a/sys/arch/evbppc/conf/PMPPC        Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/evbppc/conf/PMPPC        Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: PMPPC,v 1.35 2014/10/15 08:14:44 uebayasi Exp $
+#      $NetBSD: PMPPC,v 1.36 2016/03/19 23:21:02 gdt Exp $
 #
 #      PMPPC
 #
@@ -394,7 +394,7 @@
 #ucom* at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/hpcmips/conf/GENERIC
--- a/sys/arch/hpcmips/conf/GENERIC     Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/hpcmips/conf/GENERIC     Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.229 2014/11/16 16:01:41 manu Exp $
+# $NetBSD: GENERIC,v 1.230 2016/03/19 23:21:02 gdt Exp $
 #
 # GENERIC machine description file
 # 
@@ -24,7 +24,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.229 $"
+#ident                 "GENERIC-$Revision: 1.230 $"
 
 maxusers       16
 
@@ -640,7 +640,7 @@
 ucom*  at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/hpcmips/conf/TX3922
--- a/sys/arch/hpcmips/conf/TX3922      Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/hpcmips/conf/TX3922      Sat Mar 19 23:21:02 2016 +0000
@@ -1,7 +1,7 @@
 #
 # Distribution kernel (TOSHIBA TX3922 based model) kernel config file
 #
-#      $NetBSD: TX3922,v 1.101 2015/08/21 01:52:08 uebayasi Exp $
+#      $NetBSD: TX3922,v 1.102 2016/03/19 23:21:02 gdt Exp $
 #
 include                "arch/hpcmips/conf/std.hpcmips"
 
@@ -244,7 +244,7 @@
 ucom*  at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # Y@P firmware loader
 uyap* at uhub? port ?
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/hpcmips/conf/VR41XX
--- a/sys/arch/hpcmips/conf/VR41XX      Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/hpcmips/conf/VR41XX      Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: VR41XX,v 1.64 2015/08/21 01:52:08 uebayasi Exp $
+# $NetBSD: VR41XX,v 1.65 2016/03/19 23:21:02 gdt Exp $
 #
 # GENERIC machine description file
 # 
@@ -20,7 +20,7 @@
 
 include                "arch/hpcmips/conf/std.hpcmips"
 include                "arch/hpcmips/conf/std.hpcmips.vr41"
-#ident                 "GENERIC-$Revision: 1.64 $"
+#ident                 "GENERIC-$Revision: 1.65 $"
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
@@ -501,7 +501,7 @@
 ucom*  at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
diff -r e467533f7dc3 -r c49c29bba598 sys/arch/hppa/conf/GENERIC
--- a/sys/arch/hppa/conf/GENERIC        Sat Mar 19 21:27:38 2016 +0000
+++ b/sys/arch/hppa/conf/GENERIC        Sat Mar 19 23:21:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.7 2015/09/26 11:16:12 maxv Exp $
+# $NetBSD: GENERIC,v 1.8 2016/03/19 23:21:02 gdt Exp $
 #
 # GENERIC machine description file
 #
@@ -23,7 +23,7 @@
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 options        SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
 
-#ident                 "GENERIC-$Revision: 1.7 $"
+#ident                 "GENERIC-$Revision: 1.8 $"
 
 maxusers       32              # estimated number of users
 
@@ -680,7 +680,7 @@
 ucom*  at ukyopon? portno ?
 
 # USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
 
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
Prev by Date: [src/trunk]: src/sbin/fsck_lfs Comment out unused logic. PR 50973
Next by Date: [src/trunk]: src/sys/dev/scsipi Remove extra spaces.
Previous by Thread: [src/trunk]: src/sbin/fsck_lfs Comment out unused logic. PR 50973
Next by Thread: [src/trunk]: src/sys/dev/scsipi Remove extra spaces.
Indexes:
Home | Main Index | Thread Index | Old Index