patch-2.4.0-test12 linux/include/asm-m68k/keyboard.h

• Lines: 57
• Date: Tue Dec 5 12:43:48 2000
• Orig file: v2.4.0-test11/linux/include/asm-m68k/keyboard.h
• Orig date: Tue May 11 09:57:14 1999

diff -u --recursive --new-file v2.4.0-test11/linux/include/asm-m68k/keyboard.h linux/include/asm-m68k/keyboard.h
@@ -8,12 +8,12 @@
  *  This file contains the m68k architecture specific keyboard definitions
  */
 
-#include <linux/config.h> /* CONFIG_MAGIC_SYSRQ */
 #ifndef __M68K_KEYBOARD_H
 #define __M68K_KEYBOARD_H
 
 #ifdef __KERNEL__
 
+#include <linux/config.h>
 #include <asm/machdep.h>
 
 #ifdef CONFIG_Q40
@@ -39,17 +39,6 @@
     return scancode > 127 ? -EINVAL : scancode;
 }
 
-static __inline__ int kbd_translate(unsigned char scancode,
-				    unsigned char *keycode, char raw_mode)
-{
-#ifdef CONFIG_Q40
-    if (MACH_IS_Q40)
-        return q40kbd_translate(scancode,keycode,raw_mode);
-#endif
-    *keycode = scancode;
-    return 1;
-}
-
 static __inline__ char kbd_unexpected_up(unsigned char keycode)
 {
 #ifdef CONFIG_Q40
@@ -65,15 +54,16 @@
 	mach_kbd_leds(leds);
 }
 
-#ifdef CONFIG_MAGIC_SYSRQ
-#define kbd_is_sysrq(keycode)	((keycode) == mach_sysrq_key && \
-				 (up_flag || \
-				  (shift_state & mach_sysrq_shift_mask) == \
-				  mach_sysrq_shift_state))
-#define kbd_sysrq_xlate			mach_sysrq_xlate
-#endif
+#define kbd_init_hw		mach_keyb_init
+#define kbd_translate		mach_kbd_translate
+
+#define kbd_sysrq_xlate		mach_sysrq_xlate
+
+/* resource allocation */
+#define kbd_request_region()
+#define kbd_request_irq(handler)
 
-#define kbd_init_hw	mach_keyb_init
+extern unsigned int SYSRQ_KEY;
 
 #endif /* __KERNEL__ */