Not need define KEYBOARD_ARRAY (keyboard array used only in dev/adb/akbd.c

if defined WSDISPLAY_COMPAT_RAWKBD). Move keyboard array from dev/adb/keyboard.h
to dev/adb/akbdmap.h.

ok miod@

3 files changed, 146 insertions, 151 deletions

diff --git a/sys/dev/adb/akbd.c b/sys/dev/adb/akbd.c
index 3b0f67fd418..5f539b595de 100644
--- a/sys/dev/adb/akbd.c
+++ b/sys/dev/adb/akbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: akbd.c,v 1.8 2010/05/23 15:09:38 deraadt Exp $	*/
+/*	$OpenBSD: akbd.c,v 1.9 2011/06/13 16:29:11 shadchin Exp $	*/
 /*	$NetBSD: akbd.c,v 1.17 2005/01/15 16:00:59 chs Exp $	*/
 
 /*
@@ -48,10 +48,6 @@
 #include <dev/adb/adb.h>
 #include <dev/adb/akbdmap.h>
 #include <dev/adb/akbdvar.h>
-
-#ifdef WSDISPLAY_COMPAT_RAWKBD
-#define KEYBOARD_ARRAY
-#endif
 #include <dev/adb/keyboard.h>
 
 /*
diff --git a/sys/dev/adb/akbdmap.h b/sys/dev/adb/akbdmap.h
index 5540e678feb..91917b30be8 100644
--- a/sys/dev/adb/akbdmap.h
+++ b/sys/dev/adb/akbdmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: akbdmap.h,v 1.3 2008/06/26 05:42:14 ray Exp $	*/
+/*	$OpenBSD: akbdmap.h,v 1.4 2011/06/13 16:29:11 shadchin Exp $	*/
 /*	$NetBSD: akbdmap.h,v 1.7 2005/05/05 22:29:41 abs Exp $	*/
 
 /*-
@@ -30,6 +30,149 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef WSDISPLAY_COMPAT_RAWKBD
+#include <dev/wscons/wskbdraw.h>
+
+unsigned char keyboard[128] = {
+	RAWKEY_a,
+	RAWKEY_s,
+	RAWKEY_d,
+	RAWKEY_f,
+	RAWKEY_h,
+	RAWKEY_g,
+	RAWKEY_z,
+	RAWKEY_x,
+	RAWKEY_c,
+	RAWKEY_v,
+#ifdef FIX_SV_X_KBDBUG
+	RAWKEY_grave,
+#else
+	RAWKEY_less,
+#endif
+	RAWKEY_b,
+	RAWKEY_q,
+	RAWKEY_w,
+	RAWKEY_e,
+	RAWKEY_r,
+	RAWKEY_y,
+	RAWKEY_t,
+	RAWKEY_1,
+	RAWKEY_2,
+	RAWKEY_3,
+	RAWKEY_4,
+	RAWKEY_6,
+	RAWKEY_5,
+	RAWKEY_equal,
+	RAWKEY_9,
+	RAWKEY_7,
+	RAWKEY_minus,
+	RAWKEY_8,
+	RAWKEY_0,
+	RAWKEY_bracketright,
+	RAWKEY_o,
+	RAWKEY_u,
+	RAWKEY_bracketleft,
+	RAWKEY_i,
+	RAWKEY_p,
+	RAWKEY_Return,
+	RAWKEY_l,
+	RAWKEY_j,
+	RAWKEY_apostrophe,
+	RAWKEY_k,
+	RAWKEY_semicolon,
+	RAWKEY_backslash,
+	RAWKEY_comma,
+	RAWKEY_slash,
+	RAWKEY_n,
+	RAWKEY_m,
+	RAWKEY_period,
+	RAWKEY_Tab,
+	RAWKEY_space,
+#ifdef FIX_SV_X_KBDBUG
+	RAWKEY_less,
+#else
+	RAWKEY_grave,
+#endif
+	RAWKEY_Delete,
+	RAWKEY_KP_Enter,
+	RAWKEY_Escape,
+	RAWKEY_Control_L,
+	219,			/* XXX */
+	RAWKEY_Shift_L,
+	RAWKEY_Caps_Lock,
+	RAWKEY_Alt_L,
+	RAWKEY_Left,
+	RAWKEY_Right,
+	RAWKEY_Down,
+	RAWKEY_Up,
+	0, /* Fn */
+	0,
+	RAWKEY_KP_Delete,
+	0,
+	RAWKEY_KP_Multiply,
+	0,
+	RAWKEY_KP_Add,
+	0,
+	RAWKEY_Num_Lock,
+	0,
+	0,
+	0,
+	RAWKEY_KP_Divide,
+	RAWKEY_KP_Enter,
+	0,
+	RAWKEY_KP_Subtract,
+	0,
+	0,
+	RAWKEY_KP_Equal,
+	RAWKEY_KP_Insert,
+	RAWKEY_KP_End,
+	RAWKEY_KP_Down,
+	RAWKEY_KP_Next,
+	RAWKEY_KP_Left,
+	RAWKEY_KP_Begin,
+	RAWKEY_KP_Right,
+	RAWKEY_KP_Home,
+	0,
+	RAWKEY_KP_Up,
+	RAWKEY_KP_Prior,
+	0,
+	0,
+	RAWKEY_KP_Delete,
+	RAWKEY_f5,
+	RAWKEY_f6,
+	RAWKEY_f7,
+	RAWKEY_f3,
+	RAWKEY_f8,
+	RAWKEY_f9,
+	0,
+	RAWKEY_f11,
+	0,
+	RAWKEY_Print_Screen,
+	RAWKEY_KP_Enter,
+	RAWKEY_Hold_Screen,
+	0,
+	RAWKEY_f10,
+	0,
+	RAWKEY_f12,
+	0,
+	RAWKEY_Pause,
+	RAWKEY_Insert,
+	RAWKEY_Home,
+	RAWKEY_Prior,
+	RAWKEY_Delete,
+	RAWKEY_f4,
+	RAWKEY_End,
+	RAWKEY_f2,
+	RAWKEY_Next,
+	RAWKEY_f1,
+	0,
+	0,
+	0,
+	0,
+	0
+};
+#endif /* WSDISPLAY_COMPAT_RAWKBD */
+
 /* XXX This list is incomplete. */
 
 #define KC(n) KS_KEYCODE(n)
