SecurityPkg OpalPasswordDxe: Change BlockSid position.

The BlockSid feature is a global level feature instead
of device level feature. So move the menu from device page
to the main page.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
index 0a4453a356e8d0408b4457bdc30e58f5714b2da3..3fb3553f27f807debdc07f6aad5fe1ddf46e18ac 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
+++ b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
@@ -464,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
@@ -474,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
@@ -561,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

diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormValues.h b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormValues.h
index 50ad4eebcf033888758f29e225e5470cfdbae5a1..138bcb89358653bc6490287a8aba2af4c7750696 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormValues.h
+++ b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormValues.h
@@ -55,7 +55,6 @@ typedef struct {
 #define HII_ACTION_REVERT                                      0x0080\r
 #define HII_ACTION_DISABLE_FEATURE                             0x0100\r
 #define HII_ACTION_ENABLE_FEATURE                              0x0200\r
-#define HII_ACTION_ENABLE_BLOCKSID                             0x0400\r
 \r
 /* Flags for diskActionAvailableFields */\r
 #define HII_FIELD_PASSWORD                      0x0001\r

diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr
index 9c35ec76ab50e661ed5dd82a6885c2d6ee9f96e1..88cc2a1c4e989826ed0a1cabd35618cf7393d144 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr
+++ b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr
@@ -116,6 +116,17 @@ form formid = FORMID_VALUE_MAIN_MENU,
             text    = STRING_TOKEN(STR_MAIN_NO_DISKS_PRESENT_LBL);\r
     endif;\r
 \r
+    subtitle text = STRING_TOKEN(STR_NULL);\r
+\r
+    oneof varid   = OpalHiiConfig.EnableBlockSid,\r
+      questionid  = 0x8017, // 32791,\r
+      prompt      = STRING_TOKEN(STR_DISK_INFO_ENABLE_BLOCKSID),\r
+      help        = STRING_TOKEN(STR_DISK_INFO_GOTO_ENABLE_BLOCKSID_HELP),\r
+      flags       = INTERACTIVE,\r
+      option text = STRING_TOKEN(STR_DISABLED), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
+      option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = RESET_REQUIRED;\r
+    endoneof;\r
+\r
 endform;  // MAIN MENU FORM\r
 \r
 //\r
@@ -219,17 +230,6 @@ form formid = FORMID_VALUE_DISK_INFO_FORM_MAIN,
             key     = 0x800A; //32778;\r
     endif;\r
 \r
-    suppressif ( questionref(SelectedDiskAvailableActions) & HII_ACTION_ENABLE_BLOCKSID ) == 0;\r
-      oneof varid   = OpalHiiConfig.EnableBlockSid,\r
-        questionid  = 0x8017, // 32791,\r
-        prompt      = STRING_TOKEN(STR_DISK_INFO_ENABLE_BLOCKSID),\r
-        help        = STRING_TOKEN(STR_DISK_INFO_GOTO_ENABLE_BLOCKSID_HELP),\r
-        flags   = INTERACTIVE,\r
-        option text = STRING_TOKEN(STR_DISABLED), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
-        option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = RESET_REQUIRED;\r
-      endoneof;\r
-    endif;\r
-\r
 endform;  // DISK INFO FORM\r
 \r
 //\r