[src/netbsd-8]: src/sys/dev/hpc Pull up following revision(s) (requested by r...

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

details:   https://anonhg.NetBSD.org/src/rev/494bec5aa21d
branches:  netbsd-8
changeset: 851996:494bec5aa21d
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 23 17:20:08 2018 +0000

description:
Pull up following revision(s) (requested by rin in ticket #1021):

        sys/dev/hpc/hpckbd.c: revision 1.33
        sys/dev/hpc/hpckbd.c: revision 1.34
        sys/dev/hpc/hpckbd.c: revision 1.35

Apply workaround introduced in r1.31 to hpcmips.

Fix kernel crash when console is attached. Now, my MC/R550 boots multiuser.
Thanks Masahiko Ito for encouraging me to do bisection to find this out.
XXX pullup-8, pullup-7

Fix comment formatting in previous.

Clarify the comment in the "unconst" version of hpckbd_keymap_setup.
Both sh3 (P1) and mips (kseg0) have the kernel directly mapped.

diffstat:

 sys/dev/hpc/hpckbd.c |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (45 lines):

diff -r a60b8b124187 -r 494bec5aa21d sys/dev/hpc/hpckbd.c
--- a/sys/dev/hpc/hpckbd.c      Sun Sep 23 17:16:33 2018 +0000
+++ b/sys/dev/hpc/hpckbd.c      Sun Sep 23 17:20:08 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hpckbd.c,v 1.30.30.2 2017/08/09 05:57:32 snj Exp $ */
+/*     $NetBSD: hpckbd.c,v 1.30.30.3 2018/09/23 17:20:08 martin Exp $ */
 
 /*-
  * Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.30.30.2 2017/08/09 05:57:32 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.30.30.3 2018/09/23 17:20:08 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -261,10 +261,11 @@
 }
 
 
-#ifdef hpcsh
+#if defined(hpcsh) || defined(hpcmips)
 /*
- * XXX: Use the old wrong code for now as hpcsh attaches console very
- * early and it's convenient to be able to do early DDB on wscons.
+ * XXX: Use the old wrong code for now as hpcsh and hpcmips attach
+ * console very early when malloc(9) is not yet available.  It is
+ * convenient to be able to do early DDB on wscons.
  */
 void
 hpckbd_keymap_setup(struct hpckbd_core *hc,
@@ -278,8 +279,9 @@
         * XXX The way this is done is really wrong.  The __UNCONST()
         * is a hint as to what is wrong.  This actually ends up modifying
         * initialized data which is marked "const".
-        * The reason we get away with it here is that on sh3 kernel
-        * is directly mapped.
+        *
+        * The reason we get away with it here is that on sh3 and mips
+        * the kernel is directly mapped.
         */
        desc = (struct wscons_keydesc *)__UNCONST(hpckbd_keymapdata.keydesc);
        for (i = 0; desc[i].name != 0; i++) {