)\r
return GuidBuffer\r
\r
-class Variable(object):\r
- def __init__(self,):\r
+class VariableMgr(object):\r
+ def __init__(self, DefaultStoreMap,SkuIdMap):\r
self.VarInfo = []\r
+ self.DefaultStoreMap = DefaultStoreMap\r
+ self.SkuIdMap = SkuIdMap\r
\r
def append_variable(self,uefi_var):\r
self.VarInfo.append(uefi_var)\r
for item in self.VarInfo:\r
if item.pcdindex not in indexedvarinfo:\r
indexedvarinfo[item.pcdindex] = dict()\r
- indexedvarinfo[item.pcdindex][(int(item.skuname),int(item.defaultstoragename))] = item\r
+ indexedvarinfo[item.pcdindex][(item.skuname,item.defaultstoragename)] = item\r
\r
for index in indexedvarinfo:\r
sku_var_info = indexedvarinfo[index]\r
default_data_buffer = ""\r
others_data_buffer = ""\r
tail = None\r
- default_sku_default = indexedvarinfo.get(index).get((0,0))\r
+ default_sku_default = indexedvarinfo.get(index).get(("DEFAULT","STANDARD"))\r
\r
if default_sku_default.data_type not in ["UINT8","UINT16","UINT32","UINT64","BOOLEAN"]:\r
var_max_len = max([len(var_item.default_value.split(",")) for var_item in sku_var_info.values()])\r
for item in default_data_buffer:\r
default_data_array += unpack("B",item)\r
\r
- if (0,0) not in var_data:\r
- var_data[(0,0)] = collections.OrderedDict()\r
- var_data[(0,0)][index] = (default_data_buffer,sku_var_info[(0,0)])\r
+ if ("DEFAULT","STANDARD") not in var_data:\r
+ var_data[("DEFAULT","STANDARD")] = collections.OrderedDict()\r
+ var_data[("DEFAULT","STANDARD")][index] = (default_data_buffer,sku_var_info[("DEFAULT","STANDARD")])\r
\r
for (skuid,defaultstoragename) in indexedvarinfo.get(index):\r
tail = None\r
- if (skuid,defaultstoragename) == (0,0):\r
+ if (skuid,defaultstoragename) == ("DEFAULT","STANDARD"):\r
continue\r
other_sku_other = indexedvarinfo.get(index).get((skuid,defaultstoragename))\r
\r
\r
var_data = self.process_variable_data()\r
\r
- pcds_default_data = var_data.get((0,0))\r
+ pcds_default_data = var_data.get(("DEFAULT","STANDARD"))\r
NvStoreDataBuffer = ""\r
var_data_offset = collections.OrderedDict()\r
offset = NvStorageHeaderSize\r
else:\r
var_attr_value = 0x07\r
\r
- print "default var_name_buffer"\r
- print self.format_data(var_name_buffer)\r
- print "default var_buffer"\r
- print self.format_data(default_data)\r
-\r
DataBuffer = self.AlignData(var_name_buffer + default_data)\r
\r
data_size = len(DataBuffer)\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(",")), data_size, vendorguid)\r
+ var_header_buffer = self.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
\r
nv_default_part = self.AlignData(self.PACK_DEFAULT_DATA(0, 0, self.unpack_data(variable_storage_header_buffer+NvStoreDataBuffer)))\r
\r
- print "default whole data \n",self.format_data(nv_default_part)\r
-\r
data_delta_structure_buffer = ""\r
- for skuid,defaultid in var_data:\r
- if (skuid,defaultid) == (0,0):\r
+ for skuname,defaultstore in var_data:\r
+ if (skuname,defaultstore) == ("DEFAULT","STANDARD"):\r
continue\r
- pcds_sku_data = var_data.get((skuid,defaultid))\r
+ pcds_sku_data = var_data.get((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(defaultid,skuid,delta_data_set))\r
- print "delta data"\r
- print delta_data_set\r
- print self.format_data(self.AlignData(self.PACK_DELTA_DATA(defaultid,skuid,delta_data_set)))\r
+ data_delta_structure_buffer += self.AlignData(self.PACK_DELTA_DATA(skuname,defaultstore,delta_data_set))\r
\r
return self.format_data(nv_default_part + data_delta_structure_buffer)\r
\r
return final_data\r
\r
def calculate_delta(self, default, theother):\r
- print "default data \n", default\r
- print "other data \n",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
\r
def PACK_DEFAULT_DATA(self, defaultstoragename,skuid,var_value):\r
Buffer = ""\r
- Buffer += pack("=H",6)\r
+ Buffer += pack("=L",8)\r
Buffer += pack("=H",int(defaultstoragename))\r
Buffer += pack("=H",int(skuid))\r
\r
\r
return Buffer\r
\r
- def PACK_DELTA_DATA(self,defaultstoragename,skuid,delta_list):\r
+ def GetSkuId(self,skuname):\r
+ if skuname not in self.SkuIdMap:\r
+ return None\r
+ return self.SkuIdMap.get(skuname)[0]\r
+ def GetDefaultStoreId(self,dname):\r
+ if dname not in self.DefaultStoreMap:\r
+ return None\r
+ return self.DefaultStoreMap.get(dname)[0]\r
+ def PACK_DELTA_DATA(self,skuname,defaultstoragename,delta_list):\r
+ skuid = self.GetSkuId(skuname)\r
+ defaultstorageid = self.GetDefaultStoreId(defaultstoragename)\r
Buffer = ""\r
- Buffer += pack("=H",6)\r
- Buffer += pack("=H",int(defaultstoragename))\r
+ Buffer += pack("=L",8)\r
Buffer += pack("=H",int(skuid))\r
+ Buffer += pack("=H",int(defaultstorageid))\r
for (delta_offset,value) in delta_list:\r
Buffer += pack("=L",delta_offset)\r
Buffer = Buffer[:-1] + pack("=B",value)\r
for name_char in var_name.strip("{").strip("}").split(","):\r
Buffer += pack("=B",int(name_char,16))\r
\r
- return Buffer\r
\ No newline at end of file
+ return Buffer\r
projects / mirror_edk2.git / blobdiff