Module Name: src
Committed By: riz
Date: Tue Jun 12 17:48:05 UTC 2012
Modified Files:
src/share/man/man4 [netbsd-6]: wscons.4
src/sys/arch/amd64/conf [netbsd-6]: GENERIC XEN3_DOM0
src/sys/arch/atari/conf [netbsd-6]: MILAN.in
src/sys/arch/bebox/conf [netbsd-6]: GENERIC INSTALL
src/sys/arch/cats/conf [netbsd-6]: GENERIC INSTALL
src/sys/arch/evbarm/conf [netbsd-6]: ARMADILLO9 BEAGLEBOARD
MMNET_GENERIC MPCSA_GENERIC TS7200
src/sys/arch/evbppc/conf [netbsd-6]: EXPLORA451 VIRTEX_DFC VIRTEX_GSRD1
VIRTEX_GSRD2
src/sys/arch/hp700/conf [netbsd-6]: GENERIC
src/sys/arch/hpcmips/conf [netbsd-6]: GENERIC MPC303 TX3912 TX3922
VR41XX
src/sys/arch/hpcsh/conf [netbsd-6]: GENERIC
src/sys/arch/i386/conf [netbsd-6]: ALL GENERIC GENERIC_TINY
INSTALL_FLOPPY INSTALL_TINY XEN3_DOM0
src/sys/arch/netwinder/conf [netbsd-6]: GENERIC
src/sys/arch/next68k/conf [netbsd-6]: GENERIC SLAB
src/sys/arch/prep/conf [netbsd-6]: GENERIC
src/sys/arch/shark/conf [netbsd-6]: GENERIC INSTALL
src/sys/arch/sparc/conf [netbsd-6]: KRUPS TADPOLE3GX
src/sys/arch/sparc64/conf [netbsd-6]: GENERIC
src/sys/arch/vax/conf [netbsd-6]: GENERIC
src/sys/arch/zaurus/conf [netbsd-6]: GENERIC
Log Message:
Pull up following revision(s) (requested by abs in ticket #311):
sys/arch/netwinder/conf/GENERIC: revision 1.112
sys/arch/i386/conf/GENERIC: revision 1.1074
sys/arch/atari/conf/MILAN.in: revision 1.26
sys/arch/zaurus/conf/GENERIC: revision 1.54
sys/arch/shark/conf/GENERIC: revision 1.101
sys/arch/hpcmips/conf/MPC303: revision 1.60
sys/arch/i386/conf/XEN3_DOM0: revision 1.67
sys/arch/evbarm/conf/MPCSA_GENERIC: revision 1.29
sys/arch/vax/conf/GENERIC: revision 1.181
sys/arch/sparc/conf/KRUPS: revision 1.59
sys/arch/evbarm/conf/BEAGLEBOARD: revision 1.27
sys/arch/i386/conf/INSTALL_FLOPPY: revision 1.16
sys/arch/prep/conf/GENERIC: revision 1.163
sys/arch/hpcmips/conf/GENERIC: revision 1.216
sys/arch/sparc/conf/TADPOLE3GX: revision 1.56
sys/arch/shark/conf/INSTALL: revision 1.50
sys/arch/next68k/conf/GENERIC: revision 1.127
sys/arch/evbppc/conf/VIRTEX_GSRD2: revision 1.16
sys/arch/evbppc/conf/VIRTEX_DFC: revision 1.17
sys/arch/evbppc/conf/EXPLORA451: revision 1.48
sys/arch/bebox/conf/INSTALL: revision 1.54
sys/arch/next68k/conf/SLAB: revision 1.46
sys/arch/i386/conf/GENERIC_TINY: revision 1.132
sys/arch/bebox/conf/GENERIC: revision 1.131
sys/arch/amd64/conf/XEN3_DOM0: revision 1.84
sys/arch/amd64/conf/GENERIC: revision 1.356
sys/arch/evbarm/conf/MMNET_GENERIC: revision 1.6
share/man/man4/wscons.4: revision 1.31
sys/arch/hpcmips/conf/TX3912: revision 1.79
sys/arch/evbarm/conf/ARMADILLO9: revision 1.35
sys/arch/hpcsh/conf/GENERIC: revision 1.97
sys/arch/i386/conf/ALL: revision 1.339
sys/arch/hpcmips/conf/TX3922: revision 1.93
sys/arch/cats/conf/INSTALL: revision 1.82
sys/arch/sparc64/conf/GENERIC: revision 1.151
sys/arch/i386/conf/INSTALL_TINY: revision 1.135
sys/arch/evbppc/conf/VIRTEX_GSRD1: revision 1.15
sys/arch/evbarm/conf/TS7200: revision 1.49
sys/arch/hpcmips/conf/VR41XX: revision 1.55
sys/arch/hp700/conf/GENERIC: revision 1.115
sys/arch/cats/conf/GENERIC: revision 1.140
Mention wsconscfg(8) needs WSDISPLAY_COMPAT_USL
If a port is going to have wscons for virtual terminals then it really make=
s
sense to enable WSDISPLAY_COMPAT_USL so the system can switch between the
virtual terminals...
Adjust the WSDISPLAY_COMPAT_USL comment to mention wsconscfg, to at least
give a hint that its not just for third party compat. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.6.1 src/share/man/man4/wscons.4
cvs rdiff -u -r1.348.2.1 -r1.348.2.2 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.77.2.3 -r1.77.2.4 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.25 -r1.25.14.1 src/sys/arch/atari/conf/MILAN.in
cvs rdiff -u -r1.129 -r1.129.2.1 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.53 -r1.53.2.1 src/sys/arch/bebox/conf/INSTALL
cvs rdiff -u -r1.138 -r1.138.2.1 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.81 -r1.81.2.1 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/arch/evbarm/conf/ARMADILLO9
cvs rdiff -u -r1.25 -r1.25.2.1 src/sys/arch/evbarm/conf/BEAGLEBOARD
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.47 -r1.47.2.1 src/sys/arch/evbarm/conf/TS7200
cvs rdiff -u -r1.47 -r1.47.2.1 src/sys/arch/evbppc/conf/EXPLORA451
cvs rdiff -u -r1.16 -r1.16.2.1 src/sys/arch/evbppc/conf/VIRTEX_DFC
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/arch/evbppc/conf/VIRTEX_GSRD1
cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/arch/evbppc/conf/VIRTEX_GSRD2
cvs rdiff -u -r1.111 -r1.111.2.1 src/sys/arch/hp700/conf/GENERIC
cvs rdiff -u -r1.215 -r1.215.2.1 src/sys/arch/hpcmips/conf/GENERIC
cvs rdiff -u -r1.59 -r1.59.2.1 src/sys/arch/hpcmips/conf/MPC303
cvs rdiff -u -r1.78 -r1.78.2.1 src/sys/arch/hpcmips/conf/TX3912
cvs rdiff -u -r1.92 -r1.92.2.1 src/sys/arch/hpcmips/conf/TX3922
cvs rdiff -u -r1.54 -r1.54.2.1 src/sys/arch/hpcmips/conf/VR41XX
cvs rdiff -u -r1.95 -r1.95.2.1 src/sys/arch/hpcsh/conf/GENERIC
cvs rdiff -u -r1.332.2.2 -r1.332.2.3 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1066.2.1 -r1.1066.2.2 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.130 -r1.130.4.1 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.134 -r1.134.4.1 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.60.2.3 -r1.60.2.4 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.110 -r1.110.2.1 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.125 -r1.125.2.1 src/sys/arch/next68k/conf/GENERIC
cvs rdiff -u -r1.44 -r1.44.4.1 src/sys/arch/next68k/conf/SLAB
cvs rdiff -u -r1.161 -r1.161.2.1 src/sys/arch/prep/conf/GENERIC
cvs rdiff -u -r1.98 -r1.98.2.1 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.49 -r1.49.2.1 src/sys/arch/shark/conf/INSTALL
cvs rdiff -u -r1.56 -r1.56.4.1 src/sys/arch/sparc/conf/KRUPS
cvs rdiff -u -r1.54 -r1.54.4.1 src/sys/arch/sparc/conf/TADPOLE3GX
cvs rdiff -u -r1.148 -r1.148.2.1 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.179 -r1.179.2.1 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.51 -r1.51.2.1 src/sys/arch/zaurus/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/wscons.4
diff -u src/share/man/man4/wscons.4:1.29 src/share/man/man4/wscons.4:1.29.6.1
--- src/share/man/man4/wscons.4:1.29 Sun Mar 6 17:39:05 2011
+++ src/share/man/man4/wscons.4 Tue Jun 12 17:48:03 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: wscons.4,v 1.29 2011/03/06 17:39:05 wiz Exp $
+.\" $NetBSD: wscons.4,v 1.29.6.1 2012/06/12 17:48:03 riz Exp $
.\"
.\" Copyright (c) 1999, 2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 4, 2005
+.Dd June 5, 2012
.Dt WSCONS 4
.Os
.Sh NAME
@@ -185,7 +185,7 @@ or if no emulation type was passed to th
utility.
.Ss Compatibility options
these options allow X servers and other programs using low-level
-console driver functions which were written specifically for other
+console driver functions usually written specifically for other
console drivers to run on
.Nx
systems.
@@ -194,6 +194,10 @@ The options are in particular:
.It Cd WSDISPLAY_COMPAT_USL
Support the protocol for switches between multiple virtual screens on
one display as used by most PC-UNIX variants.
+This is used by the
+.Nx
+.Xr wsconscfg 8
+utility.
.It Cd WSDISPLAY_COMPAT_RAWKBD
Allows to get raw XT keyboard scancodes from PC keyboards as needed
by i386 X servers.
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.348.2.1 src/sys/arch/amd64/conf/GENERIC:1.348.2.2
--- src/sys/arch/amd64/conf/GENERIC:1.348.2.1 Mon Apr 23 16:31:37 2012
+++ src/sys/arch/amd64/conf/GENERIC Tue Jun 12 17:48:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.348.2.1 2012/04/23 16:31:37 riz Exp $
+# $NetBSD: GENERIC,v 1.348.2.2 2012/06/12 17:48:03 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.348.2.1 $"
+#ident "GENERIC-$Revision: 1.348.2.2 $"
maxusers 64 # estimated number of users
@@ -229,7 +229,7 @@ options WS_KERNEL_FG=WSCOL_GREEN
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# don't attach pckbd as the console if no PS/2 keyboard is found
options PCKBD_CNATTACH_MAY_FAIL
@@ -962,6 +962,7 @@ atu* at uhub? port ? # Atmel at76c50x 8
otus* at uhub? port ? # Atheros AR9001U
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
+urtwn* at uhub? port ? # Realtek RTL8188CU/RTL8192CU 802.11b/g/n
zyd* at uhub? port ? # Zydas ZD1211
# USB scanners that use SCSI emulation, e.g., HP5300
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.3 src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.4
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.3 Mon Apr 23 16:31:37 2012
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Jun 12 17:48:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.77.2.3 2012/04/23 16:31:37 riz Exp $
+# $NetBSD: XEN3_DOM0,v 1.77.2.4 2012/06/12 17:48:02 riz Exp $
include "arch/amd64/conf/std.xen"
@@ -174,7 +174,7 @@ options WS_KERNEL_FG=WSCOL_GREEN
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/atari/conf/MILAN.in
diff -u src/sys/arch/atari/conf/MILAN.in:1.25 src/sys/arch/atari/conf/MILAN.in:1.25.14.1
--- src/sys/arch/atari/conf/MILAN.in:1.25 Sat Apr 10 01:59:40 2010
+++ src/sys/arch/atari/conf/MILAN.in Tue Jun 12 17:47:53 2012
@@ -1,5 +1,5 @@
#
-# $NetBSD: MILAN.in,v 1.25 2010/04/10 01:59:40 tsutsui Exp $
+# $NetBSD: MILAN.in,v 1.25.14.1 2012/06/12 17:47:53 riz Exp $
#
# Milan
#
@@ -23,7 +23,7 @@ options WS_KERNEL_FG=WSCOL_WHITE
options WS_KERNEL_BG=WSCOL_BLACK
# compatibility to other console drivers
-#options WSDISPLAY_COMPAT_USL # VT handling
+#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
Index: src/sys/arch/bebox/conf/GENERIC
diff -u src/sys/arch/bebox/conf/GENERIC:1.129 src/sys/arch/bebox/conf/GENERIC:1.129.2.1
--- src/sys/arch/bebox/conf/GENERIC:1.129 Sun Dec 18 05:49:25 2011
+++ src/sys/arch/bebox/conf/GENERIC Tue Jun 12 17:48:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.129 2011/12/18 05:49:25 dholland Exp $
+# $NetBSD: GENERIC,v 1.129.2.1 2012/06/12 17:48:02 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.129 $"
+#ident "GENERIC-$Revision: 1.129.2.1 $"
maxusers 32
@@ -159,7 +159,7 @@ options SCSIVERBOSE # human readable SC
options WSEMUL_VT100 # VT100 / VT220 emulation
options WS_DEFAULT_FG=WSCOL_LIGHT_WHITE
# compatibility to other console drivers
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
config netbsd root on ? type ?
Index: src/sys/arch/bebox/conf/INSTALL
diff -u src/sys/arch/bebox/conf/INSTALL:1.53 src/sys/arch/bebox/conf/INSTALL:1.53.2.1
--- src/sys/arch/bebox/conf/INSTALL:1.53 Sun Dec 18 05:49:25 2011
+++ src/sys/arch/bebox/conf/INSTALL Tue Jun 12 17:48:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.53 2011/12/18 05:49:25 dholland Exp $
+# $NetBSD: INSTALL,v 1.53.2.1 2012/06/12 17:48:01 riz Exp $
#
# First try for BeBox config file
#
@@ -85,7 +85,7 @@ options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARA
options WSEMUL_VT100 # VT100 / VT220 emulation
options WS_DEFAULT_FG=WSCOL_LIGHT_WHITE
# compatibility to other console drivers
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
config netbsd root on ? type ffs
Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.138 src/sys/arch/cats/conf/GENERIC:1.138.2.1
--- src/sys/arch/cats/conf/GENERIC:1.138 Mon Feb 6 17:51:05 2012
+++ src/sys/arch/cats/conf/GENERIC Tue Jun 12 17:48:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.138 2012/02/06 17:51:05 matt Exp $
+# $NetBSD: GENERIC,v 1.138.2.1 2012/06/12 17:48:04 riz Exp $
#
# GENERIC machine description file
#
@@ -182,7 +182,7 @@ options WSEMUL_VT100 # VT100 / VT220 e
options WS_KERNEL_FG=WSCOL_GREEN
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/wscons/wskbdmap_mfii.h for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/cats/conf/INSTALL
diff -u src/sys/arch/cats/conf/INSTALL:1.81 src/sys/arch/cats/conf/INSTALL:1.81.2.1
--- src/sys/arch/cats/conf/INSTALL:1.81 Sun Dec 18 05:49:25 2011
+++ src/sys/arch/cats/conf/INSTALL Tue Jun 12 17:48:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.81 2011/12/18 05:49:25 dholland Exp $
+# $NetBSD: INSTALL,v 1.81.2.1 2012/06/12 17:48:04 riz Exp $
#
# CATSINST -- CHALTECH CATS Install kernel
#
@@ -132,7 +132,7 @@ options WSEMUL_VT100 # VT100 / VT220 e
options WS_KERNEL_FG=WSCOL_GREEN
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/wscons/wskbdmap_mfii.h for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/evbarm/conf/ARMADILLO9
diff -u src/sys/arch/evbarm/conf/ARMADILLO9:1.32 src/sys/arch/evbarm/conf/ARMADILLO9:1.32.2.1
--- src/sys/arch/evbarm/conf/ARMADILLO9:1.32 Sun Dec 18 05:49:25 2011
+++ src/sys/arch/evbarm/conf/ARMADILLO9 Tue Jun 12 17:47:57 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO9,v 1.32 2011/12/18 05:49:25 dholland Exp $
+# $NetBSD: ARMADILLO9,v 1.32.2.1 2012/06/12 17:47:57 riz Exp $
#
# ARMADILLO9 -- Atmark Techno, Armadillo-9
#
@@ -322,7 +322,7 @@ options WSEMUL_VT100 # VT100 / VT220 e
# compatibility to other console drivers
#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-#options WSDISPLAY_COMPAT_USL # VT handling
+#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/evbarm/conf/BEAGLEBOARD
diff -u src/sys/arch/evbarm/conf/BEAGLEBOARD:1.25 src/sys/arch/evbarm/conf/BEAGLEBOARD:1.25.2.1
--- src/sys/arch/evbarm/conf/BEAGLEBOARD:1.25 Thu Feb 9 19:07:37 2012
+++ src/sys/arch/evbarm/conf/BEAGLEBOARD Tue Jun 12 17:47:57 2012
@@ -1,5 +1,5 @@
#
-# $NetBSD: BEAGLEBOARD,v 1.25 2012/02/09 19:07:37 matt Exp $
+# $NetBSD: BEAGLEBOARD,v 1.25.2.1 2012/06/12 17:47:57 riz Exp $
#
# BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
#
@@ -252,7 +252,7 @@ options WS_DEFAULT_FG=WSCOL_BLACK
options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
options WS_KERNEL_FG=WSCOL_GREEN
options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options WSDISPLAY_DEFAULTSCREENS=4
options FONT_QVSS8x15
Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.3 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.3.2.1
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.3 Sun Dec 18 05:49:26 2011
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC Tue Jun 12 17:47:57 2012
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.3 2011/12/18 05:49:26 dholland Exp $
+# $NetBSD: MMNET_GENERIC,v 1.3.2.1 2012/06/12 17:47:57 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.3 $"
+#ident "GENERIC-$Revision: 1.3.2.1 $"
maxusers 32 # estimated number of users
@@ -226,7 +226,7 @@ options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARA
# compatibility to other console drivers
#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-#options WSDISPLAY_COMPAT_USL # VT handling
+#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
#options WSKBD_EVENT_AUTOREPEAT # auto repeat in event mode
#options WSKBD_USONLY # strip off non-US keymaps
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.26 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.26.2.1
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.26 Thu Feb 9 19:07:37 2012
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC Tue Jun 12 17:47:56 2012
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.26 2012/02/09 19:07:37 matt Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.26.2.1 2012/06/12 17:47:56 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.26 $"
+#ident "GENERIC-$Revision: 1.26.2.1 $"
maxusers 32 # estimated number of users
@@ -224,7 +224,7 @@ options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARA
# compatibility to other console drivers
#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-#options WSDISPLAY_COMPAT_USL # VT handling
+#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
#options WSKBD_EVENT_AUTOREPEAT # auto repeat in event mode
#options WSKBD_USONLY # strip off non-US keymaps
Index: src/sys/arch/evbarm/conf/TS7200
diff -u src/sys/arch/evbarm/conf/TS7200:1.47 src/sys/arch/evbarm/conf/TS7200:1.47.2.1
--- src/sys/arch/evbarm/conf/TS7200:1.47 Sun Dec 18 05:49:26 2011
+++ src/sys/arch/evbarm/conf/TS7200 Tue Jun 12 17:47:57 2012
@@ -1,4 +1,4 @@
-# $NetBSD: TS7200,v 1.47 2011/12/18 05:49:26 dholland Exp $
+# $NetBSD: TS7200,v 1.47.2.1 2012/06/12 17:47:57 riz Exp $
#
# TS7200 - Kernel for Technologic Systems TS7200 ARM hardware
#
@@ -484,7 +484,7 @@ pseudo-device ksyms # /dev/ksyms
# compatibility to other console drivers
#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-#options WSDISPLAY_COMPAT_USL # VT handling
+#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/evbppc/conf/EXPLORA451
diff -u src/sys/arch/evbppc/conf/EXPLORA451:1.47 src/sys/arch/evbppc/conf/EXPLORA451:1.47.2.1
--- src/sys/arch/evbppc/conf/EXPLORA451:1.47 Sun Dec 18 05:49:26 2011
+++ src/sys/arch/evbppc/conf/EXPLORA451 Tue Jun 12 17:48:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: EXPLORA451,v 1.47 2011/12/18 05:49:26 dholland Exp $
+# $NetBSD: EXPLORA451,v 1.47.2.1 2012/06/12 17:48:01 riz Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -136,7 +136,7 @@ options WS_KERNEL_FG=WSCOL_GREEN
# compatibility to other console drivers
#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-#options WSDISPLAY_COMPAT_USL # VT handling
+#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/evbppc/conf/VIRTEX_DFC
diff -u src/sys/arch/evbppc/conf/VIRTEX_DFC:1.16 src/sys/arch/evbppc/conf/VIRTEX_DFC:1.16.2.1
--- src/sys/arch/evbppc/conf/VIRTEX_DFC:1.16 Sun Dec 18 05:49:27 2011
+++ src/sys/arch/evbppc/conf/VIRTEX_DFC Tue Jun 12 17:48:00 2012
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTEX_DFC,v 1.16 2011/12/18 05:49:27 dholland Exp $
+# $NetBSD: VIRTEX_DFC,v 1.16.2.1 2012/06/12 17:48:00 riz Exp $
#
# VIRTEX_DFC
#
@@ -141,7 +141,7 @@ options IPFILTER_COMPAT # Compat for IP
options WSEMUL_VT100
options WSEMUL_DEFAULT_FG=WSCOL_BLACK
options WSEMUL_DEFAULT_BG=WSCOL_LIGHT_WHITE
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD
#options WSDISPLAY_DEFAULTSCREENS=4
options FONT_VT220L8x16
Index: src/sys/arch/evbppc/conf/VIRTEX_GSRD1
diff -u src/sys/arch/evbppc/conf/VIRTEX_GSRD1:1.14 src/sys/arch/evbppc/conf/VIRTEX_GSRD1:1.14.2.1
--- src/sys/arch/evbppc/conf/VIRTEX_GSRD1:1.14 Sun Dec 18 05:49:27 2011
+++ src/sys/arch/evbppc/conf/VIRTEX_GSRD1 Tue Jun 12 17:48:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTEX_GSRD1,v 1.14 2011/12/18 05:49:27 dholland Exp $
+# $NetBSD: VIRTEX_GSRD1,v 1.14.2.1 2012/06/12 17:48:01 riz Exp $
#
# VIRTEX_GSRD1
#
@@ -132,7 +132,7 @@ options IPFILTER_LOG # ipmon(8) log sup
options WSEMUL_VT100
options WSEMUL_DEFAULT_FG=WSCOL_BLACK
options WSEMUL_DEFAULT_BG=WSCOL_LIGHT_WHITE
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD
#options WSDISPLAY_DEFAULTSCREENS=4
options FONT_VT220L8x16
Index: src/sys/arch/evbppc/conf/VIRTEX_GSRD2
diff -u src/sys/arch/evbppc/conf/VIRTEX_GSRD2:1.15 src/sys/arch/evbppc/conf/VIRTEX_GSRD2:1.15.2.1
--- src/sys/arch/evbppc/conf/VIRTEX_GSRD2:1.15 Sun Dec 18 05:49:27 2011
+++ src/sys/arch/evbppc/conf/VIRTEX_GSRD2 Tue Jun 12 17:48:00 2012
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTEX_GSRD2,v 1.15 2011/12/18 05:49:27 dholland Exp $
+# $NetBSD: VIRTEX_GSRD2,v 1.15.2.1 2012/06/12 17:48:00 riz Exp $
#
# VIRTEX_GSRD2
#
@@ -140,7 +140,7 @@ options IPFILTER_LOG # ipmon(8) log sup
options WSEMUL_VT100
options WSEMUL_DEFAULT_FG=WSCOL_BLACK
options WSEMUL_DEFAULT_BG=WSCOL_LIGHT_WHITE
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD
#options WSDISPLAY_DEFAULTSCREENS=4
options FONT_VT220L8x16
Index: src/sys/arch/hp700/conf/GENERIC
diff -u src/sys/arch/hp700/conf/GENERIC:1.111 src/sys/arch/hp700/conf/GENERIC:1.111.2.1
--- src/sys/arch/hp700/conf/GENERIC:1.111 Sat Feb 4 16:29:14 2012
+++ src/sys/arch/hp700/conf/GENERIC Tue Jun 12 17:48:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.111 2012/02/04 16:29:14 skrll Exp $
+# $NetBSD: GENERIC,v 1.111.2.1 2012/06/12 17:48:05 riz Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hp700/conf/std.hp700"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.111 $"
+#ident "GENERIC-$Revision: 1.111.2.1 $"
maxusers 32 # estimated number of users
@@ -189,7 +189,7 @@ options WSDISPLAY_CUSTOM_BORDER # borde
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/hpcmips/conf/GENERIC
diff -u src/sys/arch/hpcmips/conf/GENERIC:1.215 src/sys/arch/hpcmips/conf/GENERIC:1.215.2.1
--- src/sys/arch/hpcmips/conf/GENERIC:1.215 Sun Dec 18 05:49:28 2011
+++ src/sys/arch/hpcmips/conf/GENERIC Tue Jun 12 17:47:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.215 2011/12/18 05:49:28 dholland Exp $
+# $NetBSD: GENERIC,v 1.215.2.1 2012/06/12 17:47:55 riz Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ include "arch/hpcmips/conf/std.hpcmips.
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.215 $"
+#ident "GENERIC-$Revision: 1.215.2.1 $"
maxusers 16
@@ -156,7 +156,7 @@ options FONT_VT220L8x10
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
#
# Hpckbd will set key board layout appropriately. You can use option
Index: src/sys/arch/hpcmips/conf/MPC303
diff -u src/sys/arch/hpcmips/conf/MPC303:1.59 src/sys/arch/hpcmips/conf/MPC303:1.59.2.1
--- src/sys/arch/hpcmips/conf/MPC303:1.59 Sun Dec 18 05:49:28 2011
+++ src/sys/arch/hpcmips/conf/MPC303 Tue Jun 12 17:47:55 2012
@@ -1,5 +1,5 @@
#
-# $NetBSD: MPC303,v 1.59 2011/12/18 05:49:28 dholland Exp $
+# $NetBSD: MPC303,v 1.59.2.1 2012/06/12 17:47:55 riz Exp $
# From: NetBSD: GENERIC,v 1.91 2001/05/06 14:25:16 takemura Exp
#
# Kernel configuration file for Victor MP-C303; enami's test machine.
@@ -9,7 +9,7 @@ include "arch/hpcmips/conf/std.hpcmips"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.59 $"
+#ident "GENERIC-$Revision: 1.59.2.1 $"
maxusers 16
@@ -119,7 +119,7 @@ options FONT_VT220L8x10
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
#
# Hpckbd will set key board layout appropriately. You can use option
Index: src/sys/arch/hpcmips/conf/TX3912
diff -u src/sys/arch/hpcmips/conf/TX3912:1.78 src/sys/arch/hpcmips/conf/TX3912:1.78.2.1
--- src/sys/arch/hpcmips/conf/TX3912:1.78 Sun Dec 18 05:49:28 2011
+++ src/sys/arch/hpcmips/conf/TX3912 Tue Jun 12 17:47:55 2012
@@ -2,7 +2,7 @@
# Distribution kernel (TOSHIBA TX3912 based model) kernel config file
#
-# $NetBSD: TX3912,v 1.78 2011/12/18 05:49:28 dholland Exp $
+# $NetBSD: TX3912,v 1.78.2.1 2012/06/12 17:47:55 riz Exp $
#
include "arch/hpcmips/conf/std.hpcmips"
@@ -203,7 +203,7 @@ options FONT_VT220L8x10
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# PCMCIA bus support
Index: src/sys/arch/hpcmips/conf/TX3922
diff -u src/sys/arch/hpcmips/conf/TX3922:1.92 src/sys/arch/hpcmips/conf/TX3922:1.92.2.1
--- src/sys/arch/hpcmips/conf/TX3922:1.92 Sun Dec 18 05:49:28 2011
+++ src/sys/arch/hpcmips/conf/TX3922 Tue Jun 12 17:47:56 2012
@@ -1,7 +1,7 @@
#
# Distribution kernel (TOSHIBA TX3922 based model) kernel config file
#
-# $NetBSD: TX3922,v 1.92 2011/12/18 05:49:28 dholland Exp $
+# $NetBSD: TX3922,v 1.92.2.1 2012/06/12 17:47:56 riz Exp $
#
include "arch/hpcmips/conf/std.hpcmips"
@@ -281,7 +281,7 @@ options WS_KERNEL_BG=WSCOL_BLUE
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# PCMCIA bus support
Index: src/sys/arch/hpcmips/conf/VR41XX
diff -u src/sys/arch/hpcmips/conf/VR41XX:1.54 src/sys/arch/hpcmips/conf/VR41XX:1.54.2.1
--- src/sys/arch/hpcmips/conf/VR41XX:1.54 Sun Dec 18 05:49:28 2011
+++ src/sys/arch/hpcmips/conf/VR41XX Tue Jun 12 17:47:56 2012
@@ -1,4 +1,4 @@
-# $NetBSD: VR41XX,v 1.54 2011/12/18 05:49:28 dholland Exp $
+# $NetBSD: VR41XX,v 1.54.2.1 2012/06/12 17:47:56 riz 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.54 $"
+#ident "GENERIC-$Revision: 1.54.2.1 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -132,7 +132,7 @@ options FONT_VT220L8x10
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
#
# Hpckbd will set key board layout appropriately. You can use option
Index: src/sys/arch/hpcsh/conf/GENERIC
diff -u src/sys/arch/hpcsh/conf/GENERIC:1.95 src/sys/arch/hpcsh/conf/GENERIC:1.95.2.1
--- src/sys/arch/hpcsh/conf/GENERIC:1.95 Sun Dec 18 05:49:28 2011
+++ src/sys/arch/hpcsh/conf/GENERIC Tue Jun 12 17:48:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.95 2011/12/18 05:49:28 dholland Exp $
+# $NetBSD: GENERIC,v 1.95.2.1 2012/06/12 17:48:03 riz Exp $
#
# GENERIC machine description file
#
@@ -192,7 +192,7 @@ options WS_KERNEL_BG=WSCOL_BLUE
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options FONT_VT220L8x10 # the console font
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.332.2.2 src/sys/arch/i386/conf/ALL:1.332.2.3
--- src/sys/arch/i386/conf/ALL:1.332.2.2 Mon Apr 23 16:31:36 2012
+++ src/sys/arch/i386/conf/ALL Tue Jun 12 17:47:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.332.2.2 2012/04/23 16:31:36 riz Exp $
+# $NetBSD: ALL,v 1.332.2.3 2012/06/12 17:47:53 riz Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.332.2.2 $"
+#ident "ALL-$Revision: 1.332.2.3 $"
maxusers 64 # estimated number of users
@@ -280,7 +280,7 @@ options WSDISPLAY_BORDER_COLOR=WSCOL_BL
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options WSKBD_EVENT_AUTOREPEAT # auto repeat in event mode
#options WSKBD_USONLY # strip off non-US keymaps
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1066.2.1 src/sys/arch/i386/conf/GENERIC:1.1066.2.2
--- src/sys/arch/i386/conf/GENERIC:1.1066.2.1 Mon Apr 23 16:31:35 2012
+++ src/sys/arch/i386/conf/GENERIC Tue Jun 12 17:47:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1066.2.1 2012/04/23 16:31:35 riz Exp $
+# $NetBSD: GENERIC,v 1.1066.2.2 2012/06/12 17:47:51 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1066.2.1 $"
+#ident "GENERIC-$Revision: 1.1066.2.2 $"
maxusers 64 # estimated number of users
@@ -268,7 +268,7 @@ options WSDISPLAY_CUSTOM_BORDER # custo
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
#options WSKBD_EVENT_AUTOREPEAT # auto repeat in event mode
#options WSKBD_USONLY # strip off non-US keymaps
@@ -1226,6 +1226,7 @@ otus* at uhub? port ? # Atheros AR9001U
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
upgt* at uhub? port ? # Intersil PrismGT
+urtwn* at uhub? port ? # Realtek RTL8188CU/RTL8192CU 802.11b/g/n
zyd* at uhub? port ? # Zydas ZD1211
# Prolific PL2301/PL2302 host-to-host adapter
Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.130 src/sys/arch/i386/conf/GENERIC_TINY:1.130.4.1
--- src/sys/arch/i386/conf/GENERIC_TINY:1.130 Tue Nov 22 21:25:20 2011
+++ src/sys/arch/i386/conf/GENERIC_TINY Tue Jun 12 17:47:52 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.130 2011/11/22 21:25:20 tls Exp $
+# $NetBSD: GENERIC_TINY,v 1.130.4.1 2012/06/12 17:47:52 riz Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -177,7 +177,7 @@ options WS_KERNEL_FG=WSCOL_GREEN
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for pckbd driver
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.15 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.15.2.1
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.15 Sun Jan 29 18:29:11 2012
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Tue Jun 12 17:47:52 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.15 2012/01/29 18:29:11 hannken Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.15.2.1 2012/06/12 17:47:52 riz Exp $
#
# INSTALL - Installation kernel.
#
@@ -173,7 +173,7 @@ options WSEMUL_VT100 # VT100 / VT220 e
# compatibility to other console drivers
#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-#options WSDISPLAY_COMPAT_USL # VT handling
+#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.134 src/sys/arch/i386/conf/INSTALL_TINY:1.134.4.1
--- src/sys/arch/i386/conf/INSTALL_TINY:1.134 Tue Nov 22 21:25:21 2011
+++ src/sys/arch/i386/conf/INSTALL_TINY Tue Jun 12 17:47:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.134 2011/11/22 21:25:21 tls Exp $
+# $NetBSD: INSTALL_TINY,v 1.134.4.1 2012/06/12 17:47:53 riz Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -169,7 +169,7 @@ options WS_KERNEL_FG=WSCOL_GREEN
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for pckbd driver
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.3 src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.4
--- src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.3 Mon Apr 23 16:31:36 2012
+++ src/sys/arch/i386/conf/XEN3_DOM0 Tue Jun 12 17:47:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.60.2.3 2012/04/23 16:31:36 riz Exp $
+# $NetBSD: XEN3_DOM0,v 1.60.2.4 2012/06/12 17:47:51 riz Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -196,7 +196,7 @@ options WSEMUL_VT100 # VT100 / VT220 e
options WS_KERNEL_FG=WSCOL_GREEN
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options WSDISPLAY_DEFAULTSCREENS=4
options WSDISPLAY_SCROLLSUPPORT
Index: src/sys/arch/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.110 src/sys/arch/netwinder/conf/GENERIC:1.110.2.1
--- src/sys/arch/netwinder/conf/GENERIC:1.110 Sun Dec 18 05:49:30 2011
+++ src/sys/arch/netwinder/conf/GENERIC Tue Jun 12 17:47:50 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.110 2011/12/18 05:49:30 dholland Exp $
+# $NetBSD: GENERIC,v 1.110.2.1 2012/06/12 17:47:50 riz Exp $
#
# GENERIC machine description file
#
@@ -250,7 +250,7 @@ options WS_KERNEL_COLATTR=WSATTR_HILIT
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options FONT_GALLANT12x22 # Sun PROM font look-alike
Index: src/sys/arch/next68k/conf/GENERIC
diff -u src/sys/arch/next68k/conf/GENERIC:1.125 src/sys/arch/next68k/conf/GENERIC:1.125.2.1
--- src/sys/arch/next68k/conf/GENERIC:1.125 Sun Dec 18 05:49:30 2011
+++ src/sys/arch/next68k/conf/GENERIC Tue Jun 12 17:48:00 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.125 2011/12/18 05:49:30 dholland Exp $
+# $NetBSD: GENERIC,v 1.125.2.1 2012/06/12 17:48:00 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/next68k/conf/std.next68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.125 $"
+#ident "GENERIC-$Revision: 1.125.2.1 $"
# Needs to be set per system. i.e change these as you see fit
maxusers 16
@@ -178,7 +178,7 @@ options RCONS_16BPP # necessary for co
#options WSEMUL_SUN # sun terminal emulation
options WSEMUL_VT100 # VT100 / VT220 emulation
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/wskbdmap_next.h for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/next68k/conf/SLAB
diff -u src/sys/arch/next68k/conf/SLAB:1.44 src/sys/arch/next68k/conf/SLAB:1.44.4.1
--- src/sys/arch/next68k/conf/SLAB:1.44 Tue Nov 22 21:25:31 2011
+++ src/sys/arch/next68k/conf/SLAB Tue Jun 12 17:48:00 2012
@@ -1,4 +1,4 @@
-# $NetBSD: SLAB,v 1.44 2011/11/22 21:25:31 tls Exp $
+# $NetBSD: SLAB,v 1.44.4.1 2012/06/12 17:48:00 riz Exp $
#
# deberg's development machine
#
@@ -132,7 +132,7 @@ options RCONS_16BPP # necessary for ne
#options WSEMUL_SUN # sun terminal emulation
options WSEMUL_VT100 # VT100 / VT220 emulation
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/wskbdmap_next.h for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/prep/conf/GENERIC
diff -u src/sys/arch/prep/conf/GENERIC:1.161 src/sys/arch/prep/conf/GENERIC:1.161.2.1
--- src/sys/arch/prep/conf/GENERIC:1.161 Sun Dec 18 05:49:31 2011
+++ src/sys/arch/prep/conf/GENERIC Tue Jun 12 17:47:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.161 2011/12/18 05:49:31 dholland Exp $
+# $NetBSD: GENERIC,v 1.161.2.1 2012/06/12 17:47:59 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/prep/conf/std.prep"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.161 $"
+#ident "GENERIC-$Revision: 1.161.2.1 $"
maxusers 32
@@ -166,7 +166,7 @@ options WSEMUL_VT100 # VT100 / VT220 e
options WS_KERNEL_FG=WSCOL_GREEN
#options WS_KERNEL_BG=WSCOL_BLACK
# compatibility to other console drivers
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.98 src/sys/arch/shark/conf/GENERIC:1.98.2.1
--- src/sys/arch/shark/conf/GENERIC:1.98 Sun Jan 29 00:50:59 2012
+++ src/sys/arch/shark/conf/GENERIC Tue Jun 12 17:47:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.98 2012/01/29 00:50:59 christos Exp $
+# $NetBSD: GENERIC,v 1.98.2.1 2012/06/12 17:47:54 riz Exp $
#
# Generic Shark configuration.
#
@@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.98 $"
+#ident "GENERIC-$Revision: 1.98.2.1 $"
# estimated number of users
maxusers 32
@@ -190,7 +190,7 @@ options WS_KERNEL_FG=WSCOL_GREEN
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/shark/conf/INSTALL
diff -u src/sys/arch/shark/conf/INSTALL:1.49 src/sys/arch/shark/conf/INSTALL:1.49.2.1
--- src/sys/arch/shark/conf/INSTALL:1.49 Sun Dec 18 05:49:32 2011
+++ src/sys/arch/shark/conf/INSTALL Tue Jun 12 17:47:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.49 2011/12/18 05:49:32 dholland Exp $
+# $NetBSD: INSTALL,v 1.49.2.1 2012/06/12 17:47:54 riz Exp $
#
# Shark installation kernel
#
@@ -161,7 +161,7 @@ options WSEMUL_VT100 # VT100 / VT220 e
# compatibility to other console drivers
#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-#options WSDISPLAY_COMPAT_USL # VT handling
+#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
Index: src/sys/arch/sparc/conf/KRUPS
diff -u src/sys/arch/sparc/conf/KRUPS:1.56 src/sys/arch/sparc/conf/KRUPS:1.56.4.1
--- src/sys/arch/sparc/conf/KRUPS:1.56 Tue Nov 22 21:25:37 2011
+++ src/sys/arch/sparc/conf/KRUPS Tue Jun 12 17:47:58 2012
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.56 2011/11/22 21:25:37 tls Exp $
+# $NetBSD: KRUPS,v 1.56.4.1 2012/06/12 17:47:58 riz Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "KRUPS-$Revision: 1.56 $"
+#ident "KRUPS-$Revision: 1.56.4.1 $"
maxusers 32
@@ -97,7 +97,7 @@ options WSDISPLAY_CUSTOM_BORDER # custo
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options FONT_GALLANT12x22 # PROM font look-alike
Index: src/sys/arch/sparc/conf/TADPOLE3GX
diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.54 src/sys/arch/sparc/conf/TADPOLE3GX:1.54.4.1
--- src/sys/arch/sparc/conf/TADPOLE3GX:1.54 Tue Nov 22 21:25:37 2011
+++ src/sys/arch/sparc/conf/TADPOLE3GX Tue Jun 12 17:47:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: TADPOLE3GX,v 1.54 2011/11/22 21:25:37 tls Exp $
+# $NetBSD: TADPOLE3GX,v 1.54.4.1 2012/06/12 17:47:59 riz Exp $
include "arch/sparc/conf/std.sparc"
@@ -35,7 +35,7 @@ options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_DEFAULTSCREENS=1
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.148 src/sys/arch/sparc64/conf/GENERIC:1.148.2.1
--- src/sys/arch/sparc64/conf/GENERIC:1.148 Tue Jan 17 16:03:37 2012
+++ src/sys/arch/sparc64/conf/GENERIC Tue Jun 12 17:48:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.148 2012/01/17 16:03:37 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.148.2.1 2012/06/12 17:48:04 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.148 $"
+#ident "GENERIC-$Revision: 1.148.2.1 $"
maxusers 64
@@ -918,7 +918,7 @@ wskbd0 at kbd0
options WSEMUL_VT100 # allow us to be wsvt25
options WS_DEFAULT_FG=WSCOL_BLACK
options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options WSDISPLAY_DEFAULTSCREENS=4
options FONT_GALLANT12x22 # PROM font look-alike
Index: src/sys/arch/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.179 src/sys/arch/vax/conf/GENERIC:1.179.2.1
--- src/sys/arch/vax/conf/GENERIC:1.179 Sun Dec 18 05:49:33 2011
+++ src/sys/arch/vax/conf/GENERIC Tue Jun 12 17:47:58 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.179 2011/12/18 05:49:33 dholland Exp $
+# $NetBSD: GENERIC,v 1.179.2.1 2012/06/12 17:47:58 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/vax/conf/std.vax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.179 $"
+#ident "GENERIC-$Revision: 1.179.2.1 $"
# Here are all different supported CPU types listed.
#options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800
@@ -128,6 +128,7 @@ options NFS_BOOT_BOOTPARAM # Use the Su
# WS console uses VT100 terminal emulation
options WSEMUL_VT100
options WSDISPLAY_DEFAULTSCREENS=8
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options FONT_QVSS8x15
# System V shared memory & semaphores support.
Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.51 src/sys/arch/zaurus/conf/GENERIC:1.51.2.1
--- src/sys/arch/zaurus/conf/GENERIC:1.51 Sun Jan 29 10:12:41 2012
+++ src/sys/arch/zaurus/conf/GENERIC Tue Jun 12 17:47:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.51 2012/01/29 10:12:41 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.51.2.1 2012/06/12 17:47:54 riz Exp $
#
# GENERIC machine description file
#
@@ -153,7 +153,7 @@ options WS_KERNEL_FG=WSCOL_GREEN
# compatibility to other console drivers
options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
-options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# Development and Debugging options
