Module Name: src
Committed By: abs
Date: Fri Aug 17 19:43:26 UTC 2012
Modified Files:
src/sys/arch/acorn32/conf: GENERIC
src/sys/arch/evbarm/conf: RPI
src/sys/arch/hpcarm/conf: JORNADA720 JORNADA820 NETBOOKPRO WZERO3
src/sys/arch/sparc/conf: GENERIC
src/sys/arch/usermode/conf: GENERIC.common
src/sys/arch/zaurus/conf: INSTALL
Log Message:
Ensure all WSDISPLAY_COMPAT_USL entries have same comment
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/RPI
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/hpcarm/conf/JORNADA720
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hpcarm/conf/JORNADA820
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcarm/conf/NETBOOKPRO
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hpcarm/conf/WZERO3
cvs rdiff -u -r1.233 -r1.234 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/usermode/conf/GENERIC.common
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/zaurus/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn32/conf/GENERIC
diff -u src/sys/arch/acorn32/conf/GENERIC:1.102 src/sys/arch/acorn32/conf/GENERIC:1.103
--- src/sys/arch/acorn32/conf/GENERIC:1.102 Sat Mar 10 21:51:48 2012
+++ src/sys/arch/acorn32/conf/GENERIC Fri Aug 17 19:43:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.102 2012/03/10 21:51:48 joerg Exp $
+# $NetBSD: GENERIC,v 1.103 2012/08/17 19:43:24 abs Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.102 $"
+#ident "GENERIC-$Revision: 1.103 $"
# estimated number of users
maxusers 32
@@ -201,7 +201,7 @@ options WSEMUL_VT100
options WS_KERNEL_FG=WSCOL_GREEN
#options WSDISPLAY_COMPAT_RAWKBD
-options WSDISPLAY_COMPAT_USL
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_SCROLLSUPPORT
vidcvideo0 at vidc? # wscons driver for VIDC
Index: src/sys/arch/evbarm/conf/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.2 src/sys/arch/evbarm/conf/RPI:1.3
--- src/sys/arch/evbarm/conf/RPI:1.2 Thu Aug 16 23:45:58 2012
+++ src/sys/arch/evbarm/conf/RPI Fri Aug 17 19:43:24 2012
@@ -1,5 +1,5 @@
#
-# $NetBSD: RPI,v 1.2 2012/08/16 23:45:58 jakllsch Exp $
+# $NetBSD: RPI,v 1.3 2012/08/17 19:43:24 abs Exp $
#
# RPi -- Raspberry Pi
#
@@ -198,7 +198,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/hpcarm/conf/JORNADA720
diff -u src/sys/arch/hpcarm/conf/JORNADA720:1.86 src/sys/arch/hpcarm/conf/JORNADA720:1.87
--- src/sys/arch/hpcarm/conf/JORNADA720:1.86 Sat Mar 10 21:51:52 2012
+++ src/sys/arch/hpcarm/conf/JORNADA720 Fri Aug 17 19:43:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: JORNADA720,v 1.86 2012/03/10 21:51:52 joerg Exp $
+# $NetBSD: JORNADA720,v 1.87 2012/08/17 19:43:25 abs Exp $
#
# JORNADA -- Windows-CE based jornada 720
#
@@ -7,7 +7,7 @@ include "arch/hpcarm/conf/std.sa11x0"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.86 $"
+#ident "GENERIC-$Revision: 1.87 $"
# estimated number of users
maxusers 32
@@ -261,7 +261,7 @@ options WSEMUL_VT100
options WSDISPLAY_DEFAULTSCREENS=2
options FONT_VT220L8x10
# The X server requires theses two options
-options WSDISPLAY_COMPAT_USL
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD
# customization of console and kernel output - see dev/wscons/wsdisplayvar.h
options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
Index: src/sys/arch/hpcarm/conf/JORNADA820
diff -u src/sys/arch/hpcarm/conf/JORNADA820:1.26 src/sys/arch/hpcarm/conf/JORNADA820:1.27
--- src/sys/arch/hpcarm/conf/JORNADA820:1.26 Sat Mar 10 21:51:52 2012
+++ src/sys/arch/hpcarm/conf/JORNADA820 Fri Aug 17 19:43:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: JORNADA820,v 1.26 2012/03/10 21:51:52 joerg Exp $
+# $NetBSD: JORNADA820,v 1.27 2012/08/17 19:43:25 abs Exp $
#
# JORNADA -- Windows-CE based jornada 820
#
@@ -7,7 +7,7 @@ include "arch/hpcarm/conf/std.sa11x0"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.26 $"
+#ident "GENERIC-$Revision: 1.27 $"
# estimated number of users
maxusers 32
@@ -222,7 +222,7 @@ saost* at saip? addr 0x90000000 size 0x2
#options J720KBD_LAYOUT=KB_FR
#options FONT_VT220L8x10
# The X server requires theses two options
-#options WSDISPLAY_COMPAT_USL
+#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD
# customization of console and kernel output - see dev/wscons/wsdisplayvar.h
#options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
Index: src/sys/arch/hpcarm/conf/NETBOOKPRO
diff -u src/sys/arch/hpcarm/conf/NETBOOKPRO:1.5 src/sys/arch/hpcarm/conf/NETBOOKPRO:1.6
--- src/sys/arch/hpcarm/conf/NETBOOKPRO:1.5 Sat Mar 31 14:02:54 2012
+++ src/sys/arch/hpcarm/conf/NETBOOKPRO Fri Aug 17 19:43:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: NETBOOKPRO,v 1.5 2012/03/31 14:02:54 nonaka Exp $
+# $NetBSD: NETBOOKPRO,v 1.6 2012/08/17 19:43:25 abs Exp $
#
# NETBOOKPRO -- Psion Teklogix NETBOOK PRO
#
@@ -8,7 +8,7 @@ include "arch/hpcarm/conf/files.netbookp
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.5 $"
+#ident "GENERIC-$Revision: 1.6 $"
# estimated number of users
maxusers 32
@@ -125,7 +125,7 @@ options WSEMUL_VT100
# allocate a number of virtual screens at autoconfiguration time
#options WSDISPLAY_DEFAULTSCREENS=2
# The X server requires theses two options
-options WSDISPLAY_COMPAT_USL
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD
# customization of console and kernel output - see dev/wscons/wsdisplayvar.h
#options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
Index: src/sys/arch/hpcarm/conf/WZERO3
diff -u src/sys/arch/hpcarm/conf/WZERO3:1.25 src/sys/arch/hpcarm/conf/WZERO3:1.26
--- src/sys/arch/hpcarm/conf/WZERO3:1.25 Sat Mar 31 14:02:54 2012
+++ src/sys/arch/hpcarm/conf/WZERO3 Fri Aug 17 19:43:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: WZERO3,v 1.25 2012/03/31 14:02:54 nonaka Exp $
+# $NetBSD: WZERO3,v 1.26 2012/08/17 19:43:25 abs Exp $
#
# WZERO3 -- Sharp Windows Mobile 5 based PDA
#
@@ -8,7 +8,7 @@ include "arch/hpcarm/conf/files.wzero3"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.25 $"
+#ident "GENERIC-$Revision: 1.26 $"
# estimated number of users
maxusers 32
@@ -125,7 +125,7 @@ options WSEMUL_VT100
# allocate a number of virtual screens at autoconfiguration time
#options WSDISPLAY_DEFAULTSCREENS=2
# The X server requires theses two options
-options WSDISPLAY_COMPAT_USL
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_COMPAT_RAWKBD
# customization of console and kernel output - see dev/wscons/wsdisplayvar.h
#options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.233 src/sys/arch/sparc/conf/GENERIC:1.234
--- src/sys/arch/sparc/conf/GENERIC:1.233 Tue Jun 26 02:04:55 2012
+++ src/sys/arch/sparc/conf/GENERIC Fri Aug 17 19:43:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.233 2012/06/26 02:04:55 macallan Exp $
+# $NetBSD: GENERIC,v 1.234 2012/08/17 19:43:25 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.233 $"
+#ident "GENERIC-$Revision: 1.234 $"
maxusers 32
@@ -61,7 +61,7 @@ options WS_KERNEL_FG=WSCOL_GREEN
options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
options WSDISPLAY_COMPAT_PCVT
options WSDISPLAY_COMPAT_SYSCONS
-options WSDISPLAY_COMPAT_USL
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_SCROLLSUPPORT
Index: src/sys/arch/usermode/conf/GENERIC.common
diff -u src/sys/arch/usermode/conf/GENERIC.common:1.17 src/sys/arch/usermode/conf/GENERIC.common:1.18
--- src/sys/arch/usermode/conf/GENERIC.common:1.17 Mon Jan 23 12:08:31 2012
+++ src/sys/arch/usermode/conf/GENERIC.common Fri Aug 17 19:43:25 2012
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC.common,v 1.17 2012/01/23 12:08:31 reinoud Exp $
+# $NetBSD: GENERIC.common,v 1.18 2012/08/17 19:43:25 abs Exp $
include "arch/usermode/conf/std.usermode"
options INCLUDE_CONFIG_FILE
-#ident "GENERIC-$Revision: 1.17 $"
+#ident "GENERIC-$Revision: 1.18 $"
maxusers 32
makeoptions DEBUG="-O1 -g3"
@@ -71,7 +71,7 @@ options WSEMUL_VT100
options WS_KERNEL_FG=WSCOL_GREEN
options WSKBD_DEFAULT_KEYREPEAT_DEL1=1000
options WSKBD_DEFAULT_KEYREPEAT_DELN=200
-options WSDISPLAY_COMPAT_USL
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
pseudo-device loop
pseudo-device pty
Index: src/sys/arch/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.15 src/sys/arch/zaurus/conf/INSTALL:1.16
--- src/sys/arch/zaurus/conf/INSTALL:1.15 Sat Apr 7 09:10:47 2012
+++ src/sys/arch/zaurus/conf/INSTALL Fri Aug 17 19:43:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.15 2012/04/07 09:10:47 nonaka Exp $
+# $NetBSD: INSTALL,v 1.16 2012/08/17 19:43:26 abs Exp $
#
# INSTALL config file (GENERIC with memory disk root)
#
@@ -51,7 +51,7 @@ no options SYSVSHM
options PIPE_SOCKETPAIR
no options WSDISPLAY_COMPAT_PCVT
-no options WSDISPLAY_COMPAT_USL
+no options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
no options WSDISPLAY_COMPAT_RAWKBD
options RASOPS_SMALL
