BaseTools: AutoGen - GenVar refactor static methods

change methods which do not use self to @staticmethod
change their calls to use class name instead of instance

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>

diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py b/BaseTools/Source/Python/AutoGen/GenVar.py
index b9517d84c69026513fac8b5687fb38fc87038e09..9d226d0f4567e2dcd7e5ce1f4c3b8fa387e72755 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenVar.py
+++ b/BaseTools/Source/Python/AutoGen/GenVar.py
@@ -71,7 +71,7 @@ class VariableMgr(object):
         if not self.NVHeaderBuff:\r
             return ""\r
         self.NVHeaderBuff = self.NVHeaderBuff[:8] + pack("=Q",maxsize)\r
-        default_var_bin = self.format_data(self.NVHeaderBuff + self.VarDefaultBuff + self.VarDeltaBuff)\r
+        default_var_bin = VariableMgr.format_data(self.NVHeaderBuff + self.VarDefaultBuff + self.VarDeltaBuff)\r
         value_str = "{"\r
         default_var_bin_strip = [ data.strip("""'""") for data in default_var_bin]\r
         value_str += ",".join(default_var_bin_strip)\r
@@ -106,7 +106,7 @@ class VariableMgr(object):
                         value_list += [hex(unpack("B",data_byte)[0])]\r
                 newvalue[int(item.var_offset,16) if item.var_offset.upper().startswith("0X") else int(item.var_offset)] = value_list\r
             try:\r
-                newvaluestr = "{" + ",".join(self.assemble_variable(newvalue)) +"}"\r
+                newvaluestr = "{" + ",".join(VariableMgr.assemble_variable(newvalue)) +"}"\r
             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
@@ -151,7 +151,7 @@ class VariableMgr(object):
                 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
 \r
-            default_data_buffer = self.PACK_VARIABLES_DATA(default_sku_default.default_value,default_sku_default.data_type,tail)\r
+            default_data_buffer = VariableMgr.PACK_VARIABLES_DATA(default_sku_default.default_value,default_sku_default.data_type,tail)\r
 \r
             default_data_array = ()\r
             for item in default_data_buffer:\r
@@ -169,13 +169,13 @@ class VariableMgr(object):
                     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
-                others_data_buffer = self.PACK_VARIABLES_DATA(other_sku_other.default_value,other_sku_other.data_type,tail)\r
+                others_data_buffer = VariableMgr.PACK_VARIABLES_DATA(other_sku_other.default_value,other_sku_other.data_type,tail)\r
 \r
                 others_data_array = ()\r
                 for item in others_data_buffer:\r
                     others_data_array += unpack("B",item)\r
 \r
-                data_delta = self.calculate_delta(default_data_array, others_data_array)\r
+                data_delta = VariableMgr.calculate_delta(default_data_array, others_data_array)\r
 \r
                 var_data[(skuid,defaultstoragename)][index] = (data_delta,sku_var_info[(skuid,defaultstoragename)])\r
         return var_data\r
@@ -193,7 +193,7 @@ class VariableMgr(object):
         var_data_offset = collections.OrderedDict()\r
         offset = NvStorageHeaderSize\r
         for default_data,default_info in pcds_default_data.values():\r
-            var_name_buffer = self.PACK_VARIABLE_NAME(default_info.var_name)\r
+            var_name_buffer = VariableMgr.PACK_VARIABLE_NAME(default_info.var_name)\r
 \r
             vendorguid = default_info.var_guid.split('-')\r
 \r
@@ -202,19 +202,19 @@ class VariableMgr(object):
             else:\r
                 var_attr_value = 0x07\r
 \r
-            DataBuffer = self.AlignData(var_name_buffer + default_data)\r
+            DataBuffer = VariableMgr.AlignData(var_name_buffer + default_data)\r
 \r
             data_size = len(DataBuffer)\r
             offset += VariableHeaderSize + len(default_info.var_name.split(","))\r
             var_data_offset[default_info.pcdindex] = offset\r
             offset += data_size - len(default_info.var_name.split(","))\r
 \r
-            var_header_buffer = self.PACK_VARIABLE_HEADER(var_attr_value, len(default_info.var_name.split(",")), len (default_data), vendorguid)\r
+            var_header_buffer = VariableMgr.PACK_VARIABLE_HEADER(var_attr_value, len(default_info.var_name.split(",")), len (default_data), vendorguid)\r
             NvStoreDataBuffer += (var_header_buffer + DataBuffer)\r
 \r
-        variable_storage_header_buffer = self.PACK_VARIABLE_STORE_HEADER(len(NvStoreDataBuffer) + 28)\r
+        variable_storage_header_buffer = VariableMgr.PACK_VARIABLE_STORE_HEADER(len(NvStoreDataBuffer) + 28)\r
 \r
-        nv_default_part = self.AlignData(self.PACK_DEFAULT_DATA(0, 0, self.unpack_data(variable_storage_header_buffer+NvStoreDataBuffer)), 8)\r
+        nv_default_part = VariableMgr.AlignData(VariableMgr.PACK_DEFAULT_DATA(0, 0, VariableMgr.unpack_data(variable_storage_header_buffer+NvStoreDataBuffer)), 8)\r
 \r
         data_delta_structure_buffer = ""\r
         for skuname,defaultstore in var_data:\r
@@ -228,29 +228,31 @@ class VariableMgr(object):
                 delta_data = [(item[0] + offset, item[1]) for item in delta_data]\r
                 delta_data_set.extend(delta_data)\r
 \r
