Clean up the private GUID definition in module Level.

[mirror_edk2.git] / SecurityPkg / UserIdentification / UsbCredentialProviderDxe / UsbCredentialProvider.c

diff --git a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
index 2b79354fbd9805f9b3e5925100b04ec7d6e245b1..726e61c3b1f1dd7722e560e53b58cf08cd0f6793 100644 (file)
--- a/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
+++ b/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
@@ -18,34 +18,6 @@ CREDENTIAL_TABLE            *mUsbTable       = NULL;
 USB_PROVIDER_CALLBACK_INFO  *mCallbackInfo   = NULL;\r
 USB_CREDENTIAL_INFO         *mUsbInfoHandle  = NULL;\r
 \r
-//\r
-// Used for save password credential and form browser\r
-// And used as provider identifier\r
-//\r
-EFI_GUID     mUsbCredentialGuid = USB_CREDENTIAL_PROVIDER_GUID;\r
-\r
-HII_VENDOR_DEVICE_PATH      mHiiVendorDevicePath = {\r
-  {\r
-    {\r
-      HARDWARE_DEVICE_PATH,\r
-      HW_VENDOR_DP,\r
-      {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
-      }\r
-    },\r
-    { 0x9463f883, 0x48f6, 0x4a7a, { 0x97, 0x2d, 0x9f, 0x8f, 0x38, 0xf2, 0xdd, 0x91 } }\r
-  },\r
-  {\r
-    END_DEVICE_PATH_TYPE,\r
-    END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
-    {\r
-      (UINT8) (END_DEVICE_PATH_LENGTH),\r
-      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
-    }\r
-  }\r
-};\r
-\r
 EFI_USER_CREDENTIAL_PROTOCOL  gUsbCredentialProviderDriver = {\r
   USB_CREDENTIAL_PROVIDER_GUID,\r
   EFI_USER_CREDENTIAL_CLASS_SECURE_CARD,\r
@@ -180,7 +152,7 @@ ModifyTable (
   //\r
   Status = gRT->SetVariable (\r
                   L"UsbCredential",\r
-                  &mUsbCredentialGuid,\r
+                  &gUsbCredentialProviderGuid,\r
                   EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,\r
                   mUsbTable->Count * sizeof (USB_INFO),\r
                   &mUsbTable->UserInfo\r
@@ -212,7 +184,7 @@ InitCredentialTable (
   Var     = NULL;\r
   Status  = gRT->GetVariable (\r
                    L"UsbCredential", \r
-                   &mUsbCredentialGuid, \r
+                   &gUsbCredentialProviderGuid, \r
                    NULL, \r
                    &VarSize,\r
                    Var\r
@@ -224,7 +196,7 @@ InitCredentialTable (
     }\r
     Status = gRT->GetVariable (\r
                     L"UsbCredential", \r
-                    &mUsbCredentialGuid, \r
+                    &gUsbCredentialProviderGuid, \r
                     NULL, \r
                     &VarSize,\r
                     Var\r
@@ -647,7 +619,7 @@ InitFormBrowser (
   // Publish HII data.\r
   //\r
   CallbackInfo->HiiHandle = HiiAddPackages (\r
-                              &mUsbCredentialGuid,\r
+                              &gUsbCredentialProviderGuid,\r
                               CallbackInfo->DriverHandle,\r
                               UsbCredentialProviderStrings,\r
                               NULL\r
@@ -1249,8 +1221,8 @@ CredentialGetNextInfo (
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_RECORD;\r
     Info->InfoSize    = (UINT32) InfoLen;\r
     Info->InfoAttribs = EFI_USER_INFO_PROTECTED;\r
-    CopyGuid (&Info->Credential, &mUsbCredentialGuid);\r
-    CopyGuid ((EFI_GUID *)(Info + 1), &mUsbCredentialGuid);\r
+    CopyGuid (&Info->Credential, &gUsbCredentialProviderGuid);\r
+    CopyGuid ((EFI_GUID *)(Info + 1), &gUsbCredentialProviderGuid);\r
     \r
     mUsbInfoHandle->Info[0] = Info;\r
     mUsbInfoHandle->Count++;\r
@@ -1267,7 +1239,7 @@ CredentialGetNextInfo (
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD;\r
     Info->InfoSize    = (UINT32) InfoLen;\r
     Info->InfoAttribs = EFI_USER_INFO_PROTECTED;\r
-    CopyGuid (&Info->Credential, &mUsbCredentialGuid);\r
+    CopyGuid (&Info->Credential, &gUsbCredentialProviderGuid);\r
     CopyMem ((UINT8*)(Info + 1), ProvNameStr, ProvStrLen);\r
     FreePool (ProvNameStr);\r
     \r
@@ -1284,7 +1256,7 @@ CredentialGetNextInfo (
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_TYPE_RECORD;\r
     Info->InfoSize    = (UINT32) InfoLen;\r
     Info->InfoAttribs = EFI_USER_INFO_PROTECTED;\r
-    CopyGuid (&Info->Credential, &mUsbCredentialGuid);\r
+    CopyGuid (&Info->Credential, &gUsbCredentialProviderGuid);\r
     CopyGuid ((EFI_GUID *)(Info + 1), &gEfiUserCredentialClassSecureCardGuid);\r
     \r
     mUsbInfoHandle->Info[2] = Info;\r
@@ -1302,7 +1274,7 @@ CredentialGetNextInfo (
     Info->InfoType    = EFI_USER_INFO_CREDENTIAL_PROVIDER_NAME_RECORD;\r
     Info->InfoSize    = (UINT32) InfoLen;\r
     Info->InfoAttribs = EFI_USER_INFO_PROTECTED;\r
-    CopyGuid (&Info->Credential, &mUsbCredentialGuid);\r
+    CopyGuid (&Info->Credential, &gUsbCredentialProviderGuid);\r
     CopyMem ((UINT8*)(Info + 1), ProvNameStr, ProvStrLen);\r
     FreePool (ProvNameStr);\r
     \r