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

* grub-core/term/at_keyboard.c: Retry probing keyboard if

Browse source 
scancode setup failed.
This commit is contained in:
Vladimir Serbinenko 2014-08-13 23:04:01 +02:00
parent d1224d209b
commit 3c05833249
2 changed files with 10 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 @@
2014-08-13 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/at_keyboard.c: Retry probing keyboard if
scancode setup failed.
2014-08-10 Vladimir Serbinenko <phcoder@gmail.com> 2014-08-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/disk_common.c: Clump disk size to 1EiB. * grub-core/kern/disk_common.c: Clump disk size to 1EiB.

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

@ -226,7 +226,7 @@ static const struct
{0x7d, GRUB_KEYBOARD_KEY_PPAGE}, {0x7d, GRUB_KEYBOARD_KEY_PPAGE},
}; };
static int alive = 0, ping_sent; static int ping_sent;
static void static void
keyboard_controller_wait_until_ready (void) keyboard_controller_wait_until_ready (void)
@ -373,7 +373,7 @@ set_scancodes (void)
grub_dprintf ("atkeyb", "returned set %d\n", current_set); grub_dprintf ("atkeyb", "returned set %d\n", current_set);
if (current_set == 1) if (current_set == 1)
return; return;
grub_printf ("No supported scancode set found\n"); grub_dprintf ("atkeyb", "no supported scancode set found\n");
#endif #endif
} }
@ -543,7 +543,7 @@ grub_keyboard_getkey (void)
int int
grub_at_keyboard_is_alive (void) grub_at_keyboard_is_alive (void)
{ {
if (alive) if (current_set != 0)
return 1; return 1;
if (ping_sent if (ping_sent
&& KEYBOARD_COMMAND_ISREADY (grub_inb (KEYBOARD_REG_STATUS)) && KEYBOARD_COMMAND_ISREADY (grub_inb (KEYBOARD_REG_STATUS))
@ -611,7 +611,6 @@ static void
grub_keyboard_controller_init (void) grub_keyboard_controller_init (void)
{ {
at_keyboard_status = 0; at_keyboard_status = 0;
alive = 1;
/* Drain input buffer. */ /* Drain input buffer. */
while (1) while (1)
{ {
@ -639,7 +638,7 @@ grub_keyboard_controller_init (void)
static grub_err_t static grub_err_t
grub_keyboard_controller_fini (struct grub_term_input *term __attribute__ ((unused))) grub_keyboard_controller_fini (struct grub_term_input *term __attribute__ ((unused)))
{ {
if (!alive) if (current_set == 0)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
if (grub_keyboard_orig_set) if (grub_keyboard_orig_set)
write_mode (grub_keyboard_orig_set); write_mode (grub_keyboard_orig_set);
@ -656,7 +655,7 @@ grub_at_fini_hw (int noreturn __attribute__ ((unused)))
static grub_err_t static grub_err_t
grub_at_restore_hw (void) grub_at_restore_hw (void)
{ {
if (!alive) if (current_set == 0)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
/* Drain input buffer. */ /* Drain input buffer. */