Fix name conflict between User Credential protocol and User Credential2 protocol.

Signed-off-by: gdong1
Reviewed-by: lgao4
Reviewed-by: tye

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12570 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
gdong1 2011-10-26 02:37:55 +00:00
parent 15e329df65
commit 042a73f51b
1 changed files with 22 additions and 22 deletions

View File

@ -46,7 +46,7 @@ typedef struct _EFI_USER_CREDENTIAL2_PROTOCOL EFI_USER_CREDENTIAL2_PROTOCOL;
**/
typedef
EFI_STATUS
(EFIAPI *EFI_CREDENTIAL_ENROLL)(
(EFIAPI *EFI_CREDENTIAL2_ENROLL)(
IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_PROFILE_HANDLE User
);
@ -73,7 +73,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *EFI_CREDENTIAL_FORM)(
(EFIAPI *EFI_CREDENTIAL2_FORM)(
IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_HII_HANDLE *Hii,
OUT EFI_GUID *FormSetId,
@ -102,7 +102,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *EFI_CREDENTIAL_TILE)(
(EFIAPI *EFI_CREDENTIAL2_TILE)(
IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN OUT UINTN *Width,
IN OUT UINTN *Height,
@ -126,7 +126,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *EFI_CREDENTIAL_TITLE)(
(EFIAPI *EFI_CREDENTIAL2_TITLE)(
IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_HII_HANDLE *Hii,
OUT EFI_STRING_ID *String
@ -154,7 +154,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *EFI_CREDENTIAL_USER)(
(EFIAPI *EFI_CREDENTIAL2_USER)(
IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_PROFILE_HANDLE User,
OUT EFI_USER_INFO_IDENTIFIER *Identifier
@ -175,7 +175,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *EFI_CREDENTIAL_SELECT)(
(EFIAPI *EFI_CREDENTIAL2_SELECT)(
IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_CREDENTIAL_LOGON_FLAGS *AutoLogon
);
@ -191,7 +191,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *EFI_CREDENTIAL_DESELECT)(
(EFIAPI *EFI_CREDENTIAL2_DESELECT)(
IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This
);
@ -209,7 +209,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *EFI_CREDENTIAL_DEFAULT)(
(EFIAPI *EFI_CREDENTIAL2_DEFAULT)(
IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
OUT EFI_CREDENTIAL_LOGON_FLAGS *AutoLogon
);
@ -236,7 +236,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *EFI_CREDENTIAL_GET_INFO)(
(EFIAPI *EFI_CREDENTIAL2_GET_INFO)(
IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_INFO_HANDLE UserInfo,
OUT EFI_USER_INFO *Info,
@ -261,7 +261,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *EFI_CREDENTIAL_GET_NEXT_INFO)(
(EFIAPI *EFI_CREDENTIAL2_GET_NEXT_INFO)(
IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN OUT EFI_USER_INFO_HANDLE *UserInfo
);
@ -284,7 +284,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *EFI_CREDENTIAL_DELETE)(
(EFIAPI *EFI_CREDENTIAL2_DELETE)(
IN CONST EFI_USER_CREDENTIAL2_PROTOCOL *This,
IN EFI_USER_PROFILE_HANDLE User
);
@ -295,18 +295,18 @@ EFI_STATUS
struct _EFI_USER_CREDENTIAL2_PROTOCOL {
EFI_GUID Identifier; ///< Uniquely identifies this credential provider.
EFI_GUID Type; ///< Identifies this class of User Credential Provider.
EFI_CREDENTIAL_ENROLL Enroll;
EFI_CREDENTIAL_FORM Form;
EFI_CREDENTIAL_TILE Tile;
EFI_CREDENTIAL_TITLE Title;
EFI_CREDENTIAL_USER User;
EFI_CREDENTIAL_SELECT Select;
EFI_CREDENTIAL_DESELECT Deselect;
EFI_CREDENTIAL_DEFAULT Default;
EFI_CREDENTIAL_GET_INFO GetInfo;
EFI_CREDENTIAL_GET_NEXT_INFO GetNextInfo;
EFI_CREDENTIAL2_ENROLL Enroll;
EFI_CREDENTIAL2_FORM Form;
EFI_CREDENTIAL2_TILE Tile;
EFI_CREDENTIAL2_TITLE Title;
EFI_CREDENTIAL2_USER User;
EFI_CREDENTIAL2_SELECT Select;
EFI_CREDENTIAL2_DESELECT Deselect;
EFI_CREDENTIAL2_DEFAULT Default;
EFI_CREDENTIAL2_GET_INFO GetInfo;
EFI_CREDENTIAL2_GET_NEXT_INFO GetNextInfo;
EFI_CREDENTIAL_CAPABILITIES Capabilities;
EFI_CREDENTIAL_DELETE Delete;
EFI_CREDENTIAL2_DELETE Delete;
};
extern EFI_GUID gEfiUserCredential2ProtocolGuid;