PERFORCE change 154351 for review

[Ed Schouten]

http://perforce.freebsd.org/chv.cgi?CH=154351

Change 154351 by ed at ed_flippo on 2008/12/08 19:02:15

	We'll stick to cons25 for now.

Affected files ...

.. //depot/projects/mpsafetty/etc/etc.amd64/ttys#5 integrate
.. //depot/projects/mpsafetty/etc/etc.arm/ttys#4 integrate
.. //depot/projects/mpsafetty/etc/etc.i386/ttys#5 integrate
.. //depot/projects/mpsafetty/etc/etc.ia64/ttys#4 integrate
.. //depot/projects/mpsafetty/etc/etc.mips/ttys#5 integrate
.. //depot/projects/mpsafetty/etc/etc.powerpc/ttys#4 integrate
.. //depot/projects/mpsafetty/etc/etc.sparc64/ttys#4 integrate
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/sequences#4 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#5 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#10 edit
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr_compat.h#1 add
.. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr_cons25.h#3 delete

Differences ...

==== //depot/projects/mpsafetty/etc/etc.amd64/ttys#5 (text+ko) ====

@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically xterm, but
+#      For virtual consoles, the correct type is typically cons25, but
 #      vt220 will work better if you need interoperability with other
 #      systems like Solaris or GNU/Linux.
 #      Other common values include network for network connections on
@@ -32,15 +32,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/mpsafetty/etc/etc.arm/ttys#4 (text+ko) ====

@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically xterm, but
+#      For virtual consoles, the correct type is typically cons25, but
 #      vt220 will work better if you need interoperability with other
 #      systems like Solaris or GNU/Linux.
 #      Other common values include network for network connections on
@@ -32,15 +32,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
 #ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/mpsafetty/etc/etc.i386/ttys#5 (text+ko) ====

@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically xterm, but
+#      For virtual consoles, the correct type is typically cons25, but
 #      vt220 will work better if you need interoperability with other
 #      systems like Solaris or GNU/Linux.
 #      Other common values include network for network connections on
@@ -32,15 +32,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/mpsafetty/etc/etc.ia64/ttys#4 (text+ko) ====

@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically xterm, but
+#      For virtual consoles, the correct type is typically cons25, but
 #      vt220 will work better if you need interoperability with other
 #      systems like Solaris or GNU/Linux.
 #      Other common values include network for network connections on
@@ -32,15 +32,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv0	"/usr/libexec/getty Pc"		cons25	off secure
 # Virtual terminals.
-ttyv1	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv2	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv3	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv4	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv5	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv6	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv7	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv1	"/usr/libexec/getty Pc"		cons25	off secure
+ttyv2	"/usr/libexec/getty Pc"		cons25	off secure
+ttyv3	"/usr/libexec/getty Pc"		cons25	off secure
+ttyv4	"/usr/libexec/getty Pc"		cons25	off secure
+ttyv5	"/usr/libexec/getty Pc"		cons25	off secure
+ttyv6	"/usr/libexec/getty Pc"		cons25	off secure
+ttyv7	"/usr/libexec/getty Pc"		cons25	off secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals. The 'dialup' keyword identifies dialin lines to login,
 # fingerd etc.

==== //depot/projects/mpsafetty/etc/etc.mips/ttys#5 (text+ko) ====

@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically xterm, but
+#      For virtual consoles, the correct type is typically cons25, but
 #      vt220 will work better if you need interoperability with other
 #      systems like Solaris or GNU/Linux.
 #      Other common values include network for network connections on

==== //depot/projects/mpsafetty/etc/etc.powerpc/ttys#4 (text+ko) ====

@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically xterm, but
+#      For virtual consoles, the correct type is typically cons25, but
 #      vt220 will work better if you need interoperability with other
 #      systems like Solaris or GNU/Linux.
 #      Other common values include network for network connections on
@@ -32,15 +32,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
 #ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/mpsafetty/etc/etc.sparc64/ttys#4 (text+ko) ====

@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically xterm, but
+#      For virtual consoles, the correct type is typically cons25, but
 #      vt220 will work better if you need interoperability with other
 #      systems like Solaris or GNU/Linux.
 #      Other common values include network for network connections on
@@ -36,15 +36,15 @@
 ttya	"/usr/libexec/getty 3wire.9600"	vt100	off secure
 ttyb	"/usr/libexec/getty 3wire.9600"	vt100	off secure
 # syscons(4)
-ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
-ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/mpsafetty/sys/dev/syscons/teken/sequences#4 (text+ko) ====

@@ -91,3 +91,6 @@
 # Cons25 compatibility sequences
 C25CURS	Cons25 set cursor type			^[ [ = S	0
 C25VTSW	Cons25 switch virtual terminal		^[ [ z		0
+
+# VT52 compatibility
+#DECID	VT52 DECID				^[ Z

==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#5 (text+ko) ====

@@ -169,7 +169,7 @@
 }
 
 #include "teken_subr.h"
-#include "teken_subr_cons25.h"
+#include "teken_subr_compat.h"
 
 /*
  * Programming interface.

==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#10 (text+ko) ====

@@ -757,6 +757,9 @@
 	case 1: /* Cursor keys mode. */
 		teken_funcs_param(t, TP_CURSORKEYS, 0);
 		break;
+	case 2: /* DECANM: ANSI/VT52 mode. */
+		teken_printf("DECRST VT52\n");
+		break;
 	case 3: /* 132 column mode. */
 		teken_funcs_param(t, TP_132COLS, 0);
 		teken_subr_reset_to_initial_state(t);
@@ -781,6 +784,12 @@
 	case 25: /* Hide cursor. */
 		teken_funcs_param(t, TP_SHOWCURSOR, 0);
 		break;
+	case 40: /* Disallow 132 columns. */
+		teken_printf("DECRST allow 132\n");
+		break;
+	case 45: /* Disable reverse wraparound. */
+		teken_printf("DECRST reverse wraparound\n");
+		break;
 	case 47: /* Switch to alternate buffer. */
 		teken_printf("Switch to alternate buffer\n");
 		/* XXX: unsupported. */
@@ -884,6 +893,9 @@
 	case 1: /* Cursor keys mode. */
 		teken_funcs_param(t, TP_CURSORKEYS, 1);
 		break;
+	case 2: /* DECANM: ANSI/VT52 mode. */
+		teken_printf("DECSET VT52\n");
+		break;
 	case 3: /* 132 column mode. */
 		teken_funcs_param(t, TP_132COLS, 1);
 		teken_subr_reset_to_initial_state(t);
@@ -908,6 +920,12 @@
 	case 25: /* Display cursor. */
 		teken_funcs_param(t, TP_SHOWCURSOR, 1);
 		break;
+	case 40: /* Allow 132 columns. */
+		teken_printf("DECSET allow 132\n");
+		break;
+	case 45: /* Enable reverse wraparound. */
+		teken_printf("DECSET reverse wraparound\n");
+		break;
 	case 47: /* Switch to alternate buffer. */
 		/* XXX: unsupported. */
 		break;