From 5a1ed29ebd132255cd70c14fcd4e1838ac4c6717 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 7 Jan 2010 01:21:32 +0000
Subject: [PATCH] Simplify terminal check in loader/i386/efi/linux.c and
 loader/i386/linux.c

Revert loader/i386/ieee1275/linux.c change
---
 loader/i386/efi/linux.c      | 15 +++------------
 loader/i386/ieee1275/linux.c | 34 ++--------------------------------
 loader/i386/linux.c          | 13 +++----------
 3 files changed, 8 insertions(+), 54 deletions(-)

diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index c6acab641..a1d08b3d7 100644
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -697,7 +697,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
     grub_term_output_t term;
     int found = 0;
     FOR_ACTIVE_TERM_OUTPUTS(term)
-      if (grub_strcmp (term->name, "vga_text") == 0)
+      if (grub_strcmp (term->name, "vga_text") == 0
+	  || grub_strcmp (term->name, "console") == 0)
 	{
 	  grub_uint16_t pos = grub_term_getxy (term);
 	  params->video_cursor_x = pos >> 8;
@@ -705,18 +706,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 	  params->video_width = grub_term_width (term);
 	  params->video_height = grub_term_height (term);
 	  found = 1;
+	  break;
 	}
-    if (!found)
-      FOR_ACTIVE_TERM_OUTPUTS(term)
-	if (grub_strcmp (term->name, "console") == 0)
-	  {
-	    grub_uint16_t pos = grub_term_getxy (term);
-	    params->video_cursor_x = pos >> 8;
-	    params->video_cursor_y = pos & 0xff;
-	    params->video_width = grub_term_width (term);
-	    params->video_height = grub_term_height (term);
-	    found = 1;
-	  }
     if (!found)
       {
 	params->video_cursor_x = 0;
diff --git a/loader/i386/ieee1275/linux.c b/loader/i386/ieee1275/linux.c
index 33076ea5b..e8a6f1a52 100644
--- a/loader/i386/ieee1275/linux.c
+++ b/loader/i386/ieee1275/linux.c
@@ -109,38 +109,8 @@ grub_linux_boot (void)
   params->cl_magic = GRUB_LINUX_CL_MAGIC;
   params->cl_offset = GRUB_OFW_LINUX_CL_OFFSET;
 
-  {
-    grub_term_output_t term;
-    int found = 0;
-    FOR_ACTIVE_TERM_OUTPUTS(term)
-      if (grub_strcmp (term->name, "vga_text") == 0)
-	{
-	  grub_uint16_t pos = grub_term_getxy (term);
-	  params->video_cursor_x = pos >> 8;
-	  params->video_cursor_y = pos & 0xff;
-	  params->video_width = grub_term_width (term);
-	  params->video_height = grub_term_height (term);
-	  found = 1;
-	}
-    if (!found)
-      FOR_ACTIVE_TERM_OUTPUTS(term)
-	if (grub_strcmp (term->name, "console") == 0)
-	  {
-	    grub_uint16_t pos = grub_term_getxy (term);
-	    params->video_cursor_x = pos >> 8;
-	    params->video_cursor_y = pos & 0xff;
-	    params->video_width = grub_term_width (term);
-	    params->video_height = grub_term_height (term);
-	    found = 1;
-	  }
-    if (!found)
-      {
-	params->video_cursor_x = 0;
-	params->video_cursor_y = 0;
-	params->video_width = 80;
-	params->video_height = 25;
-      }
-  }
+  params->video_width = (grub_getwh () >> 8);
+  params->video_height = (grub_getwh () & 0xff);
   params->font_size = 16;
 
   params->ofw_signature = GRUB_LINUX_OFW_SIGNATURE;
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index c1649e9e6..863090025 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -551,21 +551,14 @@ grub_linux_boot (void)
       grub_term_output_t term;
       int found = 0;
       FOR_ACTIVE_TERM_OUTPUTS(term)
-	if (grub_strcmp (term->name, "vga_text") == 0)
-	  {
-	    grub_uint16_t pos = grub_term_getxy (term);
-	    params->video_cursor_x = pos >> 8;
-	    params->video_cursor_y = pos & 0xff;
-	    found = 1;
-	  }
-      if (!found)
-	FOR_ACTIVE_TERM_OUTPUTS(term)
-	  if (grub_strcmp (term->name, "console") == 0)
+	if (grub_strcmp (term->name, "vga_text") == 0
+	    || grub_strcmp (term->name, "console") == 0)
 	  {
 	    grub_uint16_t pos = grub_term_getxy (term);
 	    params->video_cursor_x = pos >> 8;
 	    params->video_cursor_y = pos & 0xff;
 	    found = 1;
+	    break;
 	  }
       if (!found)
 	{