[1926] 2008-11-22 Robert Millan <address@hidden>

[Robert Millan]

Revision: 1926
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1926
Author:   robertmh
Date:     2008-11-22 14:56:52 +0000 (Sat, 22 Nov 2008)

Log Message:
-----------
2008-11-22  Robert Millan  <address@hidden>

        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().

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/term/i386/pc/vga_text.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-11-20 20:34:14 UTC (rev 1925)
+++ trunk/grub2/ChangeLog       2008-11-22 14:56:52 UTC (rev 1926)
@@ -1,3 +1,10 @@
+2008-11-22  Robert Millan  <address@hidden>
+
+       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  <address@hidden>
 
        * kern/i386/coreboot/init.c (grub_time_tics): Remove variable.

Modified: trunk/grub2/term/i386/pc/vga_text.c
===================================================================
--- trunk/grub2/term/i386/pc/vga_text.c 2008-11-20 20:34:14 UTC (rev 1925)
+++ trunk/grub2/term/i386/pc/vga_text.c 2008-11-22 14:56:52 UTC (rev 1926)
@@ -142,11 +142,18 @@
     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,