* term/at_keyboard.c (grub_at_keyboard_getkey_noblock): Don't discard

	a key after CapsLock or NumLock. It's just a qemu bug.

diff --git a/ChangeLog b/ChangeLog
index 6b6a82a35db78e04713d76dd14488081098487e4..758b5cb5fb6b0c2cbd00701d24d087e8d5fa48ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * term/at_keyboard.c (grub_at_keyboard_getkey_noblock): Don't discard
+       a key after CapsLock or NumLock. It's just a qemu bug.
+
 2010-08-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/usb.h (grub_usb_device): Add 'data' field back. It's

diff --git a/term/at_keyboard.c b/term/at_keyboard.c
index c3e71ea2dfebf991d9db7ff772dbacc534d97ef9..25f32a0a5bc8621d49ccea5efcb2d524f6af018b 100644 (file)
--- a/term/at_keyboard.c
+++ b/term/at_keyboard.c
@@ -181,9 +181,6 @@ grub_at_keyboard_getkey_noblock (void)
   switch (code)
     {
       case CAPS_LOCK:
-       /* Caps lock sends scan code twice.  Get the second one and discard it.  */
-       while (grub_keyboard_getkey () == -1);
-
        at_keyboard_status ^= KEYBOARD_STATUS_CAPS_LOCK;
        led_status ^= KEYBOARD_LED_CAPS;
        keyboard_controller_led (led_status);
@@ -194,9 +191,6 @@ grub_at_keyboard_getkey_noblock (void)
        key = -1;
        break;
       case NUM_LOCK:
-       /* Num lock sends scan code twice.  Get the second one and discard it.  */
-       while (grub_keyboard_getkey () == -1);
-
        at_keyboard_status ^= KEYBOARD_STATUS_NUM_LOCK;
        led_status ^= KEYBOARD_LED_NUM;
        keyboard_controller_led (led_status);