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@4003 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 447 insertions, 205 deletions

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c b/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
index bf95be158c..96fee5cb5f 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/ComponentName.c
@@ -17,15 +17,25 @@
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL     gDiskIoComponentName = {

+EFI_COMPONENT_NAME_PROTOCOL  gDiskIoComponentName = {

   DiskIoComponentNameGetDriverName,

   DiskIoComponentNameGetControllerName,

   "eng"

-};

+  };

+

+//

+// EFI Component Name 2 Protocol

+//

+EFI_COMPONENT_NAME2_PROTOCOL gDiskIoComponentName2 = {

+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) DiskIoComponentNameGetDriverName,

+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) DiskIoComponentNameGetControllerName,

+  "en"

+  };

+

 

 static EFI_UNICODE_STRING_TABLE mDiskIoDriverNameTable[] = {

   {

-    "eng",

+    "eng;en",

     (CHAR16 *)L"Generic Disk I/O Driver"

   },

   {

@@ -37,39 +47,42 @@ static EFI_UNICODE_STRING_TABLE mDiskIoDriverNameTable[] = {
 

 

 /**

-  Retrieves a Unicode string that is the user readable name of

-  the EFI Driver.

+  Retrieves a Unicode string that is the user readable name of the driver.

+

+  This function retrieves the user readable name of a driver in the form of a

+  Unicode string. If the driver specified by This has a user readable name in

+  the language specified by Language, then a pointer to the driver name is

+  returned in DriverName, and EFI_SUCCESS is returned. If the driver specified

+  by This does not support the language specified by Language,

+  then EFI_UNSUPPORTED is returned.

+

+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or

+                                EFI_COMPONENT_NAME_PROTOCOL instance.

+

+  @param  Language[in]          A pointer to a Null-terminated ASCII string

+                                array indicating the language. This is the

+                                language of the driver name that the caller is

+                                requesting, and it must match one of the

+                                languages specified in SupportedLanguages. The

+                                number of languages supported by a driver is up

+                                to the driver writer. Language is specified

+                                in RFC 3066 or ISO 639-2 language code format.

+

+  @param  DriverName[out]       A pointer to the Unicode string to return.

+                                This Unicode string is the name of the

+                                driver specified by This in the language

+                                specified by Language.

+

+  @retval EFI_SUCCESS           The Unicode string for the Driver specified by

+                                This and the language specified by Language was

+                                returned in DriverName.

 

-  @param  This       A pointer to the

-                     EFI_COMPONENT_NAME_PROTOCOL instance.

-  

-  @param  Language   A pointer to a Null-terminated ASCII string

-                     array indicating the language. This is the

-                     language of the driver name that the caller

-                     is requesting, and it must match one of the

-                     languages specified in SupportedLanguages.

-                     The number of languages supported by a

-                     driver is up to the driver writer. Language

-                     is specified in RFC 3066 language code

-                     format.

-  

-  @param  DriverName A pointer to the Unicode string to return.

-                     This Unicode string is the name of the

-                     driver specified by This in the language

-                     specified by Language.

-

-  @retval EFI_SUCCESS           The Unicode string for the

-                                Driver specified by This and the

-                                language specified by Language

-                                was returned in DriverName.

-  

   @retval EFI_INVALID_PARAMETER Language is NULL.

-  

+

   @retval EFI_INVALID_PARAMETER DriverName is NULL.

-  

-  @retval EFI_UNSUPPORTED       The driver specified by This

-                                does not support the language

-                                specified by Language.

+

+  @retval EFI_UNSUPPORTED       The driver specified by This does not support

+                                the language specified by Language.

 

 **/

 EFI_STATUS

@@ -80,84 +93,83 @@ DiskIoComponentNameGetDriverName (
   OUT CHAR16                       **DriverName

   )

 {

-  return LookupUnicodeString (

+  return LookupUnicodeString2 (

            Language,

-           gDiskIoComponentName.SupportedLanguages,

+           This->SupportedLanguages,

            mDiskIoDriverNameTable,

-           DriverName

+           DriverName,

+           (BOOLEAN)(This == &gDiskIoComponentName)

            );

 }

 

 

 

 /**

-  Retrieves a Unicode string that is the user readable name of

-  the controller that is being managed by an EFI Driver.

-

-  @param  This             A pointer to the

-                           EFI_COMPONENT_NAME_PROTOCOL instance.

-

-  @param  ControllerHandle The handle of a controller that the

-                           driver specified by This is managing.

-                           This handle specifies the controller

-                           whose name is to be returned.

-

-  @param ChildHandle      The handle of the child controller to

-                           retrieve the name of.  This is an

-                           optional parameter that may be NULL.

-                           It will be NULL for device drivers.

-                           It will also be NULL for a bus

-                           drivers that wish to retrieve the

-                           name of the bus controller.  It will

-                           not be NULL for a bus driver that

-                           wishes to retrieve the name of a

-                           child controller.

-

-  @param  Language         A pointer to a Null-terminated ASCII

-                           string array indicating the language.

-                           This is the language of the driver

-                           name that the caller is requesting,

-                           and it must match one of the

-                           languages specified in

-                           SupportedLanguages. The number of

-                           languages supported by a driver is up

-                           to the driver writer. Language is

-                           specified in RFC 3066 language code

-                           format.

-

-  @param  ControllerName   A pointer to the Unicode string to

-                           return.  This Unicode string is the

-                           name of the controller specified by

-                           ControllerHandle and ChildHandle in

-                           the language specified by Language

-                           from the point of view of the driver

-                           specified by This.

-

-  @retval EFI_SUCCESS           The Unicode string for the user

-                                readable name in the language

-                                specified by Language for the

-                                driver specified by This was

-                                returned in DriverName.

-

-  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid

+  Retrieves a Unicode string that is the user readable name of the controller

+  that is being managed by a driver.

+

+  This function retrieves the user readable name of the controller specified by

+  ControllerHandle and ChildHandle in the form of a Unicode string. If the

+  driver specified by This has a user readable name in the language specified by

+  Language, then a pointer to the controller name is returned in ControllerName,

+  and EFI_SUCCESS is returned.  If the driver specified by This is not currently

+  managing the controller specified by ControllerHandle and ChildHandle,

+  then EFI_UNSUPPORTED is returned.  If the driver specified by This does not

+  support the language specified by Language, then EFI_UNSUPPORTED is returned.

+

+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or

+                                EFI_COMPONENT_NAME_PROTOCOL instance.

+

+  @param  ControllerHandle[in]  The handle of a controller that the driver

+                                specified by This is managing.  This handle

+                                specifies the controller whose name is to be

+                                returned.

+

+  @param  ChildHandle[in]       The handle of the child controller to retrieve

+                                the name of.  This is an optional parameter that

+                                may be NULL.  It will be NULL for device

+                                drivers.  It will also be NULL for a bus drivers

+                                that wish to retrieve the name of the bus

+                                controller.  It will not be NULL for a bus

+                                driver that wishes to retrieve the name of a

+                                child controller.

+

+  @param  Language[in]          A pointer to a Null-terminated ASCII string

+                                array indicating the language.  This is the

+                                language of the driver name that the caller is

+                                requesting, and it must match one of the

+                                languages specified in SupportedLanguages. The

+                                number of languages supported by a driver is up

+                                to the driver writer. Language is specified in

+                                RFC 3066 or ISO 639-2 language code format.

+

+  @param  ControllerName[out]   A pointer to the Unicode string to return.

+                                This Unicode string is the name of the

+                                controller specified by ControllerHandle and

+                                ChildHandle in the language specified by

+                                Language from the point of view of the driver

+                                specified by This.

+

+  @retval EFI_SUCCESS           The Unicode string for the user readable name in

+                                the language specified by Language for the

+                                driver specified by This was returned in

+                                DriverName.

+

+  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE.

+

+  @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid

                                 EFI_HANDLE.

 

-  @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it

-                                is not a valid EFI_HANDLE.

-

   @retval EFI_INVALID_PARAMETER Language is NULL.

 

   @retval EFI_INVALID_PARAMETER ControllerName is NULL.

 

-  @retval EFI_UNSUPPORTED       The driver specified by This is

-                                not currently managing the

-                                controller specified by

-                                ControllerHandle and

-                                ChildHandle.

+  @retval EFI_UNSUPPORTED       The driver specified by This is not currently

+                                managing the controller specified by

+                                ControllerHandle and ChildHandle.

 

-  @retval EFI_UNSUPPORTED       The driver specified by This

-                                does not support the language

-                                specified by Language.

+  @retval EFI_UNSUPPORTED       The driver specified by This does not support

+                                the language specified by Language.

 

 **/

 EFI_STATUS

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
index 0cb49224ca..8f50ec859d 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
@@ -720,14 +720,13 @@ InitializeDiskIo (
   //

   // Install driver model protocol(s).

   //

-  Status = EfiLibInstallAllDriverProtocols (

+  Status = EfiLibInstallDriverBindingComponentName2 (

              ImageHandle,

              SystemTable,

              &gDiskIoDriverBinding,

              ImageHandle,

              &gDiskIoComponentName,

-             NULL,

-             NULL

+             &gDiskIoComponentName2

              );

   ASSERT_EFI_ERROR (Status);

 

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
index c1a572f846..f4fa28a420 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
@@ -45,8 +45,9 @@ typedef struct {
 //

 // Global Variables

 //

-extern EFI_DRIVER_BINDING_PROTOCOL  gDiskIoDriverBinding;

-extern EFI_COMPONENT_NAME_PROTOCOL  gDiskIoComponentName;

+extern EFI_DRIVER_BINDING_PROTOCOL   gDiskIoDriverBinding;

+extern EFI_COMPONENT_NAME_PROTOCOL   gDiskIoComponentName;

+extern EFI_COMPONENT_NAME2_PROTOCOL  gDiskIoComponentName2;

 

 //

 // Prototypes

@@ -103,6 +104,45 @@ DiskIoWriteDisk (
 //

 // EFI Component Name Functions

 //

+/**

+  Retrieves a Unicode string that is the user readable name of the driver.

+

+  This function retrieves the user readable name of a driver in the form of a

+  Unicode string. If the driver specified by This has a user readable name in

+  the language specified by Language, then a pointer to the driver name is

+  returned in DriverName, and EFI_SUCCESS is returned. If the driver specified

+  by This does not support the language specified by Language,

+  then EFI_UNSUPPORTED is returned.

+

+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or

+                                EFI_COMPONENT_NAME_PROTOCOL instance.

+

+  @param  Language[in]          A pointer to a Null-terminated ASCII string

+                                array indicating the language. This is the

+                                language of the driver name that the caller is

+                                requesting, and it must match one of the

+                                languages specified in SupportedLanguages. The

+                                number of languages supported by a driver is up

+                                to the driver writer. Language is specified

+                                in RFC 3066 or ISO 639-2 language code format.

+

+  @param  DriverName[out]       A pointer to the Unicode string to return.

+                                This Unicode string is the name of the

+                                driver specified by This in the language

+                                specified by Language.

+

+  @retval EFI_SUCCESS           The Unicode string for the Driver specified by

+                                This and the language specified by Language was

+                                returned in DriverName.

+

+  @retval EFI_INVALID_PARAMETER Language is NULL.

+

+  @retval EFI_INVALID_PARAMETER DriverName is NULL.

+

+  @retval EFI_UNSUPPORTED       The driver specified by This does not support

+                                the language specified by Language.

+

+**/

 EFI_STATUS

 EFIAPI

 DiskIoComponentNameGetDriverName (

@@ -111,6 +151,75 @@ DiskIoComponentNameGetDriverName (
   OUT CHAR16                       **DriverName

   );

 

+

+/**

+  Retrieves a Unicode string that is the user readable name of the controller

+  that is being managed by a driver.

+

+  This function retrieves the user readable name of the controller specified by

+  ControllerHandle and ChildHandle in the form of a Unicode string. If the

+  driver specified by This has a user readable name in the language specified by

+  Language, then a pointer to the controller name is returned in ControllerName,

+  and EFI_SUCCESS is returned.  If the driver specified by This is not currently

+  managing the controller specified by ControllerHandle and ChildHandle,

+  then EFI_UNSUPPORTED is returned.  If the driver specified by This does not

+  support the language specified by Language, then EFI_UNSUPPORTED is returned.

+

+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or

+                                EFI_COMPONENT_NAME_PROTOCOL instance.

+

+  @param  ControllerHandle[in]  The handle of a controller that the driver

+                                specified by This is managing.  This handle

+                                specifies the controller whose name is to be

+                                returned.

+

+  @param  ChildHandle[in]       The handle of the child controller to retrieve

+                                the name of.  This is an optional parameter that

+                                may be NULL.  It will be NULL for device

+                                drivers.  It will also be NULL for a bus drivers

+                                that wish to retrieve the name of the bus

+                                controller.  It will not be NULL for a bus

+                                driver that wishes to retrieve the name of a

+                                child controller.

+

+  @param  Language[in]          A pointer to a Null-terminated ASCII string

+                                array indicating the language.  This is the

+                                language of the driver name that the caller is

+                                requesting, and it must match one of the

+                                languages specified in SupportedLanguages. The

+                                number of languages supported by a driver is up

+                                to the driver writer. Language is specified in

+                                RFC 3066 or ISO 639-2 language code format.

+

+  @param  ControllerName[out]   A pointer to the Unicode string to return.

+                                This Unicode string is the name of the

+                                controller specified by ControllerHandle and

+                                ChildHandle in the language specified by

+                                Language from the point of view of the driver

+                                specified by This.

+

+  @retval EFI_SUCCESS           The Unicode string for the user readable name in

+                                the language specified by Language for the

+                                driver specified by This was returned in

+                                DriverName.

+

+  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE.

+

+  @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid

+                                EFI_HANDLE.

+

+  @retval EFI_INVALID_PARAMETER Language is NULL.

+

+  @retval EFI_INVALID_PARAMETER ControllerName is NULL.

+

+  @retval EFI_UNSUPPORTED       The driver specified by This is not currently

+                                managing the controller specified by

+                                ControllerHandle and ChildHandle.

+

+  @retval EFI_UNSUPPORTED       The driver specified by This does not support

+                                the language specified by Language.

+

+**/

 EFI_STATUS

 EFIAPI

 DiskIoComponentNameGetControllerName (

@@ -121,4 +230,5 @@ DiskIoComponentNameGetControllerName (
   OUT CHAR16                                          **ControllerName

   );

 

+

 #endif

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
index e922cb0f92..6daf8d8abb 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ComponentName.c
@@ -17,15 +17,25 @@
 //

 // EFI Component Name Protocol

 //

-EFI_COMPONENT_NAME_PROTOCOL     gPartitionComponentName = {

+EFI_COMPONENT_NAME_PROTOCOL  gPartitionComponentName = {

   PartitionComponentNameGetDriverName,

   PartitionComponentNameGetControllerName,

   "eng"

-};

+  };

+

+//

+// EFI Component Name 2 Protocol

+//

+EFI_COMPONENT_NAME2_PROTOCOL gPartitionComponentName2 = {

+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME) PartitionComponentNameGetDriverName,

+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) PartitionComponentNameGetControllerName,

+  "en"

+  };

+

 

 static EFI_UNICODE_STRING_TABLE mPartitionDriverNameTable[] = {

   {

-    "eng",

+    "eng;en",

     (CHAR16 *)L"Partition Driver(MBR/GPT/El Torito)"

   },

   {

@@ -37,39 +47,42 @@ static EFI_UNICODE_STRING_TABLE mPartitionDriverNameTable[] = {
 

 

 /**

-  Retrieves a Unicode string that is the user readable name of

-  the EFI Driver.

+  Retrieves a Unicode string that is the user readable name of the driver.

+

+  This function retrieves the user readable name of a driver in the form of a

+  Unicode string. If the driver specified by This has a user readable name in

+  the language specified by Language, then a pointer to the driver name is

+  returned in DriverName, and EFI_SUCCESS is returned. If the driver specified

+  by This does not support the language specified by Language,

+  then EFI_UNSUPPORTED is returned.

+

+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or

+                                EFI_COMPONENT_NAME_PROTOCOL instance.

+

+  @param  Language[in]          A pointer to a Null-terminated ASCII string

+                                array indicating the language. This is the

+                                language of the driver name that the caller is

+                                requesting, and it must match one of the

+                                languages specified in SupportedLanguages. The

+                                number of languages supported by a driver is up

+                                to the driver writer. Language is specified

+                                in RFC 3066 or ISO 639-2 language code format.

+

+  @param  DriverName[out]       A pointer to the Unicode string to return.

+                                This Unicode string is the name of the

+                                driver specified by This in the language

+                                specified by Language.

+

+  @retval EFI_SUCCESS           The Unicode string for the Driver specified by

+                                This and the language specified by Language was

+                                returned in DriverName.

 

-  @param  This       A pointer to the

-                     EFI_COMPONENT_NAME_PROTOCOL instance.

-  

-  @param  Language   A pointer to a Null-terminated ASCII string

-                     array indicating the language. This is the

-                     language of the driver name that the caller

-                     is requesting, and it must match one of the

-                     languages specified in SupportedLanguages.

-                     The number of languages supported by a

-                     driver is up to the driver writer. Language

-                     is specified in RFC 3066 language code

-                     format.

-  

-  @param  DriverName A pointer to the Unicode string to return.

-                     This Unicode string is the name of the

-                     driver specified by This in the language

-                     specified by Language.

-

-  @retval EFI_SUCCESS           The Unicode string for the

-                                Driver specified by This and the

-                                language specified by Language

-                                was returned in DriverName.

-  

   @retval EFI_INVALID_PARAMETER Language is NULL.

-  

+

   @retval EFI_INVALID_PARAMETER DriverName is NULL.

-  

-  @retval EFI_UNSUPPORTED       The driver specified by This

-                                does not support the language

-                                specified by Language.

+

+  @retval EFI_UNSUPPORTED       The driver specified by This does not support

+                                the language specified by Language.

 

 **/

 EFI_STATUS

@@ -80,83 +93,82 @@ PartitionComponentNameGetDriverName (
   OUT CHAR16                       **DriverName

   )

 {

-  return LookupUnicodeString (

-          Language,

-          gPartitionComponentName.SupportedLanguages,

-          mPartitionDriverNameTable,

-          DriverName

-          );

+  return LookupUnicodeString2 (

+           Language,

+           This->SupportedLanguages,

+           mPartitionDriverNameTable,

+           DriverName,

+           (BOOLEAN)(This == &gPartitionComponentName)

+           );

 }

 

 

 /**

-  Retrieves a Unicode string that is the user readable name of

-  the controller that is being managed by an EFI Driver.

-

-  @param  This             A pointer to the

-                           EFI_COMPONENT_NAME_PROTOCOL instance.

-

-  @param  ControllerHandle The handle of a controller that the

-                           driver specified by This is managing.

-                           This handle specifies the controller

-                           whose name is to be returned.

-

-  @param ChildHandle      The handle of the child controller to

-                           retrieve the name of.  This is an

-                           optional parameter that may be NULL.

-                           It will be NULL for device drivers.

-                           It will also be NULL for a bus

-                           drivers that wish to retrieve the

-                           name of the bus controller.  It will

-                           not be NULL for a bus driver that

-                           wishes to retrieve the name of a

-                           child controller.

-

-  @param  Language         A pointer to a Null-terminated ASCII

-                           string array indicating the language.

-                           This is the language of the driver

-                           name that the caller is requesting,

-                           and it must match one of the

-                           languages specified in

-                           SupportedLanguages. The number of

-                           languages supported by a driver is up

-                           to the driver writer. Language is

-                           specified in RFC 3066 language code

-                           format.

-

-  @param  ControllerName   A pointer to the Unicode string to

-                           return.  This Unicode string is the

-                           name of the controller specified by

-                           ControllerHandle and ChildHandle in

-                           the language specified by Language

-                           from the point of view of the driver

-                           specified by This.

-

-  @retval EFI_SUCCESS           The Unicode string for the user

-                                readable name in the language

-                                specified by Language for the

-                                driver specified by This was

-                                returned in DriverName.

-

-  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid

+  Retrieves a Unicode string that is the user readable name of the controller

+  that is being managed by a driver.

+

+  This function retrieves the user readable name of the controller specified by

+  ControllerHandle and ChildHandle in the form of a Unicode string. If the

+  driver specified by This has a user readable name in the language specified by

+  Language, then a pointer to the controller name is returned in ControllerName,

+  and EFI_SUCCESS is returned.  If the driver specified by This is not currently

+  managing the controller specified by ControllerHandle and ChildHandle,

+  then EFI_UNSUPPORTED is returned.  If the driver specified by This does not

+  support the language specified by Language, then EFI_UNSUPPORTED is returned.

+

+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or

+                                EFI_COMPONENT_NAME_PROTOCOL instance.

+

+  @param  ControllerHandle[in]  The handle of a controller that the driver

+                                specified by This is managing.  This handle

+                                specifies the controller whose name is to be

+                                returned.

+

+  @param  ChildHandle[in]       The handle of the child controller to retrieve

+                                the name of.  This is an optional parameter that

+                                may be NULL.  It will be NULL for device

+                                drivers.  It will also be NULL for a bus drivers

+                                that wish to retrieve the name of the bus

+                                controller.  It will not be NULL for a bus

+                                driver that wishes to retrieve the name of a

+                                child controller.

+

+  @param  Language[in]          A pointer to a Null-terminated ASCII string

+                                array indicating the language.  This is the

+                                language of the driver name that the caller is

+                                requesting, and it must match one of the

+                                languages specified in SupportedLanguages. The

+                                number of languages supported by a driver is up

+                                to the driver writer. Language is specified in

+                                RFC 3066 or ISO 639-2 language code format.

+

+  @param  ControllerName[out]   A pointer to the Unicode string to return.

+                                This Unicode string is the name of the

+                                controller specified by ControllerHandle and

+                                ChildHandle in the language specified by

+                                Language from the point of view of the driver

+                                specified by This.

+

+  @retval EFI_SUCCESS           The Unicode string for the user readable name in

+                                the language specified by Language for the

+                                driver specified by This was returned in

+                                DriverName.

+

+  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE.

+

+  @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid

                                 EFI_HANDLE.

 

-  @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it

-                                is not a valid EFI_HANDLE.

-

   @retval EFI_INVALID_PARAMETER Language is NULL.

 

   @retval EFI_INVALID_PARAMETER ControllerName is NULL.

 

-  @retval EFI_UNSUPPORTED       The driver specified by This is

-                                not currently managing the

-                                controller specified by

-                                ControllerHandle and

-                                ChildHandle.

+  @retval EFI_UNSUPPORTED       The driver specified by This is not currently

+                                managing the controller specified by

+                                ControllerHandle and ChildHandle.

 

-  @retval EFI_UNSUPPORTED       The driver specified by This

-                                does not support the language

-                                specified by Language.

+  @retval EFI_UNSUPPORTED       The driver specified by This does not support

+                                the language specified by Language.

 

 **/

 EFI_STATUS

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
index 4d0c76f251..b68c1db3e6 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
@@ -695,14 +695,13 @@ InitializePartition (
   //

   // Install driver model protocol(s).

   //

-  Status = EfiLibInstallAllDriverProtocols (

+  Status = EfiLibInstallDriverBindingComponentName2 (

              ImageHandle,

              SystemTable,

              &gPartitionDriverBinding,

              ImageHandle,

              &gPartitionComponentName,

-             NULL,

-             NULL

+             &gPartitionComponentName2

              );

   ASSERT_EFI_ERROR (Status);

 

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
index 570d0194b5..854020c104 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
@@ -65,8 +65,9 @@ typedef struct {
 //

 // Global Variables

 //

-extern EFI_DRIVER_BINDING_PROTOCOL  gPartitionDriverBinding;

-extern EFI_COMPONENT_NAME_PROTOCOL  gPartitionComponentName;

+extern EFI_DRIVER_BINDING_PROTOCOL   gPartitionDriverBinding;

+extern EFI_COMPONENT_NAME_PROTOCOL   gPartitionComponentName;

+extern EFI_COMPONENT_NAME2_PROTOCOL  gPartitionComponentName2;

 

 //

 // Extract INT32 from char array

@@ -115,6 +116,45 @@ PartitionDriverBindingStop (
 //

 // EFI Component Name Functions

 //

+/**

+  Retrieves a Unicode string that is the user readable name of the driver.

+

+  This function retrieves the user readable name of a driver in the form of a

+  Unicode string. If the driver specified by This has a user readable name in

+  the language specified by Language, then a pointer to the driver name is

+  returned in DriverName, and EFI_SUCCESS is returned. If the driver specified

+  by This does not support the language specified by Language,

+  then EFI_UNSUPPORTED is returned.

+

+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or

+                                EFI_COMPONENT_NAME_PROTOCOL instance.

+

+  @param  Language[in]          A pointer to a Null-terminated ASCII string

+                                array indicating the language. This is the

+                                language of the driver name that the caller is

+                                requesting, and it must match one of the

+                                languages specified in SupportedLanguages. The

+                                number of languages supported by a driver is up

+                                to the driver writer. Language is specified

+                                in RFC 3066 or ISO 639-2 language code format.

+

+  @param  DriverName[out]       A pointer to the Unicode string to return.

+                                This Unicode string is the name of the

+                                driver specified by This in the language

+                                specified by Language.

+

+  @retval EFI_SUCCESS           The Unicode string for the Driver specified by

+                                This and the language specified by Language was

+                                returned in DriverName.

+

+  @retval EFI_INVALID_PARAMETER Language is NULL.

+

+  @retval EFI_INVALID_PARAMETER DriverName is NULL.

+

+  @retval EFI_UNSUPPORTED       The driver specified by This does not support

+                                the language specified by Language.

+

+**/

 EFI_STATUS

 EFIAPI

 PartitionComponentNameGetDriverName (

@@ -123,6 +163,75 @@ PartitionComponentNameGetDriverName (
   OUT CHAR16                       **DriverName

   );

 

+

+/**

+  Retrieves a Unicode string that is the user readable name of the controller

+  that is being managed by a driver.

+

+  This function retrieves the user readable name of the controller specified by

+  ControllerHandle and ChildHandle in the form of a Unicode string. If the

+  driver specified by This has a user readable name in the language specified by

+  Language, then a pointer to the controller name is returned in ControllerName,

+  and EFI_SUCCESS is returned.  If the driver specified by This is not currently

+  managing the controller specified by ControllerHandle and ChildHandle,

+  then EFI_UNSUPPORTED is returned.  If the driver specified by This does not

+  support the language specified by Language, then EFI_UNSUPPORTED is returned.

+

+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or

+                                EFI_COMPONENT_NAME_PROTOCOL instance.

+

+  @param  ControllerHandle[in]  The handle of a controller that the driver

+                                specified by This is managing.  This handle

+                                specifies the controller whose name is to be

+                                returned.

+

+  @param  ChildHandle[in]       The handle of the child controller to retrieve

+                                the name of.  This is an optional parameter that

+                                may be NULL.  It will be NULL for device

+                                drivers.  It will also be NULL for a bus drivers

+                                that wish to retrieve the name of the bus

+                                controller.  It will not be NULL for a bus

+                                driver that wishes to retrieve the name of a

+                                child controller.

+

+  @param  Language[in]          A pointer to a Null-terminated ASCII string

+                                array indicating the language.  This is the

+                                language of the driver name that the caller is

+                                requesting, and it must match one of the

+                                languages specified in SupportedLanguages. The

+                                number of languages supported by a driver is up

+                                to the driver writer. Language is specified in

+                                RFC 3066 or ISO 639-2 language code format.

+

+  @param  ControllerName[out]   A pointer to the Unicode string to return.

+                                This Unicode string is the name of the

+                                controller specified by ControllerHandle and

+                                ChildHandle in the language specified by

+                                Language from the point of view of the driver

+                                specified by This.

+

+  @retval EFI_SUCCESS           The Unicode string for the user readable name in

+                                the language specified by Language for the

+                                driver specified by This was returned in

+                                DriverName.

+

+  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE.

+

+  @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid

+                                EFI_HANDLE.

+

+  @retval EFI_INVALID_PARAMETER Language is NULL.

+

+  @retval EFI_INVALID_PARAMETER ControllerName is NULL.

+

+  @retval EFI_UNSUPPORTED       The driver specified by This is not currently

+                                managing the controller specified by

+                                ControllerHandle and ChildHandle.

+

+  @retval EFI_UNSUPPORTED       The driver specified by This does not support

+                                the language specified by Language.

+

+**/

 EFI_STATUS

 EFIAPI

 PartitionComponentNameGetControllerName (

@@ -133,6 +242,7 @@ PartitionComponentNameGetControllerName (
   OUT CHAR16                                          **ControllerName

   );

 

+

 EFI_STATUS

 PartitionInstallChildHandle (

   IN  EFI_DRIVER_BINDING_PROTOCOL  *This,