From 4fc4ee303dc7449db542cce7209f2dd4e5cd5042 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 25 Dec 2009 00:13:03 +0100
Subject: [PATCH] Set default console on non-i386-pc

---
 term/efi/console.c         |  7 +++----
 term/i386/pc/at_keyboard.c |  4 ++++
 term/i386/pc/vga_text.c    | 11 ++++-------
 term/ieee1275/ofconsole.c  |  7 +++----
 util/console.c             |  8 +++-----
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/term/efi/console.c b/term/efi/console.c
index bde101ebc..dc07c401e 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -351,8 +351,7 @@ static struct grub_term_output grub_console_term_output =
     .setcolorstate = grub_console_setcolorstate,
     .setcolor = grub_console_setcolor,
     .getcolor = grub_console_getcolor,
-    .setcursor = grub_console_setcursor,
-    .flags = GRUB_TERM_ACTIVE,
+    .setcursor = grub_console_setcursor
   };
 
 void
@@ -366,8 +365,8 @@ grub_console_init (void)
       return;
     }
 
-  grub_term_register_input ("console", &grub_console_term_input);
-  grub_term_register_output ("console", &grub_console_term_output);
+  grub_term_register_input_active ("console", &grub_console_term_input);
+  grub_term_register_output_active ("console", &grub_console_term_output);
 }
 
 void
diff --git a/term/i386/pc/at_keyboard.c b/term/i386/pc/at_keyboard.c
index cf30e7242..379cb3a4b 100644
--- a/term/i386/pc/at_keyboard.c
+++ b/term/i386/pc/at_keyboard.c
@@ -233,7 +233,11 @@ static struct grub_term_input grub_at_keyboard_term =
 
 GRUB_MOD_INIT(at_keyboard)
 {
+#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
+  grub_term_register_input_active ("at_keyboard", &grub_at_keyboard_term);
+#else
   grub_term_register_input ("at_keyboard", &grub_at_keyboard_term);
+#endif
 }
 
 GRUB_MOD_FINI(at_keyboard)
diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index 4fc54a60d..01191cef0 100644
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -163,19 +163,16 @@ static struct grub_term_output grub_vga_text_term =
     .setcolorstate = grub_console_setcolorstate,
     .setcolor = grub_console_setcolor,
     .getcolor = grub_console_getcolor,
-    .setcursor = grub_vga_text_setcursor,
-#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
-    .flags = GRUB_TERM_ACTIVE,
-#endif
+    .setcursor = grub_vga_text_setcursor
   };
 
 GRUB_MOD_INIT(vga_text)
 {
 #if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
-  grub_vga_text_init_fini ();
-#endif
-
+  grub_term_register_output_active ("vga_text", &grub_vga_text_term);
+#else
   grub_term_register_output ("vga_text", &grub_vga_text_term);
+#endif
 }
 
 GRUB_MOD_FINI(vga_text)
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 95479379e..f5db7c146 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -414,15 +414,14 @@ static struct grub_term_output grub_ofconsole_term_output =
     .setcolor = grub_ofconsole_setcolor,
     .getcolor = grub_ofconsole_getcolor,
     .setcursor = grub_ofconsole_setcursor,
-    .refresh = grub_ofconsole_refresh,
-    .flags = GRUB_TERM_ACTIVE,
+    .refresh = grub_ofconsole_refresh
   };
 
 void
 grub_console_init (void)
 {
-  grub_term_register_input ("ofconsole", &grub_ofconsole_term_input);
-  grub_term_register_output ("ofconsole", &grub_ofconsole_term_output);
+  grub_term_register_input_active ("ofconsole", &grub_ofconsole_term_input);
+  grub_term_register_output_active ("ofconsole", &grub_ofconsole_term_output);
 }
 
 void
diff --git a/util/console.c b/util/console.c
index be64eb9d8..40ee3a638 100644
--- a/util/console.c
+++ b/util/console.c
@@ -367,16 +367,14 @@ static struct grub_term_output grub_ncurses_term_output =
     .setcolor = grub_ncurses_setcolor,
     .getcolor = grub_ncurses_getcolor,
     .setcursor = grub_ncurses_setcursor,
-    .refresh = grub_ncurses_refresh,
-    .flags = GRUB_TERM_ACTIVE
+    .refresh = grub_ncurses_refresh
   };
 
 void
 grub_console_init (void)
 {
-  grub_term_register_output ("console", &grub_ncurses_term_output);
-  grub_term_register_input ("console", &grub_ncurses_term_input);
-  grub_term_set_current_output (&grub_ncurses_term_output);
+  grub_term_register_output_active ("console", &grub_ncurses_term_output);
+  grub_term_register_input_active ("console", &grub_ncurses_term_input);
 }
 
 void