Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src Pull up following revision(s) (requested by abs in ticket...
details: https://anonhg.NetBSD.org/src/rev/e273977b9d2b
branches: netbsd-6
changeset: 774192:e273977b9d2b
user: riz <riz%NetBSD.org@localhost>
date: Tue Jun 12 17:47:50 2012 +0000
description:
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.
diffstat:
share/man/man4/wscons.4 | 10 +++++++---
sys/arch/amd64/conf/GENERIC | 7 ++++---
sys/arch/amd64/conf/XEN3_DOM0 | 4 ++--
sys/arch/atari/conf/MILAN.in | 4 ++--
sys/arch/bebox/conf/GENERIC | 6 +++---
sys/arch/bebox/conf/INSTALL | 4 ++--
sys/arch/cats/conf/GENERIC | 4 ++--
sys/arch/cats/conf/INSTALL | 4 ++--
sys/arch/evbarm/conf/ARMADILLO9 | 4 ++--
sys/arch/evbarm/conf/BEAGLEBOARD | 4 ++--
sys/arch/evbarm/conf/MMNET_GENERIC | 6 +++---
sys/arch/evbarm/conf/MPCSA_GENERIC | 6 +++---
sys/arch/evbarm/conf/TS7200 | 4 ++--
sys/arch/evbppc/conf/EXPLORA451 | 4 ++--
sys/arch/evbppc/conf/VIRTEX_DFC | 4 ++--
sys/arch/evbppc/conf/VIRTEX_GSRD1 | 4 ++--
sys/arch/evbppc/conf/VIRTEX_GSRD2 | 4 ++--
sys/arch/hp700/conf/GENERIC | 6 +++---
sys/arch/hpcmips/conf/GENERIC | 6 +++---
sys/arch/hpcmips/conf/MPC303 | 6 +++---
sys/arch/hpcmips/conf/TX3912 | 4 ++--
sys/arch/hpcmips/conf/TX3922 | 4 ++--
sys/arch/hpcmips/conf/VR41XX | 6 +++---
sys/arch/hpcsh/conf/GENERIC | 4 ++--
sys/arch/i386/conf/ALL | 6 +++---
sys/arch/i386/conf/GENERIC | 7 ++++---
sys/arch/i386/conf/GENERIC_TINY | 4 ++--
sys/arch/i386/conf/INSTALL_FLOPPY | 4 ++--
sys/arch/i386/conf/INSTALL_TINY | 4 ++--
sys/arch/i386/conf/XEN3_DOM0 | 4 ++--
sys/arch/netwinder/conf/GENERIC | 4 ++--
sys/arch/next68k/conf/GENERIC | 6 +++---
sys/arch/next68k/conf/SLAB | 4 ++--
sys/arch/prep/conf/GENERIC | 6 +++---
sys/arch/shark/conf/GENERIC | 6 +++---
sys/arch/shark/conf/INSTALL | 4 ++--
sys/arch/sparc/conf/KRUPS | 6 +++---
sys/arch/sparc/conf/TADPOLE3GX | 4 ++--
sys/arch/sparc64/conf/GENERIC | 6 +++---
sys/arch/vax/conf/GENERIC | 5 +++--
sys/arch/zaurus/conf/GENERIC | 4 ++--
41 files changed, 105 insertions(+), 98 deletions(-)
diffs (truncated from 926 to 300 lines):
diff -r 83eb3f47d259 -r e273977b9d2b share/man/man4/wscons.4
--- a/share/man/man4/wscons.4 Tue Jun 12 17:18:22 2012 +0000
+++ b/share/man/man4/wscons.4 Tue Jun 12 17:47:50 2012 +0000
@@ -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 @@
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 @@
.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.
diff -r 83eb3f47d259 -r e273977b9d2b sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Tue Jun 12 17:18:22 2012 +0000
+++ b/sys/arch/amd64/conf/GENERIC Tue Jun 12 17:47:50 2012 +0000
@@ -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 @@
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 @@
# 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 @@
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
diff -r 83eb3f47d259 -r e273977b9d2b sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0 Tue Jun 12 17:18:22 2012 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0 Tue Jun 12 17:47:50 2012 +0000
@@ -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 @@
# 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)"
diff -r 83eb3f47d259 -r e273977b9d2b sys/arch/atari/conf/MILAN.in
--- a/sys/arch/atari/conf/MILAN.in Tue Jun 12 17:18:22 2012 +0000
+++ b/sys/arch/atari/conf/MILAN.in Tue Jun 12 17:47:50 2012 +0000
@@ -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_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
diff -r 83eb3f47d259 -r e273977b9d2b sys/arch/bebox/conf/GENERIC
--- a/sys/arch/bebox/conf/GENERIC Tue Jun 12 17:18:22 2012 +0000
+++ b/sys/arch/bebox/conf/GENERIC Tue Jun 12 17:47:50 2012 +0000
@@ -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 @@
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 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 ?
diff -r 83eb3f47d259 -r e273977b9d2b sys/arch/bebox/conf/INSTALL
--- a/sys/arch/bebox/conf/INSTALL Tue Jun 12 17:18:22 2012 +0000
+++ b/sys/arch/bebox/conf/INSTALL Tue Jun 12 17:47:50 2012 +0000
@@ -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 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
diff -r 83eb3f47d259 -r e273977b9d2b sys/arch/cats/conf/GENERIC
--- a/sys/arch/cats/conf/GENERIC Tue Jun 12 17:18:22 2012 +0000
+++ b/sys/arch/cats/conf/GENERIC Tue Jun 12 17:47:50 2012 +0000
@@ -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 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)"
diff -r 83eb3f47d259 -r e273977b9d2b sys/arch/cats/conf/INSTALL
--- a/sys/arch/cats/conf/INSTALL Tue Jun 12 17:18:22 2012 +0000
+++ b/sys/arch/cats/conf/INSTALL Tue Jun 12 17:47:50 2012 +0000
@@ -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 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)"
diff -r 83eb3f47d259 -r e273977b9d2b sys/arch/evbarm/conf/ARMADILLO9
--- a/sys/arch/evbarm/conf/ARMADILLO9 Tue Jun 12 17:18:22 2012 +0000
+++ b/sys/arch/evbarm/conf/ARMADILLO9 Tue Jun 12 17:47:50 2012 +0000
@@ -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 @@
# 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)"
diff -r 83eb3f47d259 -r e273977b9d2b sys/arch/evbarm/conf/BEAGLEBOARD
--- a/sys/arch/evbarm/conf/BEAGLEBOARD Tue Jun 12 17:18:22 2012 +0000
+++ b/sys/arch/evbarm/conf/BEAGLEBOARD Tue Jun 12 17:47:50 2012 +0000
@@ -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_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
diff -r 83eb3f47d259 -r e273977b9d2b sys/arch/evbarm/conf/MMNET_GENERIC
--- a/sys/arch/evbarm/conf/MMNET_GENERIC Tue Jun 12 17:18:22 2012 +0000
+++ b/sys/arch/evbarm/conf/MMNET_GENERIC Tue Jun 12 17:47:50 2012 +0000
@@ -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 @@
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 @@
# 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
diff -r 83eb3f47d259 -r e273977b9d2b sys/arch/evbarm/conf/MPCSA_GENERIC
--- a/sys/arch/evbarm/conf/MPCSA_GENERIC Tue Jun 12 17:18:22 2012 +0000
+++ b/sys/arch/evbarm/conf/MPCSA_GENERIC Tue Jun 12 17:47:50 2012 +0000
@@ -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 @@
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 @@
# 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
diff -r 83eb3f47d259 -r e273977b9d2b sys/arch/evbarm/conf/TS7200
--- a/sys/arch/evbarm/conf/TS7200 Tue Jun 12 17:18:22 2012 +0000
+++ b/sys/arch/evbarm/conf/TS7200 Tue Jun 12 17:47:50 2012 +0000
@@ -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 @@
# 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)"
Home |
Main Index |
Thread Index |
Old Index