SecurityPkg OpalPasswordDxe: Check BlockSid capability before send command.

[mirror_edk2.git] / SecurityPkg / Tcg / Opal / OpalPasswordDxe / OpalHii.c

diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
index 75ff9fcfff91029398347f926fc8d41691f4c8a9..3fb3553f27f807debdc07f6aad5fe1ddf46e18ac 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
+++ b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
@@ -107,43 +107,6 @@ HiiSetCurrentConfiguration(
   }\r
 }\r
 \r
-/**\r
-  Check that all required protocols for HII are available.\r
-\r
-  @retval  EFI_SUCCESS        All required protocols are installed.\r
-  @retval  EFI_NOT_FOUND      One or more protocol are not installed.\r
-**/\r
-EFI_STATUS\r
-HiiCheckForRequiredProtocols (\r
-  VOID\r
-  )\r
-{\r
-  VOID*       TempProtocol;\r
-  EFI_STATUS  Status;\r
-\r
-  Status = gBS->LocateProtocol(&gEfiHiiStringProtocolGuid, NULL, (VOID**)&TempProtocol );\r
-  if (EFI_ERROR (Status)) {\r
-    return EFI_NOT_FOUND;\r
-  }\r
-\r
-  Status = gBS->LocateProtocol(&gEfiHiiDatabaseProtocolGuid, NULL, (VOID**)&TempProtocol );\r
-  if (EFI_ERROR (Status)) {\r
-    return EFI_NOT_FOUND;\r
-  }\r
-\r
-  Status = gBS->LocateProtocol(&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID**)&TempProtocol );\r
-  if (EFI_ERROR (Status)) {\r
-    return EFI_NOT_FOUND;\r
-  }\r
-\r
-  Status = gBS->LocateProtocol(&gEfiFormBrowser2ProtocolGuid, NULL, (VOID**)&TempProtocol );\r
-  if (EFI_ERROR (Status)) {\r
-    return EFI_NOT_FOUND;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
 /**\r
   Install the HII related resources.\r
 \r
@@ -158,15 +121,6 @@ HiiInstall(
   EFI_STATUS                   Status;\r
   EFI_HANDLE                   DriverHandle;\r
 \r
-  //\r
-  // Check that all required protocols are available for HII.\r
-  // If not, fail the install\r
-  //\r
-  Status = HiiCheckForRequiredProtocols();\r
-  if (EFI_ERROR(Status)) {\r
-    return Status;\r
-  }\r
-\r
   //\r
   // Clear the global configuration.\r
   //\r
@@ -510,9 +464,6 @@ DriverCallback(
 \r
       case HII_KEY_ID_ENTER_PASSWORD:\r
         return HiiPasswordEntered(Value->string);\r
-\r
-      case HII_KEY_ID_BLOCKSID:\r
-        return HiiSetBlockSid(Value->b);\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
     switch (HiiKeyId) {\r
@@ -520,6 +471,11 @@ DriverCallback(
         HiiPsidRevert();\r
         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
         return EFI_SUCCESS;\r
+\r
+      case HII_KEY_ID_BLOCKSID:\r
+        HiiSetBlockSid(Value->b);\r
+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+        return EFI_SUCCESS;\r
     }\r
   }\r
 \r
@@ -607,7 +563,6 @@ HiiPopulateDiskInfoForm(
         gHiiConfiguration.SelectedDiskAvailableActions |= (AvailActions.UserPass == 1) ? HII_ACTION_SET_USER_PWD : HII_ACTION_NONE;\r
         gHiiConfiguration.SelectedDiskAvailableActions |= (AvailActions.SecureErase == 1) ? HII_ACTION_SECURE_ERASE : HII_ACTION_NONE;\r
         gHiiConfiguration.SelectedDiskAvailableActions |= (AvailActions.DisableUser == 1) ? HII_ACTION_DISABLE_USER : HII_ACTION_NONE;\r
-        gHiiConfiguration.SelectedDiskAvailableActions |= HII_ACTION_ENABLE_BLOCKSID;\r
 \r
         HiiSetFormString (STRING_TOKEN(STR_DISK_INFO_PSID_REVERT), "PSID Revert to factory default and Disable");\r
 \r