NETBSD_CURRENT_970916. Lot's just ID changes, since changes don't apply to

us.  Includes some pmap changes, for which I don't have the original commit
message(s) handy.

1 files changed, 21 insertions, 6 deletions

diff --git a/sys/arch/sparc/dev/kbd.c b/sys/arch/sparc/dev/kbd.c
index 9bf291e0a43..b1914a7b09b 100644
--- a/sys/arch/sparc/dev/kbd.c
+++ b/sys/arch/sparc/dev/kbd.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: kbd.c,v 1.6 1997/08/08 08:25:16 downsj Exp $	*/
-/*	$NetBSD: kbd.c,v 1.27 1996/10/13 03:00:01 christos Exp $ */
+/*	$OpenBSD: kbd.c,v 1.7 1997/09/17 06:47:10 downsj Exp $	*/
+/*	$NetBSD: kbd.c,v 1.28 1997/09/13 19:12:18 pk Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -288,6 +288,18 @@ kbdattach(kbd)
 		if (ttyoutput(KBD_CMD_RESET, tp) >= 0)
 			panic("kbdattach");
 		(*tp->t_oproc)(tp);	/* get it going */
+
+		/*
+		 * Wait here for the keyboard initialization to complete
+		 * since subsequent kernel console access (ie. cnget())
+		 * may cause the PROM to interfere with the device.
+		 */
+		if (tsleep((caddr_t)&kbd_softc.k_state,
+			   PZERO | PCATCH, devopn, hz) != 0) {
+			/* no response */
+			printf("kbd: reset failed\n");
+			kbd_reset(&kbd_softc.k_state);
+		}
 	}
 }
 
@@ -296,11 +308,9 @@ kbd_reset(ks)
 	register struct kbd_state *ks;
 {
 	/*
-	 * On first identification, wake up anyone waiting for type
-	 * and set up the table pointers.
+	 * On first identification, set up the table pointers.
 	 */
 	if (ks->kbd_unshifted == NULL) {
-		wakeup((caddr_t)ks);
 		ks->kbd_unshifted = kbd_unshifted;
 		ks->kbd_shifted = kbd_shifted;
 		ks->kbd_cur = ks->kbd_unshifted;
@@ -447,7 +457,8 @@ kbd_rint(c)
 			/* Arrange to get keyboard layout as well */
 			(void)ttyoutput(KBD_CMD_GLAYOUT, k->k_kbd);
 			(*k->k_kbd->t_oproc)(k->k_kbd);
-		}
+		} else
+			wakeup((caddr_t)&k->k_state);
 		return;
 	}
 
@@ -455,6 +466,10 @@ kbd_rint(c)
 	if (k->k_state.kbd_pending == KBD_LAYOUT) {
 		k->k_state.kbd_pending = 0;
 		k->k_state.kbd_layout = c;
+		/*
+		 * Wake up anyone waiting for type.
+		 */
+		wakeup((caddr_t)&k->k_state);
 		return;
 	}