Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Efi / Protocol / ComponentName2 / ComponentName2.h

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName2/ComponentName2.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName2/ComponentName2.h
index 6a3a42bd9df8d2fc2de57ffa984760429c6f0c57..19c6d5a09d2f2ae97acdef18064bceb2026b2d9e 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName2/ComponentName2.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName2/ComponentName2.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -50,12 +50,13 @@ EFI_STATUS
     Retrieves a Unicode string that is the user readable name of the EFI Driver.\r
 \r
   Arguments:\r
-    This       - A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.\r
-    Language   - A pointer to a three character ISO 639-2 language identifier.\r
-                 This is the language of the driver name that that the caller \r
-                 is requesting, and it must match one of the languages specified\r
-                 in SupportedLanguages.  The number of languages supported by a \r
-                 driver is up to the driver writer.\r
+    This       - A pointer to the EFI_COMPONENT_NAME2_PROTOCOL instance.\r
+    Language   - A pointer to a Null-terminated ASCII string array indicating the \r
+                 language.  This is the language of the driver name that the caller \r
+                 is requesting, and it must match one of the languages specified in \r
+                 SupportedLanguages. The number of languages supported by a \r
+                 driver is up to the driver writer.  Language is specified in RFC \r
+                 4646 language code format.\r
     DriverName - A pointer to the Unicode string to return.  This Unicode string\r
                  is the name of the driver specified by This in the language \r
                  specified by Language.\r
@@ -86,7 +87,7 @@ EFI_STATUS
     that is being managed by an EFI Driver.\r
 \r
   Arguments:\r
-    This             - A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.\r
+    This             - A pointer to the EFI_COMPONENT_NAME2_PROTOCOL instance.\r
     ControllerHandle - The handle of a controller that the driver specified by \r
                        This is managing.  This handle specifies the controller \r
                        whose name is to be returned.\r
@@ -96,12 +97,12 @@ EFI_STATUS
                        for a bus drivers that wish to retrieve the name of the \r
                        bus controller.  It will not be NULL for a bus driver \r
                        that wishes to retrieve the name of a child controller.\r
-    Language         - A pointer to a three character ISO 639-2 language \r
-                       identifier.  This is the language of the controller name \r
-                       that that the caller is requesting, and it must match one\r
-                       of the languages specified in SupportedLanguages.  The \r
-                       number of languages supported by a driver is up to the \r
-                       driver writer.\r
+    Language         - A pointer to a Null-terminated ASCII string array indicating the \r
+                       language.  This is the language of the driver name that the caller \r
+                       is requesting, and it must match one of the languages specified in \r
+                       SupportedLanguages. The number of languages supported by a \r
+                       driver is up to the driver writer.  Language is specified in RFC \r
+                       4646 language code format.\r
     ControllerName   - A pointer to the Unicode string to return.  This Unicode\r
                        string is the name of the controller specified by \r
                        ControllerHandle and ChildHandle in the language specified\r