On Sun, Jun 05, 2011 at 09:30:38PM +0000, Miod Vallat wrote:
> > Hi,
> >
> > Removing unused code:
> > * arch/mac68k/include/keyboard.h not used in kernel sources
>
> ok miod@
>
> > * not need define KEYBOARD_ARRAY (variable keyboard[] used only in
> > dev/adb/akbd.c if defined WSDISPLAY_COMPAT_RAWKBD)
>
> Not ok. arch/macppc/dev/akdb_machdep.c includes
> <dev/adb/keyboard.h>, and will include the definition of keyboard[].
>
> The real fix would be to simply move the array from dev/adb/keyboard.h
> to dev/adb/akbdmap.h.
>
Move the array from dev/adb/keyboard.h to dev/adb/akbdmap.h. OK ?
--
Alexandr Shadchin
Index: akbd.c
===================================================================
RCS file: /cvs/src/sys/dev/adb/akbd.c,v
retrieving revision 1.8
diff -u -p -r1.8 akbd.c
--- akbd.c 23 May 2010 15:09:38 -0000 1.8
+++ akbd.c 6 Jun 2011 12:43:32 -0000
@@ -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>
/*
Index: akbdmap.h
===================================================================
RCS file: /cvs/src/sys/dev/adb/akbdmap.h,v
retrieving revision 1.3
diff -u -p -r1.3 akbdmap.h
--- akbdmap.h 26 Jun 2008 05:42:14 -0000 1.3
+++ akbdmap.h 6 Jun 2011 12:43:32 -0000
@@ -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)
Index: keyboard.h
===================================================================
RCS file: /cvs/src/sys/dev/adb/keyboard.h,v
retrieving revision 1.4
diff -u -p -r1.4 keyboard.h
--- keyboard.h 10 Mar 2006 20:13:50 -0000 1.4
+++ keyboard.h 6 Jun 2011 12:43:32 -0000
@@ -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 */
