NvStorageHeaderSize = 28\r
VariableHeaderSize = 32\r
\r
-def StringArrayToList(StringArray):\r
- StringArray = StringArray[1:-1]\r
- StringArray = '[' + StringArray + ']'\r
- return eval(StringArray)\r
-\r
-def PackGUID(Guid):\r
- GuidBuffer = pack('=LHHBBBBBBBB',\r
- int(Guid[0], 16),\r
- int(Guid[1], 16),\r
- int(Guid[2], 16),\r
- int(Guid[3][-4:-2], 16),\r
- int(Guid[3][-2:], 16),\r
- int(Guid[4][-12:-10], 16),\r
- int(Guid[4][-10:-8], 16),\r
- int(Guid[4][-8:-6], 16),\r
- int(Guid[4][-6:-4], 16),\r
- int(Guid[4][-4:-2], 16),\r
- int(Guid[4][-2:], 16)\r
- )\r
- return GuidBuffer\r
-\r
class VariableMgr(object):\r
def __init__(self, DefaultStoreMap,SkuIdMap):\r
self.VarInfo = []\r
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
data_type = item.data_type\r
value_list = item.default_value.strip("{").strip("}").split(",")\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 == DataType.TAB_UINT16:\r
- data_flag = "=H"\r
- elif data_type == DataType.TAB_UINT32:\r
- data_flag = "=L"\r
- elif data_type == DataType.TAB_UINT64:\r
- data_flag = "=Q"\r
+ data_flag = DataType.PACK_CODE_BY_SIZE[MAX_SIZE_TYPE[data_type]]\r
data = value_list[0]\r
value_list = []\r
for data_byte in pack(data_flag,int(data,16) if data.upper().startswith('0X') else int(data)):\r
- value_list += [hex(unpack("B",data_byte)[0])]\r
+ value_list.append(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
+ 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 , DataType.TAB_VOID)]\r
self.VarInfo = [item[0] for item in indexedvarinfo.values()]\r
\r
- def assemble_variable(self, valuelist):\r
- ordered_offset = sorted(valuelist.keys())\r
- ordered_value = [valuelist[k] for k in ordered_offset]\r
+ @staticmethod\r
+ def assemble_variable(valuedict):\r
+ ordered_valuedict_keys = sorted(valuedict.keys())\r
var_value = []\r
- num = 0\r
- for offset in ordered_offset:\r
- if offset < len(var_value):\r
+ for current_valuedict_key in ordered_valuedict_keys:\r
+ if current_valuedict_key < len(var_value):\r
raise\r
- for _ in xrange(offset - len(var_value)):\r
+ for _ in xrange(current_valuedict_key - len(var_value)):\r
var_value.append('0x00')\r
- var_value += ordered_value[num]\r
- num +=1\r
+ var_value += valuedict[current_valuedict_key]\r
return var_value\r
+\r
def process_variable_data(self):\r
\r
- var_data = dict()\r
+ var_data = collections.defaultdict(collections.OrderedDict)\r
\r
indexedvarinfo = collections.OrderedDict()\r
for item in self.VarInfo:\r
default_data_buffer = ""\r
others_data_buffer = ""\r
tail = None\r
- default_sku_default = indexedvarinfo.get(index).get((DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT))\r
+ default_sku_default = indexedvarinfo[index].get((DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT))\r
\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
+ 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
+ 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
default_data_array += unpack("B",item)\r
\r
- if (DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT) not in var_data:\r
- var_data[(DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT)] = collections.OrderedDict()\r
var_data[(DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT)][index] = (default_data_buffer,sku_var_info[(DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT)])\r
\r
- for (skuid,defaultstoragename) in indexedvarinfo.get(index):\r
+ for (skuid,defaultstoragename) in indexedvarinfo[index]:\r
tail = None\r
if (skuid,defaultstoragename) == (DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT):\r
continue\r
- other_sku_other = indexedvarinfo.get(index).get((skuid,defaultstoragename))\r
+ other_sku_other = indexedvarinfo[index][(skuid,defaultstoragename)]\r
\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
+ 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
- if (skuid,defaultstoragename) not in var_data:\r
- var_data[(skuid,defaultstoragename)] = collections.OrderedDict()\r
var_data[(skuid,defaultstoragename)][index] = (data_delta,sku_var_info[(skuid,defaultstoragename)])\r
return var_data\r
\r
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
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
if (skuname,defaultstore) == (DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT):\r
continue\r
- pcds_sku_data = var_data.get((skuname,defaultstore))\r
+ pcds_sku_data = var_data[(skuname,defaultstore)]\r
delta_data_set = []\r
for pcdindex in pcds_sku_data:\r
offset = var_data_offset[pcdindex]\r
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
-\r
+ return VariableMgr.format_data(NV_Store_Default_Header + nv_default_part + data_delta_structure_buffer)\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
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
\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
\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
\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
\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
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
\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
\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
projects / mirror_edk2.git / blobdiff