vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge mainline into keylayouts

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-22 17:12:27 +02:00
commit 59004db595
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2010-08-21 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/usb.h (grub_usb_device): Add 'data' field back. It's * include/grub/usb.h (grub_usb_device): Add 'data' field back. It's

6
term/at_keyboard.c
View file

@ -149,9 +149,6 @@ grub_at_keyboard_getkey_noblock (void)
switch (code) switch (code)
{ {
case CAPS_LOCK: case CAPS_LOCK:
/* Caps lock sends scan code twice. Get the second one and discard it. */
while (grub_keyboard_getkey () == -1);
at_keyboard_status ^= GRUB_TERM_STATUS_CAPS; at_keyboard_status ^= GRUB_TERM_STATUS_CAPS;
led_status ^= KEYBOARD_LED_CAPS; led_status ^= KEYBOARD_LED_CAPS;
keyboard_controller_led (led_status); keyboard_controller_led (led_status);
@ -161,9 +158,6 @@ grub_at_keyboard_getkey_noblock (void)
#endif #endif
return -1; return -1;
case NUM_LOCK: case NUM_LOCK:
/* Num lock sends scan code twice. Get the second one and discard it. */
while (grub_keyboard_getkey () == -1);
at_keyboard_status ^= GRUB_TERM_STATUS_NUM; at_keyboard_status ^= GRUB_TERM_STATUS_NUM;
led_status ^= KEYBOARD_LED_NUM; led_status ^= KEYBOARD_LED_NUM;
keyboard_controller_led (led_status); keyboard_controller_led (led_status);