tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert last patch about "Modal form" opcode support. 

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



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11768 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ydong10 2011-06-08 08:24:52 +00:00
parent 211cc6e5cd
commit 82e589a43f
4 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
View File

@ -681,7 +681,6 @@ typedef union {
#define EFI_IFR_CATENATE_OP 0x5E #define EFI_IFR_CATENATE_OP 0x5E
#define EFI_IFR_GUID_OP 0x5F #define EFI_IFR_GUID_OP 0x5F
#define EFI_IFR_SECURITY_OP 0x60 #define EFI_IFR_SECURITY_OP 0x60
#define EFI_IFR_MODAL_TAG_OP 0x61
typedef struct _EFI_IFR_OP_HEADER { typedef struct _EFI_IFR_OP_HEADER {
@ -772,10 +771,6 @@ typedef struct _EFI_IFR_IMAGE {
EFI_IMAGE_ID Id; EFI_IMAGE_ID Id;
} EFI_IFR_IMAGE; } EFI_IFR_IMAGE;
typedef struct _EFI_IFR_MODAL {
EFI_IFR_OP_HEADER Header;
} EFI_IFR_MODAL;
typedef struct _EFI_IFR_LOCKED { typedef struct _EFI_IFR_LOCKED {
EFI_IFR_OP_HEADER Header; EFI_IFR_OP_HEADER Header;
} EFI_IFR_LOCKED; } EFI_IFR_LOCKED;

3
BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
View File

@ -1305,7 +1305,6 @@ static struct {
{ sizeof (EFI_IFR_CATENATE), 0 }, // EFI_IFR_CATENATE_OP { sizeof (EFI_IFR_CATENATE), 0 }, // EFI_IFR_CATENATE_OP
{ sizeof (EFI_IFR_GUID), 0 }, // EFI_IFR_GUID_OP { sizeof (EFI_IFR_GUID), 0 }, // EFI_IFR_GUID_OP
{ sizeof (EFI_IFR_SECURITY), 0 }, // EFI_IFR_SECURITY_OP - 0x60 { sizeof (EFI_IFR_SECURITY), 0 }, // EFI_IFR_SECURITY_OP - 0x60
{ sizeof (EFI_IFR_MODAL), 0}, // EFI_IFR_MODAL_OP - 0x61
}; };
#ifdef CIFROBJ_DEUBG #ifdef CIFROBJ_DEUBG
@ -1328,7 +1327,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_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_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_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",
}; };
VOID VOID

10
BaseTools/Source/C/VfrCompile/VfrFormPkg.h
View File

@ -809,16 +809,6 @@ public:
} }
}; };
class CIfrModal : public CIfrObj, public CIfrOpHeader {
private:
EFI_IFR_MODAL *mModal;
public:
CIfrModal () : CIfrObj (EFI_IFR_MODAL_TAG_OP, (CHAR8 **)&mModal),
CIfrOpHeader (EFI_IFR_MODAL_TAG_OP, &mModal->Header) {
}
};
class CIfrLocked : public CIfrObj, public CIfrOpHeader { class CIfrLocked : public CIfrObj, public CIfrOpHeader {
private: private:
EFI_IFR_LOCKED *mLocked; EFI_IFR_LOCKED *mLocked;

17
BaseTools/Source/C/VfrCompile/VfrSyntax.g
View File

@ -237,7 +237,6 @@ VfrParserStart (
#token EndGuidOp("endguidop") "endguidop" #token EndGuidOp("endguidop") "endguidop"
#token DataType("datatype") "datatype" #token DataType("datatype") "datatype"
#token Data("data") "data" #token Data("data") "data"
#token Modal("modal") "modal"
// //
// Define the class and subclass tokens // Define the class and subclass tokens
@ -1252,8 +1251,7 @@ vfrFormDefinition :
vfrStatementBanner | vfrStatementBanner |
// Just for framework vfr compatibility // Just for framework vfr compatibility
vfrStatementInvalid | vfrStatementInvalid |
vfrStatementExtension | vfrStatementExtension
vfrStatementModal
)* )*
E:EndForm << E:EndForm <<
if (mCompatibleMode) { if (mCompatibleMode) {
@ -1312,8 +1310,7 @@ vfrFormMapDefinition :
vfrStatementConditional | vfrStatementConditional |
vfrStatementLabel | vfrStatementLabel |
vfrStatementBanner | vfrStatementBanner |
vfrStatementExtension | vfrStatementExtension
vfrStatementModal
)* )*
E:EndForm << CRT_END_OP (E); >> E:EndForm << CRT_END_OP (E); >>
";" ";"
@ -2493,11 +2490,6 @@ vfrLockedTag :
L:Locked << LObj.SetLineNo(L->getLine()); >> L:Locked << LObj.SetLineNo(L->getLine()); >>
; ;
vfrModalTag :
<< CIfrModal MObj; >>
L:Modal << MObj.SetLineNo(L->getLine()); >>
;
vfrStatementStatTag : vfrStatementStatTag :
vfrImageTag | vfrImageTag |
vfrLockedTag vfrLockedTag
@ -2512,11 +2504,6 @@ vfrStatementImage :
";" ";"
; ;
vfrStatementModal :
vfrModalTag
";"
;
vfrStatementLocked : vfrStatementLocked :
vfrLockedTag vfrLockedTag
";" ";"