patch-2.2.4 linux/include/asm-ppc/keyboard.h

• Lines: 63
• Date: Fri Mar 19 10:50:09 1999
• Orig file: v2.2.3/linux/include/asm-ppc/keyboard.h
• Orig date: Thu Aug 6 14:06:33 1998

diff -u --recursive --new-file v2.2.3/linux/include/asm-ppc/keyboard.h linux/include/asm-ppc/keyboard.h
@@ -46,7 +46,7 @@
 
 static inline int kbd_setkeycode(unsigned int scancode, unsigned int keycode)
 {
-	if ( is_prep )
+	if ( is_prep || (_machine == _MACH_mbx) )
 		return pckbd_setkeycode(scancode,keycode);
 	else if ( is_chrp )
 #ifndef CONFIG_MAC_KEYBOARD
@@ -69,7 +69,7 @@
 
 static inline int kbd_getkeycode(unsigned int x)
 {
-	if ( is_prep )
+	if ( is_prep || (_machine == _MACH_mbx) )
 		return pckbd_getkeycode(x);
 	else if ( is_chrp )
 #ifndef CONFIG_MAC_KEYBOARD
@@ -86,7 +86,7 @@
 
 static inline int kbd_pretranslate(unsigned char x,char y)
 {
-	if ( is_prep )
+	if ( is_prep || (_machine == _MACH_mbx) )
 		return pckbd_pretranslate(x,y);
 	else if ( is_chrp )
 #ifndef CONFIG_MAC_KEYBOARD
@@ -104,7 +104,7 @@
 static inline int kbd_translate(unsigned char keycode, unsigned char *keycodep,
 		     char raw_mode)
 {
-	if ( is_prep )
+	if ( is_prep || (_machine == _MACH_mbx) )
 		return pckbd_translate(keycode,keycodep,raw_mode);
 	else if ( is_chrp )
 #ifndef CONFIG_MAC_KEYBOARD
@@ -122,7 +122,7 @@
 
 static inline int kbd_unexpected_up(unsigned char keycode)
 {
-	if ( is_prep )
+	if ( is_prep || (_machine == _MACH_mbx) )
 		return pckbd_unexpected_up(keycode);
 	else if ( is_chrp )
 #ifndef CONFIG_MAC_KEYBOARD
@@ -140,7 +140,7 @@
 
 static inline void kbd_leds(unsigned char leds)
 {
-	if ( is_prep )
+	if ( is_prep || (_machine == _MACH_mbx) )
 		pckbd_leds(leds);
 	else if ( is_chrp )
 #ifndef CONFIG_MAC_KEYBOARD
@@ -157,7 +157,7 @@
 
 static inline void kbd_init_hw(void)
 {
-	if ( is_prep )
+	if ( is_prep || (_machine == _MACH_mbx) )
 		pckbd_init_hw();
 	else if ( is_chrp )
 #ifndef CONFIG_MAC_KEYBOARD