SF.net SVN: edk2-buildtools:[2169] trunk/BaseTools/Source/C

[<yd...@us...>]

Revision: 2169
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2169&view=rev
Author:   ydong10
Date:     2011-06-09 10:59:46 +0000 (Thu, 09 Jun 2011)

Log Message:
-----------
Add new "Refresh Event Group" opcode

Signed-off-by: ydong10
Reviewed-by: lgao4

Modified Paths:
--------------
    trunk/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
    trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
    trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
    trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g

Modified: trunk/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
===================================================================
--- trunk/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h	2011-06-09 10:49:32 UTC (rev 2168)
+++ trunk/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h	2011-06-09 10:59:46 UTC (rev 2169)
@@ -682,6 +682,7 @@
 #define EFI_IFR_GUID_OP                0x5F
 #define EFI_IFR_SECURITY_OP            0x60
 #define EFI_IFR_MODAL_TAG_OP           0x61
+#define EFI_IFR_REFRESH_ID_OP          0x62
 
 
 typedef struct _EFI_IFR_OP_HEADER {
@@ -998,6 +999,11 @@
   UINT8                    RefreshInterval;
 } EFI_IFR_REFRESH;
 
+typedef struct _EFI_IFR_REFRESH_ID {
+  EFI_IFR_OP_HEADER Header;
+  EFI_GUID          RefreshEventGroupId;
+} EFI_IFR_REFRESH_ID;
+
 typedef struct _EFI_IFR_VARSTORE_DEVICE {
   EFI_IFR_OP_HEADER        Header;
   EFI_STRING_ID            DevicePath;

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp	2011-06-09 10:49:32 UTC (rev 2168)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp	2011-06-09 10:59:46 UTC (rev 2169)
@@ -1306,6 +1306,7 @@
   { sizeof (EFI_IFR_GUID), 0 },                // EFI_IFR_GUID_OP
   { sizeof (EFI_IFR_SECURITY), 0 },            // EFI_IFR_SECURITY_OP - 0x60
   { sizeof (EFI_IFR_MODAL), 0},                // EFI_IFR_MODAL_OP - 0x61
+  { sizeof (EFI_IFR_REFRESH_ID), 0},           // EFI_IFR_REFRESH_ID_OP - 0x62
 };
 
 #ifdef CIFROBJ_DEUBG
@@ -1328,7 +1329,7 @@
   "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",
+  "EFI_IFR_SECURITY",   "EFI_IFR_MODAL",                "EFI_IFR_REFRESH_ID",
 };
 
 VOID

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.h	2011-06-09 10:49:32 UTC (rev 2168)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrFormPkg.h	2011-06-09 10:59:46 UTC (rev 2169)
@@ -1492,6 +1492,21 @@
   }
 };
 
+class CIfrRefreshId : public CIfrObj, public CIfrOpHeader {
+private:
+  EFI_IFR_REFRESH_ID *mRefreshId;
+
+public:
+  CIfrRefreshId () : CIfrObj (EFI_IFR_REFRESH_ID_OP, (CHAR8 **)&mRefreshId),
+      CIfrOpHeader (EFI_IFR_REFRESH_ID_OP, &mRefreshId->Header) {
+    memset (&mRefreshId->RefreshEventGroupId, 0, sizeof (EFI_GUID));
+  }
+
+  VOID SetRefreshEventGroutId (IN EFI_GUID *RefreshEventGroupId) {
+    memcpy (&mRefreshId->RefreshEventGroupId, RefreshEventGroupId, sizeof (EFI_GUID));
+  }
+};
+
 class CIfrVarStoreDevice : public CIfrObj, public CIfrOpHeader {
 private:
   EFI_IFR_VARSTORE_DEVICE *mVarStoreDevice;

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g	2011-06-09 10:49:32 UTC (rev 2168)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrSyntax.g	2011-06-09 10:59:46 UTC (rev 2169)
@@ -2342,7 +2342,8 @@
   vfrStatementDisableIfQuest    |
   vfrStatementRefresh           |
   vfrStatementVarstoreDevice    |
-  vfrStatementExtension
+  vfrStatementExtension         |
+  vfrStatementRefreshEvent
   ;
 
 vfrStatementQuestionTagList :
@@ -2556,6 +2557,15 @@
   Interval "=" I:Number                                << RObj.SetRefreshInterval (_STOU8(I->getText())); >>
   ;
 
+vfrStatementRefreshEvent :
+  <<
+    CIfrRefreshId RiObj;
+    EFI_GUID      Guid;
+  >>
+  L:RefreshGuid                                        << RiObj.SetLineNo(L->getLine()); >>
+  "="  guidDefinition[Guid] ","                        << RiObj.SetRefreshEventGroutId (&Guid);  >>
+  ;
+
 vfrStatementVarstoreDevice :
   << CIfrVarStoreDevice VDObj; >>
   L:VarstoreDevice                                     << VDObj.SetLineNo(L->getLine()); >>
@@ -2824,6 +2834,7 @@
 #token QuestionRefVal("questionrefval")         "questionrefval"
 #token StringRefVal("stringrefval")             "stringrefval"
 #token Map("map")                               "map"
+#token RefreshGuid("refreshguid")               "refreshguid"
 
 //
 // Root expression extension function called by other function.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.