From: "Abner Chang" <abner.chang@hpe.com>
To: devel@edk2.groups.io
Cc: Dandan Bi <dandan.bi@intel.com>, Eric Dong <eric.dong@intel.com>,
Nickle Wang <nickle.wang@hpe.com>
Subject: [VFR support REST_STYLE PATCH v4 3/4] MdeModulePkg/Library: Revise HiiLib to check REST_STYLE
Date: Fri, 6 Nov 2020 10:49:38 +0800 [thread overview]
Message-ID: <20201106024939.17761-4-abner.chang@hpe.com> (raw)
In-Reply-To: <20201106024939.17761-1-abner.chang@hpe.com>
This change checks REST_STYLE flag.
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Signed-off-by: Ting Ye <ting.ye@intel.com>
Signed-off-by: Siyuan Fu <siyuan.fu@intel.com>
Signed-off-by: Fan Wang <fan.wang@intel.com>
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Nickle Wang <nickle.wang@hpe.com>
---
MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index 564169bc14..57602828fe 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -3605,7 +3605,7 @@ HiiCreateCheckBoxOpCode (
EFI_IFR_CHECKBOX OpCode;
UINTN Position;
- ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) == 0);
ZeroMem (&OpCode, sizeof (OpCode));
OpCode.Question.QuestionId = QuestionId;
@@ -3674,7 +3674,7 @@ HiiCreateNumericOpCode (
UINTN Position;
UINTN Length;
- ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) == 0);
Length = 0;
ZeroMem (&OpCode, sizeof (OpCode));
@@ -3773,7 +3773,7 @@ HiiCreateStringOpCode (
EFI_IFR_STRING OpCode;
UINTN Position;
- ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) == 0);
ZeroMem (&OpCode, sizeof (OpCode));
OpCode.Question.Header.Prompt = Prompt;
@@ -3841,7 +3841,7 @@ HiiCreateOneOfOpCode (
UINTN Length;
ASSERT (OptionsOpCodeHandle != NULL);
- ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0);
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0);
ZeroMem (&OpCode, sizeof (OpCode));
OpCode.Question.Header.Prompt = Prompt;
@@ -3912,7 +3912,7 @@ HiiCreateOrderedListOpCode (
UINTN Position;
ASSERT (OptionsOpCodeHandle != NULL);
- ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0);
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0);
ZeroMem (&OpCode, sizeof (OpCode));
OpCode.Question.Header.Prompt = Prompt;
@@ -4009,7 +4009,7 @@ HiiCreateDateOpCode (
EFI_IFR_DATE OpCode;
UINTN Position;
- ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) == 0);
ASSERT ((DateFlags & (~(EFI_QF_DATE_YEAR_SUPPRESS | EFI_QF_DATE_MONTH_SUPPRESS | EFI_QF_DATE_DAY_SUPPRESS | EFI_QF_DATE_STORAGE))) == 0);
ZeroMem (&OpCode, sizeof (OpCode));
@@ -4074,7 +4074,7 @@ HiiCreateTimeOpCode (
EFI_IFR_TIME OpCode;
UINTN Position;
- ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);
+ ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) == 0);
ASSERT ((TimeFlags & (~(QF_TIME_HOUR_SUPPRESS | QF_TIME_MINUTE_SUPPRESS | QF_TIME_SECOND_SUPPRESS | QF_TIME_STORAGE))) == 0);
ZeroMem (&OpCode, sizeof (OpCode));
--
2.17.1
next prev parent reply other threads:[~2020-11-06 3:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-06 2:49 [VFR support REST_STYLE PATCH v4 0/4] VFR support REST_STYLE Abner Chang
2020-11-06 2:49 ` [VFR support REST_STYLE PATCH v4 1/4] MdePkg: Add GUID for REST Style Formset Abner Chang
2020-11-06 2:49 ` [VFR support REST_STYLE PATCH v4 2/4] BaseTools/VfrCompile: VFR compiler supports REST_STYLE in HII option Abner Chang
2020-11-06 2:49 ` Abner Chang [this message]
2020-11-06 2:49 ` [VFR support REST_STYLE PATCH v4 4/4] MdeModulePkg/DriverSampleDxe: Add HII sample options Abner Chang
[not found] ` <1644CDDEC21AD05F.25549@groups.io>
2020-11-06 3:55 ` [edk2-devel] [VFR support REST_STYLE PATCH v4 3/4] MdeModulePkg/Library: Revise HiiLib to check REST_STYLE Abner Chang
[not found] ` <1644CDDF508612CA.7247@groups.io>
2020-11-06 3:56 ` [edk2-devel] [VFR support REST_STYLE PATCH v4 4/4] MdeModulePkg/DriverSampleDxe: Add HII sample options Abner Chang
2020-11-09 1:17 ` 回复: [edk2-devel] [VFR support REST_STYLE PATCH v4 0/4] VFR support REST_STYLE gaoliming
[not found] ` <1645B211979911D7.24110@groups.io>
2020-11-11 0:49 ` gaoliming
2020-11-11 1:03 ` Abner Chang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201106024939.17761-4-abner.chang@hpe.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox