回复: [edk2-devel] [VFR support REST_STYLE PATCH v3 4/4] MdeModulePkg/DriverSampleDxe: Add HII sample options

["gaoliming" <gaoliming@byosoft.com.cn>]

Abner:
  Please create new question for STR_ONE_OF_PROMPT_X_UEFI, and keep original QuestionAboutTreeHugging unchanged.

Thanks
Liming
> -----邮件原件-----
> 发件人: bounce+27952+66967+4905953+8761045@groups.io
> <bounce+27952+66967+4905953+8761045@groups.io> 代表 Abner Chang
> 发送时间: 2020年11月4日 14:36
> 收件人: devel@edk2.groups.io
> 抄送: Jiaxin Wu <jiaxin.wu@intel.com>; Siyuan Fu <siyuan.fu@intel.com>; Fan
> Wang <fan.wang@intel.com>; Jiewen Yao <jiewen.yao@intel.com>; Dandan
> Bi <dandan.bi@intel.com>; Eric Dong <eric.dong@intel.com>; Nickle Wang
> <nickle.wang@hpe.com>
> 主题: [edk2-devel] [VFR support REST_STYLE PATCH v3 4/4]
> MdeModulePkg/DriverSampleDxe: Add HII sample options
> 
> Add x-uefi-ns keyword REST_STYLE HII option and non
> x-uefi keyword REST_STYLE HII option.
> 
> Signed-off-by: Abner Chang <abner.chang@hpe.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Cc: Fan Wang <fan.wang@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Nickle Wang <nickle.wang@hpe.com>
> ---
>  .../Universal/DriverSampleDxe/NVDataStruc.h   |  4 ++-
>  .../Universal/DriverSampleDxe/Vfr.vfr         | 32 +++++++++++++++++--
>  .../Universal/DriverSampleDxe/VfrStrings.uni  | 11 +++++--
>  3 files changed, 40 insertions(+), 7 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
> b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
> index 8617617684..761f5e169c 100644
> --- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
> +++ b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
> @@ -1,6 +1,7 @@
>  /** @file
> 
> -Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>*
> +(C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  Module Name:
> @@ -92,6 +93,7 @@ typedef struct {
>    UINT16  BitNumeric  : 12;
>    MY_BITS_DATA  MyBitData;
>    MY_EFI_UNION_DATA MyUnionData;
> +  UINT8   QuestionNonXUefiKeywordRestStyle;
>  } DRIVER_SAMPLE_CONFIGURATION;
> 
>  //
> diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
> b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
> index 65a65d4d1d..eecb062320 100644
> --- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
> +++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
> @@ -3,6 +3,7 @@
>  //    Sample Setup formset.
>  //
>  //  Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
> +// (C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>
>  //  SPDX-License-Identifier: BSD-2-Clause-Patent
>  //
>  //**/
> @@ -280,15 +281,40 @@ formset
> 
>      endoneof;
> 
> +    //
> +    // This is an HII option which has REST_STYLE flag and x-UEFI
> namespace
> +    // UNI string associated. This HII option could be configured by either
> in-band
> +    // edk2 setup browser or the remote management in out-of-band such
> as Redfish
> +    // service. This HII option is configured through
> EFI_KEYWORD_HANDLER_PROTOCOL.
> +    //
>      oneof varid  = MyIfrNVData.QuestionAboutTreeHugging,
> -      prompt      =
> STRING_TOKEN(STR_ONE_OF_PROMPT_KEYWORD),
> -      help        = STRING_TOKEN(STR_ONE_OF_HELP),
> -      flags       = RESET_REQUIRED,
> +      prompt      = STRING_TOKEN(STR_ONE_OF_PROMPT_X_UEFI),
> +      help        =
> STRING_TOKEN(STR_ONE_OF_PROMPT_X_UEFI_HELP),
> +      flags       = RESET_REQUIRED | REST_STYLE,
>        option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags
> = 0;
>        option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags
> = DEFAULT;
>        option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 3, flags
> = 0;
>      endoneof;
> 
> +    //
> +    // This is a HII option which has REST_STYLE flag but without the x-UEFI
> namespace
> +    // UNI string associated. This HII option could be configured by either
> +    // setup browser or the remote management in out-of-band such as
> Redfish
> +    // service. This HII option is configured through EFI HII Configuration
> Routing
> +    // Protocol becasue it doesn't have x-UEFI namespace UNI string.
> +    //
> +    numeric varid  = MyIfrNVData.QuestionNonXUefiKeywordRestStyle,
> +      prompt       =
> STRING_TOKEN(STR_ONE_OF_PROMPT_NON_X_UEFI),
> +      help         =
> STRING_TOKEN(STR_ONE_OF_PROMPT_NON_X_UEFI_HELP),
> +      flags        = RESET_REQUIRED | REST_STYLE,
> +      minimum      = 0,
> +      maximum      = 0xf0,
> +      step         = 0,          // Stepping of 0 equates to a manual
> entering
> +                                 // of a value, otherwise it will be
> adjusted by "+"/"-"
> +      default      = 0,          // defaultstore could be used to
> specify the default type
> +                                 // If no defaultstore is specified, it
> implies Standard Default
> +    endnumeric;
> +
>      //
>      // Define a string (EFI_IFR_STRING)
>      //
> diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
> b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
> index bafa194c63..740b24cdc3 100644
> --- a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
> +++ b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
> @@ -1,6 +1,7 @@
>  // *++
>    //
>  // Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
> +// (C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>
>  // SPDX-License-Identifier: BSD-2-Clause-Patent
>  //
>  // Module Name:
> @@ -51,9 +52,13 @@
>                                         #language fr-FR "Check the
> input number, test the efi buffer varstore"
>  #string STR_ONE_OF_PROMPT              #language en-US "My
> one-of prompt #1"
>                                         #language fr-FR "Mi uno-
> de guía # 1"
> -#string STR_ONE_OF_PROMPT_KEYWORD      #language en-US "My
> Keyword Namespace Test"
> -                                       #language fr-FR "My
> Keyword Namespace Test"
> -                                       #language x-UEFI-ns
> "iSCSIBootEnable"
> +#string STR_ONE_OF_PROMPT_X_UEFI       #language en-US "x-UEFI
> HII Option"
> +                                       #language fr-FR "x-UEFI HII
> Option"
> +                                       #language x-UEFI-ns
> "xUefiHiiOption"
> +#string STR_ONE_OF_PROMPT_X_UEFI_HELP  #language en-US "This is an
> HII option which has REST_STYLE flag and x-UEFI namespace UNI string
> associated. This HII option could be configured by either in-band edk2 setup
> browser or the remote management in out-of-band such as Redfish service.
> This HII option is configured through EFI_KEYWORD_HANDLER_PROTOCOL."
> +#string STR_ONE_OF_PROMPT_NON_X_UEFI       #language en-US
> "Non x-UEFI HII Option"
> +                                           #language fr-FR "Non
> x-UEFI HII Option"
> +#string STR_ONE_OF_PROMPT_NON_X_UEFI_HELP  #language en-US
> "This is a HII option which has REST_STYLE flag but without the x-UEFI
> namespace UNI string associated. This HII option could be configured by
> either setup browser or the remote management in out-of-band such as
> Redfish service. This HII option is configured through EFI HII Configuration
> Routing Protocol becasue it doesn't have x-UEFI namespace UNI string."
>  #string STR_CHECK_KEYWORD_SUPPORT      #language en-US "Check
> iSCSI Boot Enable"
>                                         #language fr-FR "Check
> iSCSI Boot Enable"
>  #string STR_ONE_OF_HELP                #language en-US "My one-of
> help is going to be a long string to test out the efficiency of the ability of the I
> am tired of typing capabilities"
> --
> 2.17.1
> 
> 
> 
> 
>