Mostly sync to NetBSD-current 970804 + tags.

1 files changed, 6 insertions, 10 deletions

diff --git a/sys/dev/sun/kbd_tables.h b/sys/dev/sun/kbd_tables.h
index 3cc6d8a7ca7..831b993316c 100644
--- a/sys/dev/sun/kbd_tables.h
+++ b/sys/dev/sun/kbd_tables.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: kbd_tables.h,v 1.2 1996/04/18 23:48:17 niklas Exp $	*/
-/*	$NetBSD: kbd_tables.h,v 1.3 1996/02/29 19:37:53 gwr Exp $	*/
+/*	$OpenBSD: kbd_tables.h,v 1.3 1997/08/08 08:17:17 downsj Exp $	*/
+/*	$NetBSD: kbd_tables.h,v 1.4 1996/12/17 20:46:14 gwr Exp $	*/
 
 /*
  * Copyright (c) 1996 Gordon W. Ross
@@ -130,15 +130,11 @@
 
 #define KEYMAP_SIZE 128
 
-struct keymap {
-	unsigned short	keymap[KEYMAP_SIZE];
-};
-
 struct keyboard {
-	struct keymap	*k_release; 	/* Key released */
-	struct keymap	*k_control; 	/* Ctrl is down */
-	struct keymap	*k_normal;  	/* No shifts */
-	struct keymap	*k_shifted; 	/* Shift is down */
+	u_short	*k_release; 	/* Key released */
+	u_short	*k_control; 	/* Ctrl is down */
+	u_short	*k_normal;  	/* No shifts */
+	u_short	*k_shifted; 	/* Shift is down */
 };
 
 extern char kbd_stringtab[16][10];