From ea0f6464330a08f274fb886c3326ca5777ded2c5 Mon Sep 17 00:00:00 2001
From: Liming Gao <liming.gao@intel.com>
Date: Tue, 24 Sep 2013 07:13:44 +0000
Subject: Sync BaseTool trunk (version r2601) into EDKII BaseTools.

Signed-off-by: Liming Gao <liming.gao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14710 6f19259b-4bc3-4df7-8a09-765794883524
---
 BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp |  3 ++-
 BaseTools/Source/C/VfrCompile/VfrFormPkg.h   | 20 ++++++++++++++++++++
 BaseTools/Source/C/VfrCompile/VfrSyntax.g    | 13 ++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)

(limited to 'BaseTools/Source/C/VfrCompile')

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
index 7cadf0f42b..363ca82a24 100644
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
@@ -1673,6 +1673,7 @@ static struct {
   { sizeof (EFI_IFR_SECURITY), 0 },            // EFI_IFR_SECURITY_OP - 0x60
   { sizeof (EFI_IFR_MODAL_TAG), 0},            // EFI_IFR_MODAL_TAG_OP - 0x61
   { sizeof (EFI_IFR_REFRESH_ID), 0},           // EFI_IFR_REFRESH_ID_OP - 0x62
+  { sizeof (EFI_IFR_WARNING_IF), 1},           // EFI_IFR_WARNING_IF_OP - 0x63
 };
 
 #ifdef CIFROBJ_DEUBG
@@ -1695,7 +1696,7 @@ static struct {
   "EFI_IFR_STRING_REF1","EFI_IFR_STRING_REF2",          "EFI_IFR_CONDITIONAL",   "EFI_IFR_QUESTION_REF3",   "EFI_IFR_ZERO",          "EFI_IFR_ONE",
   "EFI_IFR_ONES",       "EFI_IFR_UNDEFINED",            "EFI_IFR_LENGTH",        "EFI_IFR_DUP",             "EFI_IFR_THIS",          "EFI_IFR_SPAN",
   "EFI_IFR_VALUE",      "EFI_IFR_DEFAULT",              "EFI_IFR_DEFAULTSTORE",  "EFI_IFR_FORM_MAP",        "EFI_IFR_CATENATE",      "EFI_IFR_GUID",
-  "EFI_IFR_SECURITY",   "EFI_IFR_MODAL_TAG",            "EFI_IFR_REFRESH_ID",
+  "EFI_IFR_SECURITY",   "EFI_IFR_MODAL_TAG",            "EFI_IFR_REFRESH_ID",    "EFI_IFR_WARNING_IF",
 };
 
 VOID
diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
index 614471060d..25280def9b 100644
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
@@ -1612,6 +1612,26 @@ public:
   }
 };
 
+class CIfrWarningIf : public CIfrObj, public CIfrOpHeader {
+private:
+  EFI_IFR_WARNING_IF *mWarningIf;
+
+public:
+  CIfrWarningIf () : CIfrObj (EFI_IFR_WARNING_IF_OP, (CHAR8 **)&mWarningIf),
+                        CIfrOpHeader (EFI_IFR_WARNING_IF_OP, &mWarningIf->Header) {
+    mWarningIf->Warning = EFI_STRING_ID_INVALID;
+    mWarningIf->TimeOut = 0;
+  }
+
+  VOID SetWarning (IN EFI_STRING_ID Warning) {
+    mWarningIf->Warning = Warning;
+  }
+
+  VOID SetTimeOut (IN UINT8 TimeOut) {
+    mWarningIf->TimeOut = TimeOut;
+  }
+};
+
 class CIfrNoSubmitIf : public CIfrObj, public CIfrOpHeader {
 private:
   EFI_IFR_NO_SUBMIT_IF *mNoSubmitIf;
diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
index 253834508a..61b68f5fb7 100644
--- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g
+++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
@@ -184,6 +184,7 @@ VfrParserStart (
 #token Goto("goto")                             "goto"
 #token FormSetGuid("formsetguid")               "formsetguid"
 #token InconsistentIf("inconsistentif")         "inconsistentif"
+#token WarningIf("warningif")                   "warningif"
 #token NoSubmitIf("nosubmitif")                 "nosubmitif"
 #token EndIf("endif")                           "endif"
 #token Key("key")                               "key"
@@ -2627,7 +2628,8 @@ vfrStatementQuestionTag :
   vfrStatementRefresh           |
   vfrStatementVarstoreDevice    |
   vfrStatementExtension         |
-  vfrStatementRefreshEvent
+  vfrStatementRefreshEvent      |
+  vfrStatementWarningIf
   ;
 
 vfrStatementQuestionTagList :
@@ -2825,6 +2827,15 @@ vfrStatementNoSubmitIf :
   E:EndIf                                              << CRT_END_OP (E); >>
   ;
 
+vfrStatementWarningIf :
+  << CIfrWarningIf WIObj; >>
+  L:WarningIf                                          << WIObj.SetLineNo(L->getLine()); >>
+  Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" ","     << WIObj.SetWarning (_STOSID(S->getText())); >>
+  {Timeout "=" T:Number ","                            << WIObj.SetTimeOut (_STOU8(T->getText())); >>}
+  vfrStatementExpression[0]
+  E:EndIf                                              << CRT_END_OP (E); >>
+  ;
+
 vfrStatementDisableIfQuest :
   << 
     CIfrDisableIf DIObj; 
-- 
cgit v1.2.3