Update consplitter driver to use dynamic PCD to set console output mode instead of...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7574 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 153974a051108a494d0cb81385b282786d21f459..e189b7d5c98146f1880b4b3ddbb395fcea4aa321 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -2918,7 +2918,6 @@ ConsplitterSetConsoleOutMode (
   UINTN                            MaxMode;\r
   EFI_STATUS                       Status;\r
   CONSOLE_OUT_MODE                 ModeInfo;\r
-  UINTN                            ModeInfoSize;\r
   EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *TextOut;\r
 \r
   PreferMode   = 0xFF;\r
@@ -2926,31 +2925,8 @@ ConsplitterSetConsoleOutMode (
   TextOut      = &Private->TextOut;\r
   MaxMode      = (UINTN) (TextOut->Mode->MaxMode);\r
 \r
-  ModeInfoSize = sizeof (CONSOLE_OUT_MODE);\r
-  Status = gRT->GetVariable (\r
-                   VARCONOUTMODE,\r
-                   &gEfiGenericPlatformVariableGuid,\r
-                   NULL,\r
-                   &ModeInfoSize,\r
-                   &ModeInfo\r
-                   );\r
-\r
-  if (EFI_ERROR(Status)) {\r
-    //\r
-    // If fail to get variable, set variable to the default mode 80 x 25\r
-    // required by UEFI spec;\r
-    //\r
-    ModeInfo.Column = 80;\r
-    ModeInfo.Row    = 25;\r
-\r
-    gRT->SetVariable (\r
-           VARCONOUTMODE,\r
-           &gEfiGenericPlatformVariableGuid,\r
-           EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
-           sizeof (CONSOLE_OUT_MODE),\r
-           &ModeInfo\r
-           );\r
-  }\r
+  ModeInfo.Column = PcdGet32 (PcdConOutColumn);\r
+  ModeInfo.Row    = PcdGet32 (PcdConOutRow);\r
 \r
   //\r
   // To find the prefer mode and basic mode from Text Out mode list\r
@@ -2968,7 +2944,7 @@ ConsplitterSetConsoleOutMode (
   }\r
 \r
   //\r
-  // Set perfer mode to Text Out devices.\r
+  // Set prefer mode to Text Out devices.\r
   //\r
   Status = TextOut->SetMode (TextOut, PreferMode);\r
   if (EFI_ERROR(Status)) {\r
@@ -2977,20 +2953,9 @@ ConsplitterSetConsoleOutMode (
     //\r
     Status = TextOut->SetMode (TextOut, BaseMode);\r
     ASSERT(!EFI_ERROR(Status));\r
-\r
-    ModeInfo.Column = 80;\r
-    ModeInfo.Row    = 25;\r
-\r
-    //\r
-    // Update ConOutMode variable\r
-    //\r
-    gRT->SetVariable (\r
-           VARCONOUTMODE,\r
-           &gEfiGenericPlatformVariableGuid,\r
-           EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
-           sizeof (CONSOLE_OUT_MODE),\r
-           &ModeInfo\r
-           );\r
+    \r
+    PcdSet32 (PcdConOutColumn, 80);\r
+    PcdSet32 (PcdConOutRow, 25);\r
   }\r
 \r
   return ;\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
index 4e37213b34a49881c1bdb70ecd9967d7527fe37d..b4b8f1d322a7e15b4ea69d304eecae35537aeeff 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
@@ -33,7 +33,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/PrimaryStandardErrorDevice.h>\r
 #include <Guid/PrimaryConsoleOutDevice.h>\r
 #include <Guid/PrimaryConsoleInDevice.h>\r
-#include <Guid/GenericPlatformVariable.h>\r
 #include <Guid/ConsoleInDevice.h>\r
 #include <Guid/StandardErrorDevice.h>\r
 #include <Guid/ConsoleOutDevice.h>\r
@@ -84,7 +83,6 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gConSplitterStdErrComponentName2;
 #define CONSOLE_SPLITTER_MODES_ALLOC_UNIT     32\r
 #define MAX_STD_IN_PASSWORD                   80\r
 \r
-#define VARCONOUTMODE L"ConOutMode"\r
 \r
 typedef struct {\r
   UINTN   Column;\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
index b4248fe27fa28d64605f70c8e34c5e7dfc971479..f33b26af41ba933a2a8f2c52f1b113767f52a6b2 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
@@ -77,7 +77,6 @@
   gEfiPrimaryConsoleOutDeviceGuid               ## PRODUCES\r
   gEfiPrimaryConsoleInDeviceGuid                ## PRODUCES\r
   gEfiPrimaryStandardErrorDeviceGuid            ## PRODUCES\r
-  gEfiGenericPlatformVariableGuid               ## SOMETIMES_CONSUMES ## Variable:L"ConOutMode"\r
 \r
 [Protocols]\r
   gEfiConsoleControlProtocolGuid                ## PRODUCES\r
@@ -96,6 +95,10 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport\r
   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport\r
 \r
+[Pcd.common]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
+\r
 # [Event]\r
 #   ##\r
 #   # mConIn.LockEvent, used to record and check key sequence on StdIn. Periodic is 25ms.\r