Update to support to produce Component Name and & Component Name 2 protocol based on Feature flag PcdComponentNameDisable & PcdComponentName2Disable.

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

1 files changed, 13 insertions, 5 deletions

diff --git a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
index c0692eaa52..6c3a6c82b2 100644
--- a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
+++ b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
@@ -83,14 +83,13 @@ InitializeWinNtSerialIo(
   //

   // Install driver model protocol(s).

   //

-  Status = EfiLibInstallAllDriverProtocols (

+  Status = EfiLibInstallDriverBindingComponentName2 (

              ImageHandle,

              SystemTable,

              &gWinNtSerialIoDriverBinding,

              ImageHandle,

              &gWinNtSerialIoComponentName,

-             NULL,

-             NULL

+             &gWinNtSerialIoComponentName2

              );

   ASSERT_EFI_ERROR (Status);

 

@@ -399,12 +398,21 @@ Returns:
   Private->Fifo.Last              = 0;

   Private->Fifo.Surplus           = SERIAL_MAX_BUFFER_SIZE;

 

-  AddUnicodeString (

+  AddUnicodeString2 (

     "eng",

     gWinNtSerialIoComponentName.SupportedLanguages,

     &Private->ControllerNameTable,

-    WinNtIo->EnvString

+    WinNtIo->EnvString,

+    TRUE

     );

+  AddUnicodeString2 (

+    "en",

+    gWinNtSerialIoComponentName2.SupportedLanguages,

+    &Private->ControllerNameTable,

+    WinNtIo->EnvString,

+    FALSE

+    );

+

 

   Private->SerialIo.Revision      = SERIAL_IO_INTERFACE_REVISION;

   Private->SerialIo.Reset         = WinNtSerialIoReset;