Skip to contentSkip to conversation

Missing PPC merge bits

PATCH New Franz Sirl 1 participant 1 message Dec 7, 2000

Subsystems (2)
Char and misc drivers Input drivers
lore
Share & tools
lore

Franz Sirl

author
#0 lore raw

PATCH 1/1 Missing PPC merge bits

Hi Linus,

the appended patch contains the missing PPC bits for 2.4.0, patch OK'ed by Paul Mackerras.

Franz.

* drivers/char/keyboard.c: Use key_maps[0] instead of plain_map to enable proper keymap switching.
* drivers/input/keybdev.c: Bring PPC keycode handling up-to-date.

drivers/char/keyboard.c renamed from cvsroot/linux_2_3/drivers/char/keyboard.c +2 -2
@@ -322,7 +322,7 @@ void handle_scancode(unsigned char scanc
 			compute_shiftstate();
 			kbd->slockstate = 0; /* play it safe */
 #else
-			keysym = U(plain_map[keycode]);
+			keysym = U(key_maps[0][keycode]);
 			type = KTYP(keysym);
 			if (type == KT_SHIFT)
 			  (*key_handler[type])(keysym & 0xff, up_flag);

@@ -750,7 +750,7 @@ void compute_shiftstate(void)
 	    k = i*BITS_PER_LONG;
 	    for(j=0; j<BITS_PER_LONG; j++,k++)
 	      if(test_bit(k, key_down)) {
-		sym = U(plain_map[k]);
+		sym = U(key_maps[0][k]);
 		if(KTYP(sym) == KT_SHIFT || KTYP(sym) == KT_SLOCK) {
 		  val = KVAL(sym);
 		  if (val == KVAL(K_CAPSSHIFT))
drivers/input/keybdev.c renamed from cvsroot/linux_2_3/drivers/input/keybdev.c +40 -25

85 lines not on this page · raw message