Update to support to produce Component Name and & Component Name 2 protocol based...

[mirror_edk2.git] / MdeModulePkg / Universal / Console / TerminalDxe / Terminal.c

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index d1f89bcfcc58869286259db3ac9db0061c6701c9..4e2f650964f541d06b6a604da97c23befaf1b99d 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
@@ -498,39 +498,75 @@ TerminalDriverBindingStart (
   TerminalDevice->ControllerNameTable = NULL;\r
   switch (TerminalDevice->TerminalType) {\r
   case PcAnsiType:\r
-    AddUnicodeString (\r
+    AddUnicodeString2 (\r
       "eng",\r
       gTerminalComponentName.SupportedLanguages,\r
       &TerminalDevice->ControllerNameTable,\r
-      (CHAR16 *)L"PC-ANSI Serial Console"\r
+      (CHAR16 *)L"PC-ANSI Serial Console",\r
+      TRUE\r
       );\r
+    AddUnicodeString2 (\r
+      "en",\r
+      gTerminalComponentName2.SupportedLanguages,\r
+      &TerminalDevice->ControllerNameTable,\r
+      (CHAR16 *)L"PC-ANSI Serial Console",\r
+      FALSE\r
+      );\r
+\r
     break;\r
 \r
   case VT100Type:\r
-    AddUnicodeString (\r
+    AddUnicodeString2 (\r
       "eng",\r
       gTerminalComponentName.SupportedLanguages,\r
       &TerminalDevice->ControllerNameTable,\r
-      (CHAR16 *)L"VT-100 Serial Console"\r
+      (CHAR16 *)L"VT-100 Serial Console",\r
+      TRUE\r
       );\r
+    AddUnicodeString2 (\r
+      "en",\r
+      gTerminalComponentName2.SupportedLanguages,\r
+      &TerminalDevice->ControllerNameTable,\r
+      (CHAR16 *)L"VT-100 Serial Console",\r
+      FALSE\r
+      );\r
+\r
     break;\r
 \r
   case VT100PlusType:\r
-    AddUnicodeString (\r
+    AddUnicodeString2 (\r
       "eng",\r
       gTerminalComponentName.SupportedLanguages,\r
       &TerminalDevice->ControllerNameTable,\r
-      (CHAR16 *)L"VT-100+ Serial Console"\r
+      (CHAR16 *)L"VT-100+ Serial Console",\r
+      TRUE\r
       );\r
+    AddUnicodeString2 (\r
+      "en",\r
+      gTerminalComponentName2.SupportedLanguages,\r
+      &TerminalDevice->ControllerNameTable,\r
+      (CHAR16 *)L"VT-100+ Serial Console",\r
+      FALSE\r
+      );\r
+\r
     break;\r
 \r
   case VTUTF8Type:\r
-    AddUnicodeString (\r
+    AddUnicodeString2 (\r
       "eng",\r
       gTerminalComponentName.SupportedLanguages,\r
       &TerminalDevice->ControllerNameTable,\r
-      (CHAR16 *)L"VT-UTF8 Serial Console"\r
+      (CHAR16 *)L"VT-UTF8 Serial Console",\r
+      TRUE\r
       );\r
+    AddUnicodeString2 (\r
+      "en",\r
+      gTerminalComponentName2.SupportedLanguages,\r
+      &TerminalDevice->ControllerNameTable,\r
+      (CHAR16 *)L"VT-UTF8 Serial Console",\r
+      FALSE\r
+      );\r
+\r
     break;\r
   }\r
   //\r
@@ -1221,14 +1257,13 @@ InitializeTerminal(
   //\r
   // Install driver model protocol(s).\r
   //\r
-  Status = EfiLibInstallAllDriverProtocols (\r
+  Status = EfiLibInstallDriverBindingComponentName2 (\r
              ImageHandle,\r
              SystemTable,\r
              &gTerminalDriverBinding,\r
              ImageHandle,\r
              &gTerminalComponentName,\r
-             NULL,\r
-             NULL\r
+             &gTerminalComponentName2\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r