From 9381365cf13fcff012e1b31c6b2aafed56f03a67 Mon Sep 17 00:00:00 2001
From: li-elvin <li-elvin@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 30 Nov 2011 06:01:22 +0000
Subject: [PATCH] Remove PCD usage for console driver, PcdConOutRow and
 PcdConOutColumn are current text mode during boot, not console device
 capability.

Signed-off-by: li-elvin
Reviewed-by: hhtian

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12803 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../GraphicsConsoleDxe/GraphicsConsole.c      | 28 ++++++-------------
 .../GraphicsConsoleDxe/GraphicsConsoleDxe.inf |  2 --
 .../Universal/Console/TerminalDxe/Terminal.c  |  7 -----
 .../Console/TerminalDxe/TerminalDxe.inf       |  2 --
 4 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 44282b1f9f..2419b7c4a8 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -49,9 +49,8 @@ GRAPHICS_CONSOLE_MODE_DATA mGraphicsConsoleModeData[] = {
   {100, 31},
   //
   // New modes can be added here.
-  // The last 2 entries are specific for PcdConOutRow x PcdConOutColumn and full screen mode.
+  // The last entry is specific for full screen mode.
   //
-  {0, 0},
   {0, 0}
 };
 
@@ -252,12 +251,7 @@ InitializeGraphicsConsoleTextMode (
     return EFI_INVALID_PARAMETER;
   }
 
-  //
-  // Add PcdConOutColumn and PcdConOutRow to the last second entry.
-  //
   Count = sizeof (mGraphicsConsoleModeData) / sizeof (GRAPHICS_CONSOLE_MODE_DATA);
-  mGraphicsConsoleModeData[Count - 2].Columns = (UINTN) PcdGet32 (PcdConOutColumn);
-  mGraphicsConsoleModeData[Count - 2].Rows    = (UINTN) PcdGet32 (PcdConOutRow);
 
   //
   // Compute the maximum number of text Rows and Columns that this current graphics mode can support.
@@ -266,6 +260,11 @@ InitializeGraphicsConsoleTextMode (
   MaxColumns = HorizontalResolution / EFI_GLYPH_WIDTH;
   MaxRows    = VerticalResolution / EFI_GLYPH_HEIGHT;
 
+  //
+  // According to UEFI spec, all output devices support at least 80x25 text mode.
+  //
+  ASSERT ((MaxColumns >= 80) && (MaxRows >= 25));
+
   //
   // Add full screen mode to the last entry.
   //
@@ -290,19 +289,8 @@ InitializeGraphicsConsoleTextMode (
   //
   ValidCount = 0;  
 
-  if ((MaxColumns >= 80) && (MaxRows >= 25)) {
-    //
-    // 80x25 can be supported.
-    //
-    NewModeBuffer[ValidCount].Columns = 80;
-    NewModeBuffer[ValidCount].Rows    = 25;
-  } else {
-    //
-    // 80x25 cannot be supported, set PCD defined mode.
-    //
-    NewModeBuffer[ValidCount].Columns = (UINTN) PcdGet32 (PcdConOutColumn);
-    NewModeBuffer[ValidCount].Rows    = (UINTN) PcdGet32 (PcdConOutRow);
-  }  
+  NewModeBuffer[ValidCount].Columns       = 80;
+  NewModeBuffer[ValidCount].Rows          = 25;
   NewModeBuffer[ValidCount].GopWidth      = HorizontalResolution;
   NewModeBuffer[ValidCount].GopHeight     = VerticalResolution;
   NewModeBuffer[ValidCount].GopModeNumber = GopModeNumber;
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
index abdda5949a..789d24936e 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
@@ -65,8 +65,6 @@
   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution
 
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index 0934f16301..6a65731aca 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
@@ -99,9 +99,7 @@ TERMINAL_CONSOLE_MODE_DATA mTerminalConsoleModeData[] = {
   {100, 31},
   //
   // New modes can be added here.
-  // The last entry is specific for PcdConOutRow x PcdConOutColumn.
   //
-  {0, 0}
 };
 
 /**
@@ -438,12 +436,7 @@ InitializeTerminalConsoleTextMode (
     return EFI_INVALID_PARAMETER;
   }
   
-  //
-  // Assign the last entry as PcdConOutColumn and PcdConOutRow defined.
-  //
   Count = sizeof (mTerminalConsoleModeData) / sizeof (TERMINAL_CONSOLE_MODE_DATA);
-  mTerminalConsoleModeData[Count - 1].Columns = (UINTN) PcdGet32 (PcdConOutColumn);
-  mTerminalConsoleModeData[Count - 1].Rows    = (UINTN) PcdGet32 (PcdConOutRow);;
   
   //
   // Get defined mode buffer pointer.
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
index 7d67eba81a..d4bd55b4ab 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
@@ -75,8 +75,6 @@
 
 [Pcd]
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
 
 # [Event]
 #   ##