X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FSource%2FC%2FVfrCompile%2FVfrError.h;h=8bae04953191e616137dc0137c59667f00449f6c;hb=d16e777ac564557f805db05a0110874797b65ceb;hp=29cccabd297e34676d2b1c83a7e2f5b5522ba645;hpb=40d841f6a8f84e75409178e19e69b95e01bada0f;p=mirror_edk2.git

diff --git a/BaseTools/Source/C/VfrCompile/VfrError.h b/BaseTools/Source/C/VfrCompile/VfrError.h
index 29cccabd29..8bae049531 100644
--- a/BaseTools/Source/C/VfrCompile/VfrError.h
+++ b/BaseTools/Source/C/VfrCompile/VfrError.h
@@ -2,7 +2,7 @@
   
   VfrCompiler Error definition
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -32,6 +32,7 @@ typedef enum {
   VFR_RETURN_VARSTOREID_REDEFINED,
   VFR_RETURN_UNDEFINED,
   VFR_RETURN_VAR_NOTDEFINED_BY_QUESTION,
+  VFR_RETURN_VARSTORE_DATATYPE_REDEFINED_ERROR,
   VFR_RETURN_GET_EFIVARSTORE_ERROR,
   VFR_RETURN_EFIVARSTORE_USE_ERROR,
   VFR_RETURN_EFIVARSTORE_SIZE_ERROR,
@@ -42,14 +43,29 @@ typedef enum {
   VFR_RETURN_DATA_STRING_ERROR,
   VFR_RETURN_DEFAULT_VALUE_REDEFINED,
   VFR_RETURN_CONSTANT_ONLY,
+  VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR,
+  VFR_RETURN_BIT_WIDTH_ERROR,
   VFR_RETURN_CODEUNDEFINED
 } EFI_VFR_RETURN_CODE;
 
+typedef enum {
+  VFR_WARNING_DEFAULT_VALUE_REDEFINED = 0,
+  VFR_WARNING_STRING_TO_UINT_OVERFLOW,
+  VFR_WARNING_ACTION_WITH_TEXT_TWO,
+  VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,
+  VFR_WARNING_CODEUNDEFINED
+} EFI_VFR_WARNING_CODE;
+
 typedef struct _SVFR_ERROR_HANDLE {
   EFI_VFR_RETURN_CODE    mErrorCode;
   CONST CHAR8            *mErrorMsg;
 } SVFR_ERROR_HANDLE;
 
+typedef struct _SVFR_WARNING_HANDLE {
+  EFI_VFR_WARNING_CODE    mWarningCode;
+  CONST CHAR8            *mWarningMsg;
+} SVFR_WARNING_HANDLE;
+
 struct SVfrFileScopeRecord {
   CHAR8                 *mFileName;
   UINT32                mWholeScopeLine;
@@ -58,24 +74,36 @@ struct SVfrFileScopeRecord {
 
   SVfrFileScopeRecord (IN CHAR8 *, IN UINT32);
   ~SVfrFileScopeRecord();
+
+private:
+  SVfrFileScopeRecord (IN CONST SVfrFileScopeRecord&);             // Prevent copy-construction
+  SVfrFileScopeRecord& operator= (IN CONST SVfrFileScopeRecord&);  // Prevent assignment
 };
 
 class CVfrErrorHandle {
 private:
   CHAR8               *mInputFileName;
   SVFR_ERROR_HANDLE   *mVfrErrorHandleTable;
+  SVFR_WARNING_HANDLE *mVfrWarningHandleTable;
   SVfrFileScopeRecord *mScopeRecordListHead;
   SVfrFileScopeRecord *mScopeRecordListTail;
+  BOOLEAN             mWarningAsError;
 
 public:
   CVfrErrorHandle (VOID);
   ~CVfrErrorHandle (VOID);
 
+  VOID  SetWarningAsError (IN BOOLEAN);
   VOID  SetInputFile (IN CHAR8 *);
   VOID  ParseFileScopeRecord (IN CHAR8 *, IN UINT32);
   VOID  GetFileNameLineNum (IN UINT32, OUT CHAR8 **, OUT UINT32 *);
   UINT8 HandleError (IN EFI_VFR_RETURN_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL);
+  UINT8 HandleWarning (IN EFI_VFR_WARNING_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL);
   VOID  PrintMsg (IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL, IN CONST CHAR8 *MsgType = "Error", IN CONST CHAR8 *ErrorMsg = "");
+
+private:
+  CVfrErrorHandle (IN CONST CVfrErrorHandle&);             // Prevent copy-construction
+  CVfrErrorHandle& operator= (IN CONST CVfrErrorHandle&);  // Prevent assignment
 };
 
 #define CHECK_ERROR_RETURN(f, v) do { EFI_VFR_RETURN_CODE r; if ((r = (f)) != (v)) { return r; } } while (0)