X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FInclude%2FProtocol%2FUnicodeCollation.h;h=4efa515d0862ccfeda0589438469d9ab6f1dac8e;hb=dc1930464652492932d3f698a258248d7c409927;hp=e0278038f776ad1717017b635c5e89a8aecd09e6;hpb=d1f950002362305fcd4c30f108ef7b76679f5843;p=mirror_edk2.git

diff --git a/MdePkg/Include/Protocol/UnicodeCollation.h b/MdePkg/Include/Protocol/UnicodeCollation.h
index e0278038f7..4efa515d08 100644
--- a/MdePkg/Include/Protocol/UnicodeCollation.h
+++ b/MdePkg/Include/Protocol/UnicodeCollation.h
@@ -1,7 +1,9 @@
 /** @file
-  Unicode Collation protocol that follows the EFI 1.0 specification.
+  Unicode Collation protocol that follows the UEFI 2.0 specification.
+  This protocol is used to allow code running in the boot services environment 
+  to perform lexical comparison functions on Unicode strings for given languages.
 
-  Copyright (c) 2006, Intel Corporation                                                         
+  Copyright (c) 2006 - 2008, Intel Corporation                                                         
   All rights reserved. This program and the accompanying materials                          
   are licensed and made available under the terms and conditions of the BSD License         
   which accompanies this distribution.  The full text of the license may be found at        
@@ -10,8 +12,6 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-  Module Name:  UnicodeCollation.h
-
 **/
 
 #ifndef __UNICODE_COLLATION_H__
@@ -22,11 +22,27 @@
     0x1d85cd7f, 0xf43d, 0x11d2, {0x9a, 0xc, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
   }
 
-typedef struct _EFI_UNICODE_COLLATION_PROTOCOL   EFI_UNICODE_COLLATION_PROTOCOL;
+#define EFI_UNICODE_COLLATION_PROTOCOL2_GUID \
+  { \
+    0xa4c751fc, 0x23ae, 0x4c3e, {0x92, 0xe9, 0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 } \
+  }
 
-//
-// Protocol data structures and defines
-//
+typedef struct _EFI_UNICODE_COLLATION_PROTOCOL  EFI_UNICODE_COLLATION_PROTOCOL;
+
+
+///
+/// Protocol GUID name defined in EFI1.1.
+/// 
+#define UNICODE_COLLATION_PROTOCOL              EFI_UNICODE_COLLATION_PROTOCOL_GUID
+
+///
+/// Protocol defined in EFI1.1.
+/// 
+typedef EFI_UNICODE_COLLATION_PROTOCOL          UNICODE_COLLATION_INTERFACE;
+
+///
+/// Protocol data structures and defines
+///
 #define EFI_UNICODE_BYTE_ORDER_MARK (CHAR16) (0xfeff)
 
 //
@@ -47,12 +63,11 @@ typedef struct _EFI_UNICODE_COLLATION_PROTOCOL   EFI_UNICODE_COLLATION_PROTOCOL;
 **/
 typedef
 INTN
-(EFIAPI *EFI_UNICODE_COLLATION_STRICOLL) (
+(EFIAPI *EFI_UNICODE_COLLATION_STRICOLL)(
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,
   IN CHAR16                                 *Str1,
   IN CHAR16                                 *Str2
-  )
-;
+  );
 
 /**
   Performs a case-insensitive comparison of a Null-terminated Unicode 
@@ -68,12 +83,11 @@ INTN
 **/
 typedef
 BOOLEAN
-(EFIAPI *EFI_UNICODE_COLLATION_METAIMATCH) (
+(EFIAPI *EFI_UNICODE_COLLATION_METAIMATCH)(
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,
   IN CHAR16                                 *String,
   IN CHAR16                                 *Pattern
-  )
-;
+  );
 
 /**
   Converts all the Unicode characters in a Null-terminated Unicode string to 
@@ -82,16 +96,13 @@ BOOLEAN
   @param  This   Protocol instance pointer.
   @param  String A pointer to a Null-terminated Unicode string.
 
-  NONE
-
 **/
 typedef
 VOID
-(EFIAPI *EFI_UNICODE_COLLATION_STRLWR) (
+(EFIAPI *EFI_UNICODE_COLLATION_STRLWR)(
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,
   IN OUT CHAR16                             *Str
-  )
-;
+  );
 
 /**
   Converts all the Unicode characters in a Null-terminated Unicode string to upper
@@ -100,16 +111,13 @@ VOID
   @param  This   Protocol instance pointer.
   @param  String A pointer to a Null-terminated Unicode string.
 
-  NONE
-
 **/
 typedef
 VOID
-(EFIAPI *EFI_UNICODE_COLLATION_STRUPR) (
+(EFIAPI *EFI_UNICODE_COLLATION_STRUPR)(
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,
   IN OUT CHAR16                             *Str
-  )
-;
+  );
 
 /**
   Converts an 8.3 FAT file name in an OEM character set to a Null-terminated 
@@ -122,18 +130,15 @@ VOID
   @param  String  A pointer to a Null-terminated Unicode string. The string must
                   be preallocated to hold FatSize Unicode characters.
 
-  NONE
-
 **/
 typedef
 VOID
-(EFIAPI *EFI_UNICODE_COLLATION_FATTOSTR) (
+(EFIAPI *EFI_UNICODE_COLLATION_FATTOSTR)(
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,
   IN UINTN                                  FatSize,
   IN CHAR8                                  *Fat,
   OUT CHAR16                                *String
-  )
-;
+  );
 
 /**
   Converts a Null-terminated Unicode string to legal characters in a FAT 
@@ -152,18 +157,18 @@ VOID
 **/
 typedef
 BOOLEAN
-(EFIAPI *EFI_UNICODE_COLLATION_STRTOFAT) (
+(EFIAPI *EFI_UNICODE_COLLATION_STRTOFAT)(
   IN EFI_UNICODE_COLLATION_PROTOCOL         *This,
   IN CHAR16                                 *String,
   IN UINTN                                  FatSize,
   OUT CHAR8                                 *Fat
-  )
-;
+  );
 
+///
+/// The EFI_UNICODE_COLLATION_PROTOCOL is used to perform case-insensitive 
+/// comparisons of Unicode strings. 
+///
 struct _EFI_UNICODE_COLLATION_PROTOCOL {
-  //
-  // general
-  //
   EFI_UNICODE_COLLATION_STRICOLL    StriColl;
   EFI_UNICODE_COLLATION_METAIMATCH  MetaiMatch;
   EFI_UNICODE_COLLATION_STRLWR      StrLwr;
@@ -174,10 +179,15 @@ struct _EFI_UNICODE_COLLATION_PROTOCOL {
   //
   EFI_UNICODE_COLLATION_FATTOSTR    FatToStr;
   EFI_UNICODE_COLLATION_STRTOFAT    StrToFat;
-
+  
+  ///
+  /// A Null-terminated ASCII string array that contains one or more 
+  /// language codes. This array is specified in RFC 4646 format.
+  ///
   CHAR8                             *SupportedLanguages;
 };
 
 extern EFI_GUID gEfiUnicodeCollationProtocolGuid;
+extern EFI_GUID gEfiUnicodeCollation2ProtocolGuid;
 
 #endif