MdeModulePkg: Update UiApp to handle terminal type TtyTerm

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18236 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Application/UiApp/BootMaint/Bmstring.uni b/MdeModulePkg/Application/UiApp/BootMaint/Bmstring.uni
index 8d9544db450322835972597234a07d76207e1102..a208127ac6ea76ec5dde6824babf05583a1cfa8d 100644 (file)
Binary files a/MdeModulePkg/Application/UiApp/BootMaint/Bmstring.uni and b/MdeModulePkg/Application/UiApp/BootMaint/Bmstring.uni differ

diff --git a/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.h b/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.h
index 69cf7605b9d9fe04c98607e8d1d86e846817fded..e1ac3076390b5928a4a800835a6b24bcc556f604 100644 (file)
--- a/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.h
+++ b/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.h
@@ -18,6 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Ui.h"\r
 #include "FormGuid.h"\r
 #include "FrontPage.h"\r
+#include <Guid/TtyTerm.h>\r
 \r
 //\r
 // Constants which are variable names used to access variables\r
@@ -81,7 +82,8 @@ typedef enum _TYPE_OF_TERMINAL {
   TerminalTypePcAnsi                             = 0,\r
   TerminalTypeVt100,\r
   TerminalTypeVt100Plus,\r
-  TerminalTypeVtUtf8\r
+  TerminalTypeVtUtf8,\r
+  TerminalTypeTtyTerm\r
 } TYPE_OF_TERMINAL;\r
 \r
 typedef enum _FILE_EXPLORER_STATE {\r
@@ -1452,12 +1454,12 @@ extern BM_MENU_OPTION             ConsoleErrMenu;
 extern BM_MENU_OPTION             DirectoryMenu;\r
 extern BM_MENU_OPTION             DriverMenu;\r
 extern BM_MENU_OPTION             TerminalMenu;\r
-extern UINT16                     TerminalType[];\r
+extern UINT16                     TerminalType[5];\r
 extern COM_ATTR                   BaudRateList[19];\r
 extern COM_ATTR                   DataBitsList[4];\r
 extern COM_ATTR                   ParityList[5];\r
 extern COM_ATTR                   StopBitsList[3];\r
-extern EFI_GUID                   TerminalTypeGuid[4];\r
+extern EFI_GUID                   TerminalTypeGuid[5];\r
 extern STRING_DEPOSITORY          *FileOptionStrDepository;\r
 extern STRING_DEPOSITORY          *ConsoleOptionStrDepository;\r
 extern STRING_DEPOSITORY          *BootOptionStrDepository;\r

diff --git a/MdeModulePkg/Application/UiApp/BootMaint/ConsoleOption.c b/MdeModulePkg/Application/UiApp/BootMaint/ConsoleOption.c
index d86c73352d170e66f79478b013b4d3db11840fd9..f164db20510b9c9dddf4962481b2fa571636be70 100644 (file)
--- a/MdeModulePkg/Application/UiApp/BootMaint/ConsoleOption.c
+++ b/MdeModulePkg/Application/UiApp/BootMaint/ConsoleOption.c
@@ -564,7 +564,7 @@ LocateSerialIo (
     Vendor.Header.Type                = MESSAGING_DEVICE_PATH;\r
     Vendor.Header.SubType             = MSG_VENDOR_DP;\r
 \r
-    for (Index2 = 0; Index2 < 4; Index2++) {\r
+    for (Index2 = 0; Index2 < (sizeof (TerminalTypeGuid) / sizeof (TerminalTypeGuid[0])); Index2++) {\r
       CopyMem (&Vendor.Guid, &TerminalTypeGuid[Index2], sizeof (EFI_GUID));\r
       SetDevicePathNodeLength (&Vendor.Header, sizeof (VENDOR_DEVICE_PATH));\r
       NewDevicePath = AppendDevicePathNode (\r
@@ -940,7 +940,12 @@ IsTerminalDevicePath (
           *Termi      = TerminalTypeVtUtf8;\r
           IsTerminal  = TRUE;\r
         } else {\r
-          IsTerminal = FALSE;\r
+          if (CompareGuid (&Vendor->Guid, &TerminalTypeGuid[4])) {\r
+            *Termi      = TerminalTypeTtyTerm;\r
+            IsTerminal  = TRUE;\r
+          } else {\r
+            IsTerminal = FALSE;\r
+          }\r
         }\r
       }\r
     }\r

diff --git a/MdeModulePkg/Application/UiApp/BootMaint/Data.c b/MdeModulePkg/Application/UiApp/BootMaint/Data.c
index 7e86211b4ec4a8fed46eb71d95aa1df365b2f177..caf6c609ed8f776a12b223f2793643c5445aee37 100644 (file)
--- a/MdeModulePkg/Application/UiApp/BootMaint/Data.c
+++ b/MdeModulePkg/Application/UiApp/BootMaint/Data.c
@@ -35,6 +35,7 @@ UINT16              TerminalType[] = {
   STRING_TOKEN(STR_COM_TYPE_1),\r
   STRING_TOKEN(STR_COM_TYPE_2),\r
   STRING_TOKEN(STR_COM_TYPE_3),\r
+  STRING_TOKEN(STR_COM_TYPE_4),\r
 };\r
 \r
 ///\r
@@ -266,9 +267,10 @@ COM_ATTR            StopBitsList[3] = {
 ///\r
 /// Guid for messaging path, used in Serial port setting.\r
 ///\r
-EFI_GUID            TerminalTypeGuid[4] = {\r
+EFI_GUID            TerminalTypeGuid[] = {\r
   DEVICE_PATH_MESSAGING_PC_ANSI,\r
   DEVICE_PATH_MESSAGING_VT_100,\r
   DEVICE_PATH_MESSAGING_VT_100_PLUS,\r
-  DEVICE_PATH_MESSAGING_VT_UTF8\r
+  DEVICE_PATH_MESSAGING_VT_UTF8,\r
+  EFI_TTY_TERM_GUID\r
 };\r

diff --git a/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c b/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
index 0e85a832c12c49665eb00052bc5100f07534aafd..9f1d20d8ed6a226f6bb2dc13e0106e38654ac520 100644 (file)
--- a/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
+++ b/MdeModulePkg/Application/UiApp/BootMaint/UpdatePage.c
@@ -1056,7 +1056,7 @@ UpdateTerminalPage (
   OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();\r
   ASSERT (OptionsOpCodeHandle != NULL);\r
 \r
-  for (Index = 0; Index < 4; Index++) {\r
+  for (Index = 0; Index < sizeof (TerminalType) / sizeof (TerminalType[0]); Index++) {\r
     CheckFlags = 0;\r
     if (NewTerminalContext->TerminalType == Index) {\r
       CheckFlags |= EFI_IFR_OPTION_DEFAULT;\r