Removed 'XT_KEYBOARD' option from syscons. Document new-style way of

getting the same behavior using the flags, which can be done inside of
UserConfig.  (Also document other syscons flags which were previously
undocumented).

Requested by:	bde

6 files changed, 30 insertions, 18 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index fb98ebb..ad58c57 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.289 1996/11/11 05:17:34 gibbs Exp $
+#	$Id: LINT,v 1.290 1996/11/11 20:38:28 bde Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -494,7 +494,14 @@ options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 options		MAXCONS=16		# number of virtual consoles
 options		SLOW_VGA		# do byte-wide i/o's to TS and GDC regs
-options		XT_KEYBOARD		# extra initialization for XT keyboard
+
+#
+# `flags' for sc0:
+#       0x01    Use a 'visual' bell
+#       0x02    Use a 'blink' cursor
+#       0x04    Use a 'block' cursor
+#       0x08    Force detection of keyboard, else we always assume a keyboard
+#       0x10    Old-style (XT) keyboard support, useful for older ThinkPads
 
 #
 # This device is mandatory.
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index d326ebe..fefed14 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.183 1996/11/04 21:01:08 sos Exp $
+ *  $Id: syscons.c,v 1.184 1996/11/10 16:44:09 nate Exp $
  */
 
 #include "sc.h"
@@ -349,9 +349,6 @@ gotack:
      */
     if ( dev->id_flags & XT_KEYBD )
         xt_keyboard = 1;
-#ifdef XT_KEYBOARD
-    xt_keyboard = 1;
-#endif
     if ( xt_keyboard ) {
         kbd_wait();
         outb(KB_DATA, 0xF0);
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index fb98ebb..ad58c57 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.289 1996/11/11 05:17:34 gibbs Exp $
+#	$Id: LINT,v 1.290 1996/11/11 20:38:28 bde Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -494,7 +494,14 @@ options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 options		MAXCONS=16		# number of virtual consoles
 options		SLOW_VGA		# do byte-wide i/o's to TS and GDC regs
-options		XT_KEYBOARD		# extra initialization for XT keyboard
+
+#
+# `flags' for sc0:
+#       0x01    Use a 'visual' bell
+#       0x02    Use a 'blink' cursor
+#       0x04    Use a 'block' cursor
+#       0x08    Force detection of keyboard, else we always assume a keyboard
+#       0x10    Old-style (XT) keyboard support, useful for older ThinkPads
 
 #
 # This device is mandatory.
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index fb98ebb..ad58c57 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.289 1996/11/11 05:17:34 gibbs Exp $
+#	$Id: LINT,v 1.290 1996/11/11 20:38:28 bde Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -494,7 +494,14 @@ options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 options		MAXCONS=16		# number of virtual consoles
 options		SLOW_VGA		# do byte-wide i/o's to TS and GDC regs
-options		XT_KEYBOARD		# extra initialization for XT keyboard
+
+#
+# `flags' for sc0:
+#       0x01    Use a 'visual' bell
+#       0x02    Use a 'blink' cursor
+#       0x04    Use a 'block' cursor
+#       0x08    Force detection of keyboard, else we always assume a keyboard
+#       0x10    Old-style (XT) keyboard support, useful for older ThinkPads
 
 #
 # This device is mandatory.
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index d326ebe..fefed14 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.183 1996/11/04 21:01:08 sos Exp $
+ *  $Id: syscons.c,v 1.184 1996/11/10 16:44:09 nate Exp $
  */
 
 #include "sc.h"
@@ -349,9 +349,6 @@ gotack:
      */
     if ( dev->id_flags & XT_KEYBD )
         xt_keyboard = 1;
-#ifdef XT_KEYBOARD
-    xt_keyboard = 1;
-#endif
     if ( xt_keyboard ) {
         kbd_wait();
         outb(KB_DATA, 0xF0);
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index d326ebe..fefed14 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.183 1996/11/04 21:01:08 sos Exp $
+ *  $Id: syscons.c,v 1.184 1996/11/10 16:44:09 nate Exp $
  */
 
 #include "sc.h"
@@ -349,9 +349,6 @@ gotack:
      */
     if ( dev->id_flags & XT_KEYBD )
         xt_keyboard = 1;
-#ifdef XT_KEYBOARD
-    xt_keyboard = 1;
-#endif
     if ( xt_keyboard ) {
         kbd_wait();
         outb(KB_DATA, 0xF0);