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

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenVar.py

diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py b/BaseTools/Source/Python/AutoGen/GenVar.py
index 37c168a84b4389a4b9049ae08d048b514f278ce5..3dae16efd0f557bc9c4a7cffa94cc3f8433db445 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenVar.py
+++ b/BaseTools/Source/Python/AutoGen/GenVar.py
@@ -91,14 +91,14 @@ class VariableMgr(object):
             for item in sku_var_info_offset_list:\r
                 data_type = item.data_type\r
                 value_list = item.default_value.strip("{").strip("}").split(",")\r
-                if data_type in ["BOOLEAN","UINT8","UINT16","UINT32","UINT64"]:\r
-                    if data_type == ["BOOLEAN","UINT8"]:\r
+                if data_type in DataType.TAB_PCD_NUMERIC_TYPES:\r
+                    if data_type == ["BOOLEAN", DataType.TAB_UINT8]:\r
                         data_flag = "=B"\r
-                    elif data_type == "UINT16":\r
+                    elif data_type == DataType.TAB_UINT16:\r
                         data_flag = "=H"\r
-                    elif data_type == "UINT32":\r
+                    elif data_type == DataType.TAB_UINT32:\r
                         data_flag = "=L"\r
-                    elif data_type == "UINT64":\r
+                    elif data_type == DataType.TAB_UINT64:\r
                         data_flag = "=Q"\r
                     data = value_list[0]\r
                     value_list = []\r
@@ -110,7 +110,7 @@ class VariableMgr(object):
             except:\r
                 EdkLogger.error("build", AUTOGEN_ERROR, "Variable offset conflict in PCDs: %s \n" % (" and ".join([item.pcdname for item in sku_var_info_offset_list])))\r
             n = sku_var_info_offset_list[0]\r
-            indexedvarinfo[key] =  [var_info(n.pcdindex,n.pcdname,n.defaultstoragename,n.skuname,n.var_name, n.var_guid, "0x00",n.var_attribute,newvaluestr  , newvaluestr , "VOID*")]\r
+            indexedvarinfo[key] =  [var_info(n.pcdindex,n.pcdname,n.defaultstoragename,n.skuname,n.var_name, n.var_guid, "0x00",n.var_attribute,newvaluestr  , newvaluestr , DataType.TAB_VOID)]\r
         self.VarInfo = [item[0] for item in indexedvarinfo.values()]\r
 \r
     def assemble_variable(self, valuelist):\r
@@ -144,7 +144,7 @@ class VariableMgr(object):
             tail = None\r
             default_sku_default = indexedvarinfo.get(index).get((DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT))\r
 \r
-            if default_sku_default.data_type not in ["UINT8","UINT16","UINT32","UINT64","BOOLEAN"]:\r
+            if default_sku_default.data_type not in DataType.TAB_PCD_NUMERIC_TYPES:\r
                 var_max_len = max([len(var_item.default_value.split(",")) for var_item in sku_var_info.values()])\r
                 if len(default_sku_default.default_value.split(",")) < var_max_len:\r
                     tail = ",".join([ "0x00" for i in range(var_max_len-len(default_sku_default.default_value.split(",")))])\r
@@ -165,7 +165,7 @@ class VariableMgr(object):
                     continue\r
                 other_sku_other = indexedvarinfo.get(index).get((skuid,defaultstoragename))\r
 \r
-                if default_sku_default.data_type not in ["UINT8","UINT16","UINT32","UINT64","BOOLEAN"]:\r
+                if default_sku_default.data_type not in DataType.TAB_PCD_NUMERIC_TYPES:\r
                     if len(other_sku_other.default_value.split(",")) < var_max_len:\r
                         tail = ",".join([ "0x00" for i in range(var_max_len-len(other_sku_other.default_value.split(",")))])\r
 \r
@@ -314,7 +314,7 @@ class VariableMgr(object):
     def PACK_VARIABLES_DATA(self, var_value,data_type, tail = None):\r
         Buffer = ""\r
         data_len = 0\r
-        if data_type == "VOID*":\r
+        if data_type == DataType.TAB_VOID:\r
             for value_char in var_value.strip("{").strip("}").split(","):\r
                 Buffer += pack("=B",int(value_char,16))\r
             data_len += len(var_value.split(","))\r
@@ -325,16 +325,16 @@ class VariableMgr(object):
         elif data_type == "BOOLEAN":\r
             Buffer += pack("=B",True) if var_value.upper() == "TRUE" else pack("=B",False)\r
             data_len += 1\r
-        elif data_type  == "UINT8":\r
+        elif data_type  == DataType.TAB_UINT8:\r
             Buffer += pack("=B",GetIntegerValue(var_value))\r
             data_len += 1\r
-        elif data_type == "UINT16":\r
+        elif data_type == DataType.TAB_UINT16:\r
             Buffer += pack("=H",GetIntegerValue(var_value))\r
             data_len += 2\r
-        elif data_type == "UINT32":\r
+        elif data_type == DataType.TAB_UINT32:\r
             Buffer += pack("=L",GetIntegerValue(var_value))\r
             data_len += 4\r
-        elif data_type == "UINT64":\r
+        elif data_type == DataType.TAB_UINT64:\r
             Buffer += pack("=Q",GetIntegerValue(var_value))\r
             data_len += 8\r
 \r