Remove PCD usage for console driver, PcdConOutRow and PcdConOutColumn are current...

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

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 44282b1f9f78517d44fbedcb2f6c1b548096b86c..2419b7c4a8dcc777e1e2d189a974aa01fccfd2a4 100644 (file)
--- 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},\r
   //\r
   // New modes can be added here.\r
-  // The last 2 entries are specific for PcdConOutRow x PcdConOutColumn and full screen mode.\r
+  // The last entry is specific for full screen mode.\r
   //\r
-  {0, 0},\r
   {0, 0}\r
 };\r
 \r
@@ -252,12 +251,7 @@ InitializeGraphicsConsoleTextMode (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  //\r
-  // Add PcdConOutColumn and PcdConOutRow to the last second entry.\r
-  //\r
   Count = sizeof (mGraphicsConsoleModeData) / sizeof (GRAPHICS_CONSOLE_MODE_DATA);\r
-  mGraphicsConsoleModeData[Count - 2].Columns = (UINTN) PcdGet32 (PcdConOutColumn);\r
-  mGraphicsConsoleModeData[Count - 2].Rows    = (UINTN) PcdGet32 (PcdConOutRow);\r
 \r
   //\r
   // Compute the maximum number of text Rows and Columns that this current graphics mode can support.\r
@@ -266,6 +260,11 @@ InitializeGraphicsConsoleTextMode (
   MaxColumns = HorizontalResolution / EFI_GLYPH_WIDTH;\r
   MaxRows    = VerticalResolution / EFI_GLYPH_HEIGHT;\r
 \r
+  //\r
+  // According to UEFI spec, all output devices support at least 80x25 text mode.\r
+  //\r
+  ASSERT ((MaxColumns >= 80) && (MaxRows >= 25));\r
+\r
   //\r
   // Add full screen mode to the last entry.\r
   //\r
@@ -290,19 +289,8 @@ InitializeGraphicsConsoleTextMode (
   //\r
   ValidCount = 0;  \r
 \r
-  if ((MaxColumns >= 80) && (MaxRows >= 25)) {\r
-    //\r
-    // 80x25 can be supported.\r
-    //\r
-    NewModeBuffer[ValidCount].Columns = 80;\r
-    NewModeBuffer[ValidCount].Rows    = 25;\r
-  } else {\r
-    //\r
-    // 80x25 cannot be supported, set PCD defined mode.\r
-    //\r
-    NewModeBuffer[ValidCount].Columns = (UINTN) PcdGet32 (PcdConOutColumn);\r
-    NewModeBuffer[ValidCount].Rows    = (UINTN) PcdGet32 (PcdConOutRow);\r
-  }  \r
+  NewModeBuffer[ValidCount].Columns       = 80;\r
+  NewModeBuffer[ValidCount].Rows          = 25;\r
   NewModeBuffer[ValidCount].GopWidth      = HorizontalResolution;\r
   NewModeBuffer[ValidCount].GopHeight     = VerticalResolution;\r
   NewModeBuffer[ValidCount].GopModeNumber = GopModeNumber;\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
index abdda5949aa521679d5ce13d255afcb8e33df448..789d24936e7da3149e37b75798743b967db26c50 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
@@ -65,8 +65,6 @@
   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport\r
 \r
 [Pcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution\r
 \r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index 0934f16301fea1f2e5be46a3c449be2f7e705d6a..6a65731acad36d2da061c7fab583cceee0a1bd97 100644 (file)
--- 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},\r
   //\r
   // New modes can be added here.\r
-  // The last entry is specific for PcdConOutRow x PcdConOutColumn.\r
   //\r
-  {0, 0}\r
 };\r
 \r
 /**\r
@@ -438,12 +436,7 @@ InitializeTerminalConsoleTextMode (
     return EFI_INVALID_PARAMETER;\r
   }\r
   \r
-  //\r
-  // Assign the last entry as PcdConOutColumn and PcdConOutRow defined.\r
-  //\r
   Count = sizeof (mTerminalConsoleModeData) / sizeof (TERMINAL_CONSOLE_MODE_DATA);\r
-  mTerminalConsoleModeData[Count - 1].Columns = (UINTN) PcdGet32 (PcdConOutColumn);\r
-  mTerminalConsoleModeData[Count - 1].Rows    = (UINTN) PcdGet32 (PcdConOutRow);;\r
   \r
   //\r
   // Get defined mode buffer pointer.\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
index 7d67eba81ae09efdfb6b4b57b8219ac7e107f6fe..d4bd55b4abc6d4701504433cbef03720ad4db9c9 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
@@ -75,8 +75,6 @@
 \r
 [Pcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
 \r
 # [Event]\r
 #   ##\r