[src/trunk]: src/sys/arch/i386/conf Mention UKBD_LAYOUT, which corresponds to...

[augustss <augustss%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a9ebc31ec69e
branches:  trunk
changeset: 580568:a9ebc31ec69e
user:      augustss <augustss%NetBSD.org@localhost>
date:      Fri Apr 29 16:58:39 2005 +0000

description:
Mention UKBD_LAYOUT, which corresponds to PCKBD_LAYOUT for the ukbd driver.

diffstat:

 sys/arch/i386/conf/GENERIC        |  7 ++++---
 sys/arch/i386/conf/GENERIC.MPACPI |  7 ++++---
 sys/arch/i386/conf/GENERIC_LAPTOP |  7 ++++---
 sys/arch/i386/conf/GENERIC_TINY   |  5 +++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diffs (103 lines):

diff -r c3821e896be9 -r a9ebc31ec69e sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Fri Apr 29 16:51:33 2005 +0000
+++ b/sys/arch/i386/conf/GENERIC        Fri Apr 29 16:58:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.668 2005/04/26 12:13:33 augustss Exp $
+# $NetBSD: GENERIC,v 1.669 2005/04/29 16:58:39 augustss Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.668 $"
+#ident                 "GENERIC-$Revision: 1.669 $"
 
 maxusers       32              # estimated number of users
 
@@ -266,7 +266,8 @@
 options        WSDISPLAY_COMPAT_USL            # VT handling
 options        WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
 # see dev/pckbc/wskbdmap_mfii.c for implemented layouts
-#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
+#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" /* for pckbd driver */
+#options       UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  /* for ukbd driver */
 # allocate a number of virtual screens at autoconfiguration time
 #options       WSDISPLAY_DEFAULTSCREENS=4
 # use a large software cursor that doesn't blink
diff -r c3821e896be9 -r a9ebc31ec69e sys/arch/i386/conf/GENERIC.MPACPI
--- a/sys/arch/i386/conf/GENERIC.MPACPI Fri Apr 29 16:51:33 2005 +0000
+++ b/sys/arch/i386/conf/GENERIC.MPACPI Fri Apr 29 16:58:39 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC.MPACPI,v 1.25 2005/04/15 17:27:21 itohy Exp $
+#      $NetBSD: GENERIC.MPACPI,v 1.26 2005/04/29 16:58:39 augustss Exp $
 #
 #      GENERIC.MPACPI -- Generic, plus ACPI Multiprocessor support
 #
@@ -8,7 +8,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.25 $"
+#ident                 "GENERIC-$Revision: 1.26 $"
 
 maxusers       32              # estimated number of users
 
@@ -228,7 +228,8 @@
 options        WSDISPLAY_COMPAT_USL            # VT handling
 options        WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
 # see dev/pckbc/wskbdmap_mfii.c for implemented layouts
-#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
+#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" /* for pckbd driver */
+#options       UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  /* for ukbd driver */
 # allocate a number of virtual screens at autoconfiguration time
 #options       WSDISPLAY_DEFAULTSCREENS=4
 # use a large software cursor that doesn't blink
diff -r c3821e896be9 -r a9ebc31ec69e sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Fri Apr 29 16:51:33 2005 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Fri Apr 29 16:58:39 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC_LAPTOP,v 1.138 2005/04/15 17:27:21 itohy Exp $
+#      $NetBSD: GENERIC_LAPTOP,v 1.139 2005/04/29 16:58:39 augustss Exp $
 #      From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
 #
 #      GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -8,7 +8,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.138 $"
+#ident                 "GENERIC-$Revision: 1.139 $"
 
 maxusers       32              # estimated number of users
 
@@ -213,7 +213,8 @@
 options        WSDISPLAY_COMPAT_USL            # VT handling
 options        WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
 # see dev/pckbc/wskbdmap_mfii.c for implemented layouts
-#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
+#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" /* for pckbd driver */
+#options       UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  /* for ukbd driver */
 # allocate a number of virtual screens at autoconfiguration time
 #options       WSDISPLAY_DEFAULTSCREENS=4
 # use a large software cursor that doesn't blink
diff -r c3821e896be9 -r a9ebc31ec69e sys/arch/i386/conf/GENERIC_TINY
--- a/sys/arch/i386/conf/GENERIC_TINY   Fri Apr 29 16:51:33 2005 +0000
+++ b/sys/arch/i386/conf/GENERIC_TINY   Fri Apr 29 16:58:39 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC_TINY,v 1.82 2005/03/25 23:28:44 cube Exp $
+#      $NetBSD: GENERIC_TINY,v 1.83 2005/04/29 16:58:39 augustss Exp $
 #
 #      GENERIC_TINY -- suitable default for 4M machines
 #                      No EISA, PCI, or SCSI.
@@ -193,7 +193,8 @@
 options        WSDISPLAY_COMPAT_USL            # VT handling
 options        WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
 # see dev/pckbc/wskbdmap_mfii.c for implemented layouts
-#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
+#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" /* for pckbd driver */
+#options       UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  /* for ukbd driver */
 # allocate a number of virtual screens at autoconfiguration time
 #options       WSDISPLAY_DEFAULTSCREENS=4
 # use a large software cursor that doesn't blink