BaseTools: replace 'UINT8','UINT16','UINT32','UINT64','VOID*' with shared constants.

[mirror_edk2.git] / BaseTools / Source / Python / Common / Misc.py

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 4f2bfd63cfc326b71481a0785d28659723652463..60ae98c550a8e940566b8e7e17157a32991b861b 100644 (file)
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1288,22 +1288,22 @@ def ParseFieldValue (Value):
     if type(Value) <> type(''):\r
         raise BadExpression('Type %s is %s' %(Value, type(Value)))\r
     Value = Value.strip()\r
-    if Value.startswith('UINT8') and Value.endswith(')'):\r
+    if Value.startswith(TAB_UINT8) and Value.endswith(')'):\r
         Value, Size = ParseFieldValue(Value.split('(', 1)[1][:-1])\r
         if Size > 1:\r
             raise BadExpression('Value (%s) Size larger than %d' %(Value, Size))\r
         return Value, 1\r
-    if Value.startswith('UINT16') and Value.endswith(')'):\r
+    if Value.startswith(TAB_UINT16) and Value.endswith(')'):\r
         Value, Size = ParseFieldValue(Value.split('(', 1)[1][:-1])\r
         if Size > 2:\r
             raise BadExpression('Value (%s) Size larger than %d' %(Value, Size))\r
         return Value, 2\r
-    if Value.startswith('UINT32') and Value.endswith(')'):\r
+    if Value.startswith(TAB_UINT32) and Value.endswith(')'):\r
         Value, Size = ParseFieldValue(Value.split('(', 1)[1][:-1])\r
         if Size > 4:\r
             raise BadExpression('Value (%s) Size larger than %d' %(Value, Size))\r
         return Value, 4\r
-    if Value.startswith('UINT64') and Value.endswith(')'):\r
+    if Value.startswith(TAB_UINT64) and Value.endswith(')'):\r
         Value, Size = ParseFieldValue(Value.split('(', 1)[1][:-1])\r
         if Size > 8:\r
             raise BadExpression('Value (%s) Size larger than %d' % (Value, Size))\r
@@ -1490,7 +1490,7 @@ def AnalyzeDscPcd(Setting, PcdType, DataType=''):
     elif PcdType in (MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_VPD):\r
         VpdOffset = FieldList[0]\r
         Value = Size = ''\r
-        if not DataType == 'VOID*':\r
+        if not DataType == TAB_VOID:\r
             if len(FieldList) > 1:\r
                 Value = FieldList[1]\r
         else:\r
@@ -1558,7 +1558,7 @@ def AnalyzePcdData(Setting):
 # For PCD value setting\r
 #\r
 def CheckPcdDatum(Type, Value):\r
-    if Type == "VOID*":\r
+    if Type == TAB_VOID:\r
         ValueRe = re.compile(r'\s*L?\".*\"\s*$')\r
         if not (((Value.startswith('L"') or Value.startswith('"')) and Value.endswith('"'))\r
                 or (Value.startswith('{') and Value.endswith('}')) or (Value.startswith("L'") or Value.startswith("'") and Value.endswith("'"))\r