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

Merge mainline into asprintf

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-30 14:08:10 +01:00
commit acea847040
6 changed files with 70 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
term/i386/pc/at_keyboard.c
View file

@ -72,7 +72,7 @@ static char keyboard_map_shift[128] =
static grub_uint8_t grub_keyboard_controller_orig;
static void
keyboard_controller_wait_untill_ready ()
keyboard_controller_wait_untill_ready (void)
{
while (! KEYBOARD_COMMAND_ISREADY (grub_inb (KEYBOARD_REG_STATUS)));
}
@ -94,12 +94,12 @@ grub_keyboard_controller_read (void)
}
static void
keyboard_controller_led (grub_uint8_t led_status)
keyboard_controller_led (grub_uint8_t leds)
{
keyboard_controller_wait_untill_ready ();
grub_outb (0xed, KEYBOARD_REG_DATA);
keyboard_controller_wait_untill_ready ();
grub_outb (led_status & 0x7, KEYBOARD_REG_DATA);
grub_outb (leds & 0x7, KEYBOARD_REG_DATA);
}
/* FIXME: This should become an interrupt service routine. For now