Hi Maggie,
Thanks for your contribution.
Reviewed-by: Eric Dong
Pushed: SHA-1: 315873959ec3e0a44168efdf4c03fe6160121cdb
Thanks,
Eric
> -Original Message-
> From: Chu, Maggie
> Sent: Wednesday, February 13, 2019 2:56 PM
> To: edk2-devel@lists.01.org
> Cc: Zhang, Chao B ; Yao, Jiewen
> ; Dong, Eric
> Subject: [PATCH] SecurityPkg/OpalPassword: Update strings on Opal Setup
> page
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1506
> Updated some descriptions on SETUP page to avoid user confusion.
> Currently it shows "1.0 UEFI Opal Driver", however it may be mislead user to
> think it is only for Opal drive but not for Pyrite drive.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Maggie Chu
> Cc: Chao Zhang
> Cc: Jiewen Yao
> Cc: Eric Dong
> ---
> SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c | 10 --
> SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h | 11 ---
> SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c | 16
> +---
> SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni | 11 ++
> -
> SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordForm.vfr | 4 ++--
> 5 files changed, 9 insertions(+), 43 deletions(-)
>
> diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
> b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
> index 4336604d0d..51aa93c2fd 100644
> --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
> +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.c
> @@ -393,7 +393,6 @@ OpalHiiAddPackages(
>)
> {
>EFI_HANDLE DriverHandle;
> - CHAR16 *NewString;
>
>DriverHandle = HiiGetDriverImageHandleCB();
>
> @@ -416,15 +415,6 @@ OpalHiiAddPackages(
> return EFI_OUT_OF_RESOURCES;
>}
>
> - //
> - // Update Version String in main window
> - //
> - NewString = HiiGetDriverNameCB ();
> - if (HiiSetString(gHiiPackageListHandle,
> STRING_TOKEN(STR_MAIN_OPAL_VERSION), NewString, NULL) == 0) {
> -DEBUG ((DEBUG_INFO, "OpalHiiAddPackages: HiiSetString( ) failed\n"));
> -return EFI_OUT_OF_RESOURCES;
> - }
> -
>return EFI_SUCCESS;
> }
>
> diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
> b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
> index 8b368fe995..e137a55810 100644
> --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
> +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
> @@ -285,17 +285,6 @@ OpalHiiAddPackages(
>VOID
>);
>
> -/**
> - Returns the driver name.
> -
> - @retval Returns the driver name.
> -
> -**/
> -CHAR16*
> -HiiGetDriverNameCB(
> - VOID
> - );
> -
> /**
>Returns the opaque pointer to a physical disk context.
>
> diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c
> b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c
> index 31e1aa2240..1b6f067076 100644
> --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c
> +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiCallbacks.c
> @@ -115,18 +115,4 @@ HiiDiskGetNameCB(
> return Ctx->NameZ;
>}
>return NULL;
> -}
> -
> -/**
> - Returns the driver name.
> -
> - @retval Returns the driver name.
> -
> -**/
> -CHAR16*
> -HiiGetDriverNameCB(
> - VOID
> - )
> -{
> - return (CHAR16*)EFI_DRIVER_NAME_UNICODE; -}
> +}
> \ No newline at end of file
> diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni
> b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni
> index 5f753dfa8c..44cfc80626 100644
> --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni
> +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormStrings.uni
> @@ -20,14 +20,14 @@
> #string STR_NULL#language en-US " "
>
> / FORM SET
> /
> -#string STR_FORM_SET_HELP#language en-US "Manage Opal
> disks"
> +#string STR_FORM_SET_HELP#language en-US "Select to
> manage"
>
> / MULTIPLE FORMS
> /
> -#string STR_OPAL #language en-US "Opal"
> -#string STR_MAIN_OPAL_VERSION#language en-US "Version
> 00.0.0."
> +#string STR_OPAL #language en-US "TCG Drive
> Management"
>
> / MAIN MENU FORM
> /
> #string STR_MAIN_PHY_DISKS_LBL #language en-US "Physical
> Disks:"
> +#string STR_MAIN_OPAL_TITLE_LBL #language en-US "Allows user
> to choose drive to configure drive security. User can also set storage action
> policy for use of the TCG Block SID authentication feature."
>
> #string STR_MAIN_GOTO_DISK_INFO_0#language en-US " "
> #string STR_MAIN_GOTO_DISK_INFO_1#language en-US " "
> @@ -36,13 +36,14 @@
> #string STR_MAIN_GOTO_DISK_INFO_4#language en-US " "
> #string