-            data_delta_structure_buffer += self.AlignData(self.PACK_DELTA_DATA(skuname,defaultstore,delta_data_set), 8)\r
+            data_delta_structure_buffer += VariableMgr.AlignData(self.PACK_DELTA_DATA(skuname,defaultstore,delta_data_set), 8)\r
 \r
         size = len(nv_default_part + data_delta_structure_buffer) + 16\r
         maxsize = self.VpdRegionSize if self.VpdRegionSize else size\r
-        NV_Store_Default_Header = self.PACK_NV_STORE_DEFAULT_HEADER(size,maxsize)\r
+        NV_Store_Default_Header = VariableMgr.PACK_NV_STORE_DEFAULT_HEADER(size,maxsize)\r
 \r
         self.NVHeaderBuff =  NV_Store_Default_Header\r
         self.VarDefaultBuff =nv_default_part\r
         self.VarDeltaBuff =  data_delta_structure_buffer\r
-        return self.format_data(NV_Store_Default_Header + nv_default_part + data_delta_structure_buffer)\r
+        return VariableMgr.format_data(NV_Store_Default_Header + nv_default_part + data_delta_structure_buffer)\r
 \r
 \r
-    def format_data(self,data):\r
-\r
-        return  [hex(item) for item in self.unpack_data(data)]\r
+    @staticmethod\r
+    def format_data(data):\r
+        return  [hex(item) for item in VariableMgr.unpack_data(data)]\r
 \r
-    def unpack_data(self,data):\r
+    @staticmethod\r
+    def unpack_data(data):\r
         final_data = ()\r
         for item in data:\r
             final_data += unpack("B",item)\r
         return final_data\r
 \r
-    def calculate_delta(self, default, theother):\r
+    @staticmethod\r
+    def calculate_delta(default, theother):\r
         if len(default) - len(theother) != 0:\r
             EdkLogger.error("build", FORMAT_INVALID, 'The variable data length is not the same for the same PCD.')\r
         data_delta = []\r
@@ -270,7 +272,8 @@ class VariableMgr(object):
             return value_str\r
         return ""\r
 \r
-    def PACK_VARIABLE_STORE_HEADER(self,size):\r
+    @staticmethod\r
+    def PACK_VARIABLE_STORE_HEADER(size):\r
         #Signature: gEfiVariableGuid\r
         Guid = "{ 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}"\r
         Guid = GuidStructureStringToGuidString(Guid)\r
@@ -284,7 +287,8 @@ class VariableMgr(object):
 \r
         return GuidBuffer + SizeBuffer + FormatBuffer + StateBuffer + reservedBuffer\r
 \r
-    def PACK_NV_STORE_DEFAULT_HEADER(self,size,maxsize):\r
+    @staticmethod\r
+    def PACK_NV_STORE_DEFAULT_HEADER(size,maxsize):\r
         Signature = pack('=B',ord('N'))\r
         Signature += pack("=B",ord('S'))\r
         Signature += pack("=B",ord('D'))\r
@@ -295,7 +299,8 @@ class VariableMgr(object):
 \r
         return Signature + SizeBuffer + MaxSizeBuffer\r
 \r
-    def PACK_VARIABLE_HEADER(self,attribute,namesize,datasize,vendorguid):\r
+    @staticmethod\r
+    def PACK_VARIABLE_HEADER(attribute,namesize,datasize,vendorguid):\r
 \r
         Buffer = pack('=H',0x55AA) # pack StartID\r
         Buffer += pack('=B',0x3F)  # pack State\r
@@ -309,7 +314,8 @@ class VariableMgr(object):
 \r
         return Buffer\r
 \r
-    def PACK_VARIABLES_DATA(self, var_value,data_type, tail = None):\r
+    @staticmethod\r
+    def PACK_VARIABLES_DATA(var_value,data_type, tail = None):\r
         Buffer = ""\r
         data_len = 0\r
         if data_type == DataType.TAB_VOID:\r
@@ -338,7 +344,8 @@ class VariableMgr(object):
 \r
         return Buffer\r
 \r
-    def PACK_DEFAULT_DATA(self, defaultstoragename,skuid,var_value):\r
+    @staticmethod\r
+    def PACK_DEFAULT_DATA(defaultstoragename,skuid,var_value):\r
         Buffer = ""\r
         Buffer += pack("=L",4+8+8)\r
         Buffer += pack("=Q",int(skuid))\r
@@ -355,10 +362,12 @@ class VariableMgr(object):
         if skuname not in self.SkuIdMap:\r
             return None\r
         return self.SkuIdMap.get(skuname)[0]\r
+\r
     def GetDefaultStoreId(self,dname):\r
         if dname not in self.DefaultStoreMap:\r
             return None\r
         return self.DefaultStoreMap.get(dname)[0]\r
+\r
     def PACK_DELTA_DATA(self,skuname,defaultstoragename,delta_list):\r
         skuid = self.GetSkuId(skuname)\r
         defaultstorageid = self.GetDefaultStoreId(defaultstoragename)\r
@@ -374,7 +383,8 @@ class VariableMgr(object):
 \r
         return Buffer\r
 \r
-    def AlignData(self,data, align = 4):\r
+    @staticmethod\r
+    def AlignData(data, align = 4):\r
         mybuffer = data\r
         if (len(data) % align) > 0:\r
             for i in range(align - (len(data) % align)):\r
@@ -382,7 +392,8 @@ class VariableMgr(object):
 \r
         return mybuffer\r
 \r
-    def PACK_VARIABLE_NAME(self, var_name):\r
+    @staticmethod\r
+    def PACK_VARIABLE_NAME(var_name):\r
         Buffer = ""\r
         for name_char in var_name.strip("{").strip("}").split(","):\r
             Buffer += pack("=B",int(name_char,16))\r