diff --git a/sys/dev/adb/keyboard.h b/sys/dev/adb/keyboard.h
index 0d7c65af51c..7336b0b0b77 100644
--- a/sys/dev/adb/keyboard.h
+++ b/sys/dev/adb/keyboard.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: keyboard.h,v 1.4 2006/03/10 20:13:50 miod Exp $	*/
+/*	$OpenBSD: keyboard.h,v 1.5 2011/06/13 16:29:11 shadchin Exp $	*/
 /*	$NetBSD: keyboard.h,v 1.1 1998/05/15 10:15:54 tsubai Exp $	*/
 
 /*-
@@ -41,147 +41,3 @@
 #define ADBK_PRESS(key)		(((key) & 0x80) == 0)
 #define ADBK_KEYDOWN(key)	(key)
 #define ADBK_KEYUP(key)		((key) | 0x80)
-
-#ifndef KEYBOARD_ARRAY
-extern unsigned char keyboard[128];
-#else
-#include <dev/wscons/wskbdraw.h>
-unsigned char keyboard[128] = {
-	RAWKEY_a,
-	RAWKEY_s,
-	RAWKEY_d,
-	RAWKEY_f,
-	RAWKEY_h,
-	RAWKEY_g,
-	RAWKEY_z,
-	RAWKEY_x,
-	RAWKEY_c,
-	RAWKEY_v,
-#ifdef FIX_SV_X_KBDBUG
-	RAWKEY_grave,
-#else
-	RAWKEY_less,
-#endif
-	RAWKEY_b,
-	RAWKEY_q,
-	RAWKEY_w,
-	RAWKEY_e,
-	RAWKEY_r,
-	RAWKEY_y,
-	RAWKEY_t,
-	RAWKEY_1,
-	RAWKEY_2,
-	RAWKEY_3,
-	RAWKEY_4,
-	RAWKEY_6,
-	RAWKEY_5,
-	RAWKEY_equal,
-	RAWKEY_9,
-	RAWKEY_7,
-	RAWKEY_minus,
-	RAWKEY_8,
-	RAWKEY_0,
-	RAWKEY_bracketright,
-	RAWKEY_o,
-	RAWKEY_u,
-	RAWKEY_bracketleft,
-	RAWKEY_i,
-	RAWKEY_p,
-	RAWKEY_Return,
-	RAWKEY_l,
-	RAWKEY_j,
-	RAWKEY_apostrophe,
-	RAWKEY_k,
-	RAWKEY_semicolon,
-	RAWKEY_backslash,
-	RAWKEY_comma,
-	RAWKEY_slash,
-	RAWKEY_n,
-	RAWKEY_m,
-	RAWKEY_period,
-	RAWKEY_Tab,
-	RAWKEY_space,
-#ifdef FIX_SV_X_KBDBUG
-	RAWKEY_less,
-#else
-	RAWKEY_grave,
-#endif
-	RAWKEY_Delete,
-	RAWKEY_KP_Enter,
-	RAWKEY_Escape,
-	RAWKEY_Control_L,
-	219,			/* XXX */
-	RAWKEY_Shift_L,
-	RAWKEY_Caps_Lock,
-	RAWKEY_Alt_L,
-	RAWKEY_Left,
-	RAWKEY_Right,
-	RAWKEY_Down,
-	RAWKEY_Up,
-	0, /* Fn */
-	0,
-	RAWKEY_KP_Delete,
-	0,
-	RAWKEY_KP_Multiply,
-	0,
-	RAWKEY_KP_Add,
-	0,
-	RAWKEY_Num_Lock,
-	0,
-	0,
-	0,
-	RAWKEY_KP_Divide,
-	RAWKEY_KP_Enter,
-	0,
-	RAWKEY_KP_Subtract,
-	0,
-	0,
-	RAWKEY_KP_Equal,
-	RAWKEY_KP_Insert,
-	RAWKEY_KP_End,
-	RAWKEY_KP_Down,
-	RAWKEY_KP_Next,
-	RAWKEY_KP_Left,
-	RAWKEY_KP_Begin,
-	RAWKEY_KP_Right,
-	RAWKEY_KP_Home,
-	0,
-	RAWKEY_KP_Up,
-	RAWKEY_KP_Prior,
-	0,
-	0,
-	RAWKEY_KP_Delete,
-	RAWKEY_f5,
-	RAWKEY_f6,
-	RAWKEY_f7,
-	RAWKEY_f3,
-	RAWKEY_f8,
-	RAWKEY_f9,
-	0,
-	RAWKEY_f11,
-	0,
-	RAWKEY_Print_Screen,
-	RAWKEY_KP_Enter,
-	RAWKEY_Hold_Screen,
-	0,
-	RAWKEY_f10,
-	0,
-	RAWKEY_f12,
-	0,
-	RAWKEY_Pause,
-	RAWKEY_Insert,
-	RAWKEY_Home,
-	RAWKEY_Prior,
-	RAWKEY_Delete,
-	RAWKEY_f4,
-	RAWKEY_End,
-	RAWKEY_f2,
-	RAWKEY_Next,
-	RAWKEY_f1,
-	0,
-	0,
-	0,
-	0,
-	0
-};
-#endif /* KEYBOARD_ARRAY */