Rework shifta/ctla/alta key handling. It appears that there was

misunderstanding between the PR originator and me.  I hope I got it
right this time.

1 files changed, 0 insertions, 7 deletions

diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index 4280da6..43a9bae 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -736,27 +736,23 @@ next_code:
 		case 0x47: case 0x48: case 0x49:	/* keypad 7,8,9 */
 			state->ks_composed_char *= 10;
 			state->ks_composed_char += keycode - 0x40;
-			kbd->kb_prev_key = keycode | (scancode & 0x80);
 			if (state->ks_composed_char > UCHAR_MAX)
 				return ERRKEY;
 			goto next_code;
 		case 0x4B: case 0x4C: case 0x4D:	/* keypad 4,5,6 */
 			state->ks_composed_char *= 10;
 			state->ks_composed_char += keycode - 0x47;
-			kbd->kb_prev_key = keycode | (scancode & 0x80);
 			if (state->ks_composed_char > UCHAR_MAX)
 				return ERRKEY;
 			goto next_code;
 		case 0x4F: case 0x50: case 0x51:	/* keypad 1,2,3 */
 			state->ks_composed_char *= 10;
 			state->ks_composed_char += keycode - 0x4E;
-			kbd->kb_prev_key = keycode | (scancode & 0x80);
 			if (state->ks_composed_char > UCHAR_MAX)
 				return ERRKEY;
 			goto next_code;
 		case 0x52:				/* keypad 0 */
 			state->ks_composed_char *= 10;
-			kbd->kb_prev_key = keycode | (scancode & 0x80);
 			if (state->ks_composed_char > UCHAR_MAX)
 				return ERRKEY;
 			goto next_code;
@@ -766,7 +762,6 @@ next_code:
 		case 0xCB: case 0xCC: case 0xCD:	/* keypad 4,5,6 */
 		case 0xCF: case 0xD0: case 0xD1:	/* keypad 1,2,3 */
 		case 0xD2:				/* keypad 0 */
-			kbd->kb_prev_key = keycode | (scancode & 0x80);
 			goto next_code;
 
 		case 0x38:				/* left alt key */
@@ -776,7 +771,6 @@ next_code:
 			if (state->ks_composed_char > 0) {
 				state->ks_flags &= ~COMPOSE;
 				state->ks_composed_char = 0;
-				kbd->kb_prev_key = keycode | (scancode & 0x80);
 				return ERRKEY;
 			}
 			break;
@@ -786,7 +780,6 @@ next_code:
 	/* keycode to key action */
 	action = genkbd_keyaction(kbd, keycode, scancode & 0x80,
 				  &state->ks_state, &state->ks_accents);
-	kbd->kb_prev_key = keycode | (scancode & 0x80);
 	if (action == NOKEY)
 		goto next_code;
 	else