2008-11-22 Robert Millan <rmh@aybabtu.com>

        Fix breakage on coreboot due to declaration missmatch.
        * term/i386/pc/vga_text.c (grub_vga_text_init_fini): New function.
        (grub_vga_text_term): Use grub_vga_text_init_fini() instead of
        grub_vga_text_cls().

diff --git a/ChangeLog b/ChangeLog
index dbad92b0c729ef7c0abfa8312cf047641e92236e..75511246064a70deb91048d2b75923e19f8cb4fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-22  Robert Millan  <rmh@aybabtu.com>
+
+       Fix breakage on coreboot due to declaration missmatch.
+       * term/i386/pc/vga_text.c (grub_vga_text_init_fini): New function.
+       (grub_vga_text_term): Use grub_vga_text_init_fini() instead of
+       grub_vga_text_cls().
+
 2008-11-20  Robert Millan  <rmh@aybabtu.com>
 
        * kern/i386/coreboot/init.c (grub_time_tics): Remove variable.

diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index 8b8aecb30f2fb6581864810422caceb84a291cd0..0649262d5ae5dd6d19c3062d08beb3fb2dea1fc8 100644 (file)
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -142,11 +142,18 @@ grub_vga_text_setcursor (int on)
     grub_outb (old | CRTC_CURSOR_DISABLE, CRTC_DATA_PORT);
 }
 
+static grub_err_t
+grub_vga_text_init_fini ()
+{
+  grub_vga_text_cls ();
+  return 0;
+}
+
 static struct grub_term_output grub_vga_text_term =
   {
     .name = "vga_text",
-    .init = grub_vga_text_cls,
-    .fini = grub_vga_text_cls,
+    .init = grub_vga_text_init_fini,
+    .fini = grub_vga_text_init_fini,
     .putchar = grub_console_putchar,
     .getcharwidth = grub_console_getcharwidth,
     .getwh = grub_console_getwh,