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

merge with mainline

Browse source
This commit is contained in:
BVK Chaitanya 2010-08-23 21:50:38 +05:30
commit 9444311834
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2010-08-23 Colin Watson <cjwatson@ubuntu.com>
* kern/mips/startup.S (grub_prefix): Update comment to refer to
grub-mkimage rather than grub-mkelfimage.
* kern/powerpc/ieee1275/startup.S (grub_prefix): Likewise.
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

2
grub-core/kern/mips/startup.S
View file

@ -148,7 +148,7 @@ compressed:
VARIABLE(grub_prefix) VARIABLE(grub_prefix)
/* to be filled by grub-mkelfimage */ /* to be filled by grub-mkimage */
/* /*
* Leave some breathing room for the prefix. * Leave some breathing room for the prefix.

2
grub-core/kern/powerpc/ieee1275/startup.S
View file

@ -33,7 +33,7 @@ _start:
. = _start + GRUB_KERNEL_MACHINE_PREFIX . = _start + GRUB_KERNEL_MACHINE_PREFIX
VARIABLE(grub_prefix) VARIABLE(grub_prefix)
/* to be filled by grub-mkelfimage */ /* to be filled by grub-mkimage */
/* /*
* Leave some breathing room for the prefix. * Leave some breathing room for the prefix.

6
grub-core/term/at_keyboard.c
View file

@ -181,9 +181,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 ^= KEYBOARD_STATUS_CAPS_LOCK; at_keyboard_status ^= KEYBOARD_STATUS_CAPS_LOCK;
led_status ^= KEYBOARD_LED_CAPS; led_status ^= KEYBOARD_LED_CAPS;
keyboard_controller_led (led_status); keyboard_controller_led (led_status);
@ -194,9 +191,6 @@ grub_at_keyboard_getkey_noblock (void)
key = -1; key = -1;
break; break;
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 ^= KEYBOARD_STATUS_NUM_LOCK; at_keyboard_status ^= KEYBOARD_STATUS_NUM_LOCK;
led_status ^= KEYBOARD_LED_NUM; led_status ^= KEYBOARD_LED_NUM;
keyboard_controller_led (led_status); keyboard_controller_led (led_status);