patch-2.2.7 linux/drivers/macintosh/mac_keyb.c

Next file: linux/drivers/net/3c523.c
Previous file: linux/drivers/char/softdog.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.6/linux/drivers/macintosh/mac_keyb.c linux/drivers/macintosh/mac_keyb.c
@@ -194,7 +194,7 @@
 extern struct kbd_struct kbd_table[];
 extern struct wait_queue * keypress_wait;
 
-extern void handle_scancode(unsigned char);
+extern void handle_scancode(unsigned char, int);
 
 static struct adb_ids keyboard_ids;
 static struct adb_ids mouse_ids;
@@ -234,11 +234,6 @@
 	return -EINVAL;
 }
 
-int mackbd_pretranslate(unsigned char scancode, char raw_mode)
-{
-	return 1;
-}
-
 int mackbd_translate(unsigned char keycode, unsigned char *keycodep,
 		     char raw_mode)
 {
@@ -338,8 +333,8 @@
 		 switch (keycode) {
 		 /*case 0xb9:*/
 		 case 0x39:
-			handle_scancode(0x39);
-			handle_scancode(0xb9);
+			handle_scancode(0x39, 1);
+			handle_scancode(0x39, 0);
 		 	mark_bh(KEYBOARD_BH);
 		 	return;
 		 case 0x47:
@@ -349,7 +344,7 @@
 		 }
 	}
 
-	handle_scancode(keycode + up_flag);
+	handle_scancode(keycode, !up_flag);
 }
 
 static void

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)