[src/trunk]: src/sys/arch/hpcmips BUGFIX: PCKBD_LAYOUT had not been effective.

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

details:   https://anonhg.NetBSD.org/src/rev/98a5b72a4c34
branches:  trunk
changeset: 498371:98a5b72a4c34
user:      takemura <takemura%NetBSD.org@localhost>
date:      Sat Oct 21 07:27:41 2000 +0000

description:
BUGFIX: PCKBD_LAYOUT had not been effective.

diffstat:

 sys/arch/hpcmips/conf/GENERIC |  9 +++++++--
 sys/arch/hpcmips/dev/hpckbd.c |  9 ++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 208539103047 -r 98a5b72a4c34 sys/arch/hpcmips/conf/GENERIC
--- a/sys/arch/hpcmips/conf/GENERIC     Sat Oct 21 04:54:22 2000 +0000
+++ b/sys/arch/hpcmips/conf/GENERIC     Sat Oct 21 07:27:41 2000 +0000
@@ -2,11 +2,11 @@
 # Distribution kernel (NEC VR based model) kernel config file
 
 #
-#      $NetBSD: GENERIC,v 1.70 2000/10/03 03:13:04 sato Exp $
+#      $NetBSD: GENERIC,v 1.71 2000/10/21 07:27:41 takemura Exp $
 #
 include                "arch/hpcmips/conf/std.hpcmips"
 
-#ident                 "GENERIC-$Revision: 1.70 $"
+#ident                 "GENERIC-$Revision: 1.71 $"
 
 maxusers       8
 
@@ -97,6 +97,11 @@
 options        WSDISPLAY_COMPAT_SYSCONS        # emulate some ioctls
 options        WSDISPLAY_COMPAT_USL            # VT handling
 options        WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
+#
+# Hpckbd will set key board layout appropriately. You can use option
+# 'PCKBD_LAYOUT' to overrite the default layout.
+#
+#options       PCKBD_LAYOUT="(KB_US | KB_SWAPCTRLCAPS | KB_MACHDEP)"
 
 # temporally power management
 hpcapm0        at mainbus0                     # power management
diff -r 208539103047 -r 98a5b72a4c34 sys/arch/hpcmips/dev/hpckbd.c
--- a/sys/arch/hpcmips/dev/hpckbd.c     Sat Oct 21 04:54:22 2000 +0000
+++ b/sys/arch/hpcmips/dev/hpckbd.c     Sat Oct 21 07:27:41 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hpckbd.c,v 1.2 2000/10/01 03:45:33 takemura Exp $ */
+/*     $NetBSD: hpckbd.c,v 1.3 2000/10/21 07:27:42 takemura Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 UCHIYAMA Yasushi.  All rights reserved.
@@ -41,6 +41,7 @@
 #include <machine/platid_mask.h>
 
 #include "opt_wsdisplay_compat.h"
+#include "opt_pckbd_layout.h"
 #include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wskbdvar.h>
@@ -132,7 +133,11 @@
 
 struct wskbd_mapdata hpckbd_keymapdata = {
        pckbd_keydesctab,
+#ifdef PCKBD_LAYOUT
+       PCKBD_LAYOUT
+#else
        KB_US
+#endif
 };
 
 int
@@ -304,9 +309,7 @@
                                hpckbd_keymapdata.layout |= KB_MACHDEP;
 #endif
                        } else {
-#if defined(PCKBD_LAYOUT)
                                hpckbd_keymapdata.layout &= ~KB_MACHDEP;
-#endif
                        }
                        return;
                }