The BlockSid feature is a global level feature instead of device level feature. So move the menu from device page to the main page.
Cc: Feng Tian <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong <[email protected]> --- SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c | 9 +++++---- .../Tcg/Opal/OpalPasswordDxe/OpalHiiFormValues.h | 1 - .../Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c index 0a4453a..3fb3553 100644 --- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c +++ b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c @@ -464,9 +464,6 @@ DriverCallback( case HII_KEY_ID_ENTER_PASSWORD: return HiiPasswordEntered(Value->string); - - case HII_KEY_ID_BLOCKSID: - return HiiSetBlockSid(Value->b); } } else if (Action == EFI_BROWSER_ACTION_CHANGED) { switch (HiiKeyId) { @@ -474,6 +471,11 @@ DriverCallback( HiiPsidRevert(); *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY; return EFI_SUCCESS; + + case HII_KEY_ID_BLOCKSID: + HiiSetBlockSid(Value->b); + *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY; + return EFI_SUCCESS; } } @@ -561,7 +563,6 @@ HiiPopulateDiskInfoForm( gHiiConfiguration.SelectedDiskAvailableActions |= (AvailActions.UserPass == 1) ? HII_ACTION_SET_USER_PWD : HII_ACTION_NONE; gHiiConfiguration.SelectedDiskAvailableActions |= (AvailActions.SecureErase == 1) ? HII_ACTION_SECURE_ERASE : HII_ACTION_NONE; gHiiConfiguration.SelectedDiskAvailableActions |= (AvailActions.DisableUser == 1) ? HII_ACTION_DISABLE_USER : HII_ACTION_NONE; - gHiiConfiguration.SelectedDiskAvailableActions |= HII_ACTION_ENABLE_BLOCKSID; HiiSetFormString (STRING_TOKEN(STR_DISK_INFO_PSID_REVERT), "PSID Revert to factory default and Disable"); diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormValues.h b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHiiFormValues.h index 50ad4ee..138bcb8 100644 --- 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 #define HII_ACTION_DISABLE_FEATURE 0x0100 #define HII_ACTION_ENABLE_FEATURE 0x0200 -#define HII_ACTION_ENABLE_BLOCKSID 0x0400 /* Flags for diskActionAvailableFields */ #define HII_FIELD_PASSWORD 0x0001 diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalPasswordForm.vfr index 9c35ec7..88cc2a1 100644 --- 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); endif; + subtitle text = STRING_TOKEN(STR_NULL); + + oneof varid = OpalHiiConfig.EnableBlockSid, + questionid = 0x8017, // 32791, + prompt = STRING_TOKEN(STR_DISK_INFO_ENABLE_BLOCKSID), + help = STRING_TOKEN(STR_DISK_INFO_GOTO_ENABLE_BLOCKSID_HELP), + flags = INTERACTIVE, + option text = STRING_TOKEN(STR_DISABLED), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED; + option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = RESET_REQUIRED; + endoneof; + endform; // MAIN MENU FORM // @@ -219,17 +230,6 @@ form formid = FORMID_VALUE_DISK_INFO_FORM_MAIN, key = 0x800A; //32778; endif; - suppressif ( questionref(SelectedDiskAvailableActions) & HII_ACTION_ENABLE_BLOCKSID ) == 0; - oneof varid = OpalHiiConfig.EnableBlockSid, - questionid = 0x8017, // 32791, - prompt = STRING_TOKEN(STR_DISK_INFO_ENABLE_BLOCKSID), - help = STRING_TOKEN(STR_DISK_INFO_GOTO_ENABLE_BLOCKSID_HELP), - flags = INTERACTIVE, - option text = STRING_TOKEN(STR_DISABLED), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED; - option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = RESET_REQUIRED; - endoneof; - endif; - endform; // DISK INFO FORM // -- 2.6.4.windows.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
