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

Fix i386-ieee1275 compilation

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-28 22:06:30 +01:00
parent 13d1f24696
commit a6f106ce37
2 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -109,8 +109,38 @@ 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); {
params->video_height = (grub_getwh () & 0xff); grub_term_output_t term;
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;

4
term/ieee1275/ofconsole.c
View file

@ -88,7 +88,7 @@ grub_ofconsole_putchar (grub_uint32_t c)
grub_curr_x++; grub_curr_x++;
if (grub_curr_x > grub_ofconsole_width) if (grub_curr_x > grub_ofconsole_width)
{ {
grub_putcode ('\n'); grub_ofconsole_putchar ('\n');
grub_curr_x++; grub_curr_x++;
} }
} }
@ -319,7 +319,7 @@ grub_ofconsole_cls (void)
* ANSI escape sequence. Using video console, Apple Open Firmware (version * ANSI escape sequence. Using video console, Apple Open Firmware (version
* 3.1.1) only recognizes the literal ^L. So use both. */ * 3.1.1) only recognizes the literal ^L. So use both. */
grub_ofconsole_writeesc (" \e[2J"); grub_ofconsole_writeesc (" \e[2J");
grub_gotoxy (0, 0); grub_ofconsole_gotoxy (0, 0);
} }
static void static void