[1901] 2008-11-08 Robert Millan <address@hidden>

[Robert Millan]

Revision: 1901
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1901
Author:   robertmh
Date:     2008-11-08 12:17:51 +0000 (Sat, 08 Nov 2008)

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

        * term/i386/pc/vesafb.c (grub_vesafb_term): Change type to
        `struct  grub_term_output'.  Remove `.checkkey' and `.getkey'
        members.  Update all users.
        * util/console.c (grub_ncurses_term): Split in ...
        (grub_ncurses_term_input): ... this, and ...
        (grub_ncurses_term_output): ... this.  Update all users.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/term/i386/pc/vesafb.c
    trunk/grub2/util/console.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-11-08 11:29:53 UTC (rev 1900)
+++ trunk/grub2/ChangeLog       2008-11-08 12:17:51 UTC (rev 1901)
@@ -1,5 +1,14 @@
 2008-11-08  Robert Millan  <address@hidden>
 
+       * term/i386/pc/vesafb.c (grub_vesafb_term): Change type to
+       `struct  grub_term_output'.  Remove `.checkkey' and `.getkey'
+       members.  Update all users.
+       * util/console.c (grub_ncurses_term): Split in ...
+       (grub_ncurses_term_input): ... this, and ...
+       (grub_ncurses_term_output): ... this.  Update all users.
+
+2008-11-08  Robert Millan  <address@hidden>
+
        * Makefile.in (PKGLIB): Add $(pkglib_BUILDDIR).
        (PKGDATA): Add $(pkgdata_SRCDIR).
        (pkglib_BUILDDIR): New variable.

Modified: trunk/grub2/term/i386/pc/vesafb.c
===================================================================
--- trunk/grub2/term/i386/pc/vesafb.c   2008-11-08 11:29:53 UTC (rev 1900)
+++ trunk/grub2/term/i386/pc/vesafb.c   2008-11-08 12:17:51 UTC (rev 1901)
@@ -578,15 +578,13 @@
     }
 }
 
-static struct grub_term grub_vesafb_term =
+static struct grub_term_output grub_vesafb_term =
   {
     .name = "vesafb",
     .init = grub_vesafb_mod_init,
     .fini = grub_vesafb_mod_fini,
     .putchar = grub_vesafb_putchar,
     .getcharwidth = grub_vesafb_getcharwidth,
-    .checkkey = grub_console_checkkey,
-    .getkey = grub_console_getkey,
     .getwh = grub_virtual_screen_getwh,
     .getxy = grub_virtual_screen_getxy,
     .gotoxy = grub_vesafb_gotoxy,
@@ -594,16 +592,15 @@
     .setcolorstate = grub_virtual_screen_setcolorstate,
     .setcursor = grub_vesafb_setcursor,
     .flags = 0,
-    .next = 0
   };
 
 GRUB_MOD_INIT(vesafb)
 {
   my_mod = mod;
-  grub_term_register (&grub_vesafb_term);
+  grub_term_register_output (&grub_vesafb_term);
 }
 
 GRUB_MOD_FINI(vesafb)
 {
-  grub_term_unregister (&grub_vesafb_term);
+  grub_term_unregister_output (&grub_vesafb_term);
 }

Modified: trunk/grub2/util/console.c
===================================================================
--- trunk/grub2/util/console.c  2008-11-08 11:29:53 UTC (rev 1900)
+++ trunk/grub2/util/console.c  2008-11-08 12:17:51 UTC (rev 1901)
@@ -345,15 +345,20 @@
 }
 
 
-static struct grub_term grub_ncurses_term =
+static struct grub_term_input grub_ncurses_term_input =
   {
     .name = "console",
+    .checkkey = grub_ncurses_checkkey,
+    .getkey = grub_ncurses_getkey,
+  };
+
+static struct grub_term_output grub_ncurses_term_output =
+  {
+    .name = "console",
     .init = grub_ncurses_init,
     .fini = grub_ncurses_fini,
     .putchar = grub_ncurses_putchar,
     .getcharwidth = grub_ncurses_getcharwidth,
-    .checkkey = grub_ncurses_checkkey,
-    .getkey = grub_ncurses_getkey,
     .getxy = grub_ncurses_getxy,
     .getwh = grub_ncurses_getwh,
     .gotoxy = grub_ncurses_gotoxy,
@@ -364,15 +369,15 @@
     .setcursor = grub_ncurses_setcursor,
     .refresh = grub_ncurses_refresh,
     .flags = 0,
-    .next = 0
   };
 
 void
 grub_console_init (void)
 {
-  grub_term_register (&grub_ncurses_term);
-  grub_term_set_current_input (&grub_ncurses_term);
-  grub_term_set_current_output (&grub_ncurses_term);
+  grub_term_register_output (&grub_ncurses_term_output);
+  grub_term_register_input (&grub_ncurses_term_input);
+  grub_term_set_current_output (&grub_ncurses_term_output);
+  grub_term_set_current_input (&grub_ncurses_term_input);
 }
 
 void