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

Fix coreboot compilation.

Browse source 
* grub-core/term/i386/pc/vga_text.c (grub_vga_text_init): Rename to ...
	(grub_vga_text_init_real): ... this.
	(grub_vga_text_fini): Rename to ...
	(grub_vga_text_fini_real): ... this.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-07-22 16:21:24 +02:00
parent 91a05f64e6
commit d187a1c3d7
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2012-07-22 Vladimir Serbinenko <phcoder@gmail.com>
Fix coreboot compilation.
* grub-core/term/i386/pc/vga_text.c (grub_vga_text_init): Rename to ...
(grub_vga_text_init_real): ... this.
(grub_vga_text_fini): Rename to ...
(grub_vga_text_fini_real): ... this.
2012-07-07 Vladimir Serbinenko <phcoder@gmail.com> 2012-07-07 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/Makefile.am: Fix path to boot/i386/pc/startup_raw.S. * grub-core/Makefile.am: Fix path to boot/i386/pc/startup_raw.S.

8
grub-core/term/i386/pc/vga_text.c
View file

@ -167,7 +167,7 @@ grub_vga_text_setcursor (struct grub_term_output *term __attribute__ ((unused)),
} }
static grub_err_t static grub_err_t
grub_vga_text_init (struct grub_term_output *term) grub_vga_text_init_real (struct grub_term_output *term)
{ {
#ifdef MODESET #ifdef MODESET
struct grub_bios_int_registers regs; struct grub_bios_int_registers regs;
@ -186,7 +186,7 @@ grub_vga_text_init (struct grub_term_output *term)
} }
static grub_err_t static grub_err_t
grub_vga_text_fini (struct grub_term_output *term) grub_vga_text_fini_real (struct grub_term_output *term)
{ {
#ifdef MODESET #ifdef MODESET
struct grub_bios_int_registers regs; struct grub_bios_int_registers regs;
@ -255,8 +255,8 @@ static struct grub_term_output grub_vga_text_term =
#else #else
.name = "vga_text", .name = "vga_text",
#endif #endif
.init = grub_vga_text_init, .init = grub_vga_text_init_real,
.fini = grub_vga_text_fini, .fini = grub_vga_text_fini_real,
.putchar = grub_vga_text_putchar, .putchar = grub_vga_text_putchar,
.getwh = grub_vga_text_getwh, .getwh = grub_vga_text_getwh,
.getxy = grub_vga_text_getxy, .getxy = grub_vga_text_getxy,