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

Simplify terminal check in loader/i386/efi/linux.c and loader/i386/linux.c

Browse source 
Revert loader/i386/ieee1275/linux.c change
This commit is contained in:
Robert Millan 2010-01-07 01:21:32 +00:00
parent c1d2f1d81b
commit 5a1ed29ebd
3 changed files with 8 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
loader/i386/efi/linux.c
View file

@ -697,7 +697,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
grub_term_output_t term; grub_term_output_t term;
int found = 0; int found = 0;
FOR_ACTIVE_TERM_OUTPUTS(term) FOR_ACTIVE_TERM_OUTPUTS(term)
if (grub_strcmp (term->name, "vga_text") == 0) if (grub_strcmp (term->name, "vga_text") == 0
|| grub_strcmp (term->name, "console") == 0)
{ {
grub_uint16_t pos = grub_term_getxy (term); grub_uint16_t pos = grub_term_getxy (term);
params->video_cursor_x = pos >> 8; params->video_cursor_x = pos >> 8;
@ -705,18 +706,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
params->video_width = grub_term_width (term); params->video_width = grub_term_width (term);
params->video_height = grub_term_height (term); params->video_height = grub_term_height (term);
found = 1; found = 1;
break;
} }
if (!found)
FOR_ACTIVE_TERM_OUTPUTS(term)
if (grub_strcmp (term->name, "console") == 0)
{
grub_uint16_t pos = grub_term_getxy (term);
params->video_cursor_x = pos >> 8;
params->video_cursor_y = pos & 0xff;
params->video_width = grub_term_width (term);
params->video_height = grub_term_height (term);
found = 1;
}
if (!found) if (!found)
{ {
params->video_cursor_x = 0; params->video_cursor_x = 0;

34
loader/i386/ieee1275/linux.c
View file

@ -109,38 +109,8 @@ grub_linux_boot (void)
params->cl_magic = GRUB_LINUX_CL_MAGIC; params->cl_magic = GRUB_LINUX_CL_MAGIC;
params->cl_offset = GRUB_OFW_LINUX_CL_OFFSET; params->cl_offset = GRUB_OFW_LINUX_CL_OFFSET;
{ params->video_width = (grub_getwh () >> 8);
grub_term_output_t term; params->video_height = (grub_getwh () & 0xff);
int found = 0;
FOR_ACTIVE_TERM_OUTPUTS(term)
if (grub_strcmp (term->name, "vga_text") == 0)
{
grub_uint16_t pos = grub_term_getxy (term);
params->video_cursor_x = pos >> 8;
params->video_cursor_y = pos & 0xff;
params->video_width = grub_term_width (term);
params->video_height = grub_term_height (term);
found = 1;
}
if (!found)
FOR_ACTIVE_TERM_OUTPUTS(term)
if (grub_strcmp (term->name, "console") == 0)
{
grub_uint16_t pos = grub_term_getxy (term);
params->video_cursor_x = pos >> 8;
params->video_cursor_y = pos & 0xff;
params->video_width = grub_term_width (term);
params->video_height = grub_term_height (term);
found = 1;
}
if (!found)
{
params->video_cursor_x = 0;
params->video_cursor_y = 0;
params->video_width = 80;
params->video_height = 25;
}
}
params->font_size = 16; params->font_size = 16;
params->ofw_signature = GRUB_LINUX_OFW_SIGNATURE; params->ofw_signature = GRUB_LINUX_OFW_SIGNATURE;

13
loader/i386/linux.c
View file

@ -551,21 +551,14 @@ grub_linux_boot (void)
grub_term_output_t term; grub_term_output_t term;
int found = 0; int found = 0;
FOR_ACTIVE_TERM_OUTPUTS(term) FOR_ACTIVE_TERM_OUTPUTS(term)
if (grub_strcmp (term->name, "vga_text") == 0) if (grub_strcmp (term->name, "vga_text") == 0
{ || grub_strcmp (term->name, "console") == 0)
grub_uint16_t pos = grub_term_getxy (term);
params->video_cursor_x = pos >> 8;
params->video_cursor_y = pos & 0xff;
found = 1;
}
if (!found)
FOR_ACTIVE_TERM_OUTPUTS(term)
if (grub_strcmp (term->name, "console") == 0)
{ {
grub_uint16_t pos = grub_term_getxy (term); grub_uint16_t pos = grub_term_getxy (term);
params->video_cursor_x = pos >> 8; params->video_cursor_x = pos >> 8;
params->video_cursor_y = pos & 0xff; params->video_cursor_y = pos & 0xff;
found = 1; found = 1;
break;
} }
if (!found) if (!found)
{ {