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

2009-12-29 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* configure.ac: Check for TARGET_CFLAGS initialization before we
	initialize it ourselves (sigh).
	Move a few modifications to TARGET_CFLAGS to be unconditional
	(extra warning flags, loop alignment, i386 CPU extensions, GCC 4.4
	eh_frame)
	
	* gettext/gettext.c (grub_gettext_delete_list): Add `void' argument.
	* term/i386/pc/at_keyboard.c
	(keyboard_controller_wait_untill_ready): Likewise.
	(keyboard_controller_led): Rename `led_status' paramter to avoid
	name conflict.
This commit is contained in:
Robert Millan 2009-12-29 14:04:18 +00:00
parent 465b5a8130
commit 90d1e8797a
4 changed files with 54 additions and 50 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