From 0025933a5ed187143f466eaeff160e4a5d54b94d Mon Sep 17 00:00:00 2001
From: robertmh <robertmh@localhost>
Date: Sat, 8 Nov 2008 12:17:51 +0000
Subject: [PATCH] 2008-11-08  Robert Millan  <rmh@aybabtu.com>

        * 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.
---
 ChangeLog             |  9 +++++++++
 term/i386/pc/vesafb.c |  9 +++------
 util/console.c        | 19 ++++++++++++-------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f4334890..8302276fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-08  Robert Millan  <rmh@aybabtu.com>
+
+	* 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  <rmh@aybabtu.com>
 
 	* Makefile.in (PKGLIB): Add $(pkglib_BUILDDIR).
diff --git a/term/i386/pc/vesafb.c b/term/i386/pc/vesafb.c
index c1811a846..c5a46731d 100644
--- a/term/i386/pc/vesafb.c
+++ b/term/i386/pc/vesafb.c
@@ -578,15 +578,13 @@ grub_vesafb_setcursor (int on)
     }
 }
 
-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 @@ static struct grub_term grub_vesafb_term =
     .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);
 }
diff --git a/util/console.c b/util/console.c
index 30f184e91..bc4414c8d 100644
--- a/util/console.c
+++ b/util/console.c
@@ -345,15 +345,20 @@ grub_ncurses_fini (void)
 }
 
 
-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 @@ static struct grub_term grub_ncurses_term =
     .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