diff options
| author | Carsey, Jaben <jaben.carsey@intel.com> | 2018-04-11 09:14:05 -0700 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-04-23 11:11:20 +0800 |
| commit | 656d2539be34ea0ce356857ffd4f9decdf0476b2 (patch) | |
| tree | d23ecf3f2009b6c496b2bd5ac4f38a97bb6592b5 /BaseTools/Source/Python/GenFds | |
| parent | b491aa95ab9e2e831f658bb74bf9ed67bff082ac (diff) | |
| download | edk2-656d2539be34ea0ce356857ffd4f9decdf0476b2.tar.gz edk2-656d2539be34ea0ce356857ffd4f9decdf0476b2.tar.bz2 edk2-656d2539be34ea0ce356857ffd4f9decdf0476b2.zip | |
BaseTools: replace 'UINT8','UINT16','UINT32','UINT64','VOID*' with shared constants.
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/GenFds')
| -rw-r--r-- | BaseTools/Source/Python/GenFds/FdfParser.py | 6 | ||||
| -rw-r--r-- | BaseTools/Source/Python/GenFds/FfsInfStatement.py | 4 | ||||
| -rw-r--r-- | BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py index a106253527..6baf875833 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -1134,7 +1134,7 @@ class FdfParser: @staticmethod
def __Verify(Name, Value, Scope):
- if Scope in ['UINT64', 'UINT8']:
+ if Scope in [TAB_UINT64, TAB_UINT8]:
ValueNumber = 0
try:
ValueNumber = int (Value, 0)
@@ -1142,10 +1142,10 @@ class FdfParser: EdkLogger.error("FdfParser", FORMAT_INVALID, "The value is not valid dec or hex number for %s." % Name)
if ValueNumber < 0:
EdkLogger.error("FdfParser", FORMAT_INVALID, "The value can't be set to negative value for %s." % Name)
- if Scope == 'UINT64':
+ if Scope == TAB_UINT64:
if ValueNumber >= 0x10000000000000000:
EdkLogger.error("FdfParser", FORMAT_INVALID, "Too large value for %s." % Name)
- if Scope == 'UINT8':
+ if Scope == TAB_UINT8:
if ValueNumber >= 0x100:
EdkLogger.error("FdfParser", FORMAT_INVALID, "Too large value for %s." % Name)
return True
diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py index 37624f3fa9..3c5eef4022 100644 --- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py @@ -296,7 +296,7 @@ class FfsInfStatement(FfsInfStatementClassObject): EdkLogger.error("GenFds", GENFDS_ERROR, 'PCD [%s.%s] Value "%s"' %(Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DefaultValue),File=self.InfFileName)
# Check value, if value are equal, no need to patch
- if Pcd.DatumType == "VOID*":
+ if Pcd.DatumType == TAB_VOID:
if Pcd.InfDefaultValue == DefaultValue or DefaultValue in [None, '']:
continue
# Get the string size from FDF or DSC
@@ -326,7 +326,7 @@ class FfsInfStatement(FfsInfStatementClassObject): except:
continue
# Check the Pcd size and data type
- if Pcd.DatumType == "VOID*":
+ if Pcd.DatumType == TAB_VOID:
if int(MaxDatumSize) > int(Pcd.MaxDatumSize):
EdkLogger.error("GenFds", GENFDS_ERROR, "The size of VOID* type PCD '%s.%s' exceeds its maximum size %d bytes." \
% (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, int(MaxDatumSize) - int(Pcd.MaxDatumSize)))
diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py index 6a3873940e..6745a89514 100644 --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py @@ -811,7 +811,7 @@ class GenFdsGlobalVariable: if (PcdObj.TokenCName == TokenCName) and (PcdObj.TokenSpaceGuidCName == TokenSpace):
if PcdObj.Type != 'FixedAtBuild':
EdkLogger.error("GenFds", GENFDS_ERROR, "%s is not FixedAtBuild type." % PcdPattern)
- if PcdObj.DatumType != 'VOID*':
+ if PcdObj.DatumType != DataType.TAB_VOID:
EdkLogger.error("GenFds", GENFDS_ERROR, "%s is not VOID* datum type." % PcdPattern)
PcdValue = PcdObj.DefaultValue
@@ -827,7 +827,7 @@ class GenFdsGlobalVariable: if (PcdObj.TokenCName == TokenCName) and (PcdObj.TokenSpaceGuidCName == TokenSpace):
if PcdObj.Type != 'FixedAtBuild':
EdkLogger.error("GenFds", GENFDS_ERROR, "%s is not FixedAtBuild type." % PcdPattern)
- if PcdObj.DatumType != 'VOID*':
+ if PcdObj.DatumType != DataType.TAB_VOID:
EdkLogger.error("GenFds", GENFDS_ERROR, "%s is not VOID* datum type." % PcdPattern)
PcdValue = PcdObj.DefaultValue
|