2006-05-27 Yoshinori K. Okuji <okuji@enbug.org>
* commands/blocklist.c: New file. * DISTLIST: Added commands/blocklist.c. * term/efi/console.c (grub_console_highlight_color): Use a lighter color for the background, and a daker color for the foreground. (grub_console_checkkey): Return READ_KEY. (grub_console_cls): Set the background to GRUB_EFI_BACKGROUND_BLACK temporarily to clean out the screen. * kern/efi/efi.c (grub_efi_exit_boot_services): New function. * include/grub/i386/linux.h (struct linux_kernel_params): Fixed the size of "padding5", "hd0_drive_info" and "hd1_drive_info". * include/grub/efi/efi.h (grub_efi_exit_boot_services): New prototype. * include/grub/efi/api.h (GRUB_EFI_TEXT_ATTR): Do not shift BG. The spec is wrong again. * include/grub/normal.h [GRUB_UTIL] (grub_blocklist_init): New prototype. [GRUB_UTIL] (grub_blocklist_fini): Likewise. * conf/i386-pc.rmk (grub_emu_SOURCES): Added commands/blocklist.c. * conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise. * conf/common.rmk (pkgdata_MODULES): Added blocklist.mod. (blocklist_mod_SOURCES): New variable. (blocklist_mod_CFLAGS): Likewise. (blocklist_mod_LDFLAGS): Likewise.
This commit is contained in:
parent
75c8f25836
commit
89a7d726f9
15 changed files with 264 additions and 21 deletions
|
@ -32,8 +32,8 @@ static grub_uint8_t
|
|||
grub_console_normal_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_LIGHTGRAY,
|
||||
GRUB_EFI_BACKGROUND_BLACK);
|
||||
static grub_uint8_t
|
||||
grub_console_highlight_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_WHITE,
|
||||
GRUB_EFI_BACKGROUND_BLACK);
|
||||
grub_console_highlight_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_BLACK,
|
||||
GRUB_EFI_BACKGROUND_LIGHTGRAY);
|
||||
|
||||
static int read_key = -1;
|
||||
|
||||
|
@ -146,7 +146,7 @@ grub_console_checkkey (void)
|
|||
}
|
||||
}
|
||||
|
||||
return read_key >= 0;
|
||||
return read_key;
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -222,9 +222,13 @@ static void
|
|||
grub_console_cls (void)
|
||||
{
|
||||
grub_efi_simple_text_output_interface_t *o;
|
||||
grub_efi_int32_t orig_attr;
|
||||
|
||||
o = grub_efi_system_table->con_out;
|
||||
orig_attr = o->mode->attribute;
|
||||
o->set_attributes (o, GRUB_EFI_BACKGROUND_BLACK);
|
||||
o->clear_screen (o);
|
||||
o->set_attributes (o, orig_attr);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue