/** @file\r
- Unicode Collation protocol that follows the EFI 1.0 specification.\r
+ Unicode Collation protocol that follows the UEFI 2.0 specification.\r
\r
Copyright (c) 2006, Intel Corporation \r
All rights reserved. This program and the accompanying materials \r
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
\r
- Module Name: UnicodeCollation.h\r
-\r
**/\r
\r
#ifndef __UNICODE_COLLATION_H__\r
0x1d85cd7f, 0xf43d, 0x11d2, {0x9a, 0xc, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\r
}\r
\r
-typedef struct _EFI_UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL;\r
+#define EFI_UNICODE_COLLATION_PROTOCOL2_GUID \\r
+ { \\r
+ 0xa4c751fc, 0x23ae, 0x4c3e, {0x92, 0xe9, 0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 } \\r
+ }\r
+\r
+typedef struct _EFI_UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL;\r
+\r
+\r
+//\r
+// Protocol GUID name defined in EFI1.1.\r
+// \r
+#define UNICODE_COLLATION_PROTOCOL EFI_UNICODE_COLLATION_PROTOCOL_GUID\r
+\r
+//\r
+// Protocol defined in EFI1.1.\r
+// \r
+typedef EFI_UNICODE_COLLATION_PROTOCOL UNICODE_COLLATION_INTERFACE;\r
\r
//\r
// Protocol data structures and defines\r
**/\r
typedef\r
INTN\r
-(EFIAPI *EFI_UNICODE_COLLATION_STRICOLL) (\r
+(EFIAPI *EFI_UNICODE_COLLATION_STRICOLL)(\r
IN EFI_UNICODE_COLLATION_PROTOCOL *This,\r
IN CHAR16 *Str1,\r
IN CHAR16 *Str2\r
**/\r
typedef\r
BOOLEAN\r
-(EFIAPI *EFI_UNICODE_COLLATION_METAIMATCH) (\r
+(EFIAPI *EFI_UNICODE_COLLATION_METAIMATCH)(\r
IN EFI_UNICODE_COLLATION_PROTOCOL *This,\r
IN CHAR16 *String,\r
IN CHAR16 *Pattern\r
**/\r
typedef\r
VOID\r
-(EFIAPI *EFI_UNICODE_COLLATION_STRLWR) (\r
+(EFIAPI *EFI_UNICODE_COLLATION_STRLWR)(\r
IN EFI_UNICODE_COLLATION_PROTOCOL *This,\r
IN OUT CHAR16 *Str\r
)\r
**/\r
typedef\r
VOID\r
-(EFIAPI *EFI_UNICODE_COLLATION_STRUPR) (\r
+(EFIAPI *EFI_UNICODE_COLLATION_STRUPR)(\r
IN EFI_UNICODE_COLLATION_PROTOCOL *This,\r
IN OUT CHAR16 *Str\r
)\r
**/\r
typedef\r
VOID\r
-(EFIAPI *EFI_UNICODE_COLLATION_FATTOSTR) (\r
+(EFIAPI *EFI_UNICODE_COLLATION_FATTOSTR)(\r
IN EFI_UNICODE_COLLATION_PROTOCOL *This,\r
IN UINTN FatSize,\r
IN CHAR8 *Fat,\r
**/\r
typedef\r
BOOLEAN\r
-(EFIAPI *EFI_UNICODE_COLLATION_STRTOFAT) (\r
+(EFIAPI *EFI_UNICODE_COLLATION_STRTOFAT)(\r
IN EFI_UNICODE_COLLATION_PROTOCOL *This,\r
IN CHAR16 *String,\r
IN UINTN FatSize,\r
};\r
\r
extern EFI_GUID gEfiUnicodeCollationProtocolGuid;\r
+extern EFI_GUID gEfiUnicodeCollation2ProtocolGuid;\r
\r
#endif\r