import cPickle\r
import array\r
import shutil\r
+from struct import pack\r
from UserDict import IterableUserDict\r
from UserList import UserList\r
\r
return [VpdOffset, Size, Value], IsValid, 2\r
elif PcdType in (MODEL_PCD_DYNAMIC_HII, MODEL_PCD_DYNAMIC_EX_HII):\r
HiiString = FieldList[0]\r
- Guid = Offset = Value = ''\r
+ Guid = Offset = Value = Attribute = ''\r
if len(FieldList) > 1:\r
Guid = FieldList[1]\r
if len(FieldList) > 2:\r
Offset = FieldList[2]\r
if len(FieldList) > 3:\r
Value = FieldList[3]\r
- IsValid = (3 <= len(FieldList) <= 4)\r
- return [HiiString, Guid, Offset, Value], IsValid, 3\r
+ if len(FieldList) > 4:\r
+ Attribute = FieldList[4]\r
+ IsValid = (3 <= len(FieldList) <= 5)\r
+ return [HiiString, Guid, Offset, Value, Attribute], IsValid, 3\r
return [], False, 0\r
\r
## AnalyzePcdData\r
\r
self.AvailableSkuIds = sdict()\r
self.SkuIdSet = []\r
- \r
+ self.SkuIdNumberSet = []\r
if SkuIdentifier == '' or SkuIdentifier is None:\r
self.SkuIdSet = ['DEFAULT']\r
+ self.SkuIdNumberSet = ['0U']\r
elif SkuIdentifier == 'ALL':\r
self.SkuIdSet = SkuIds.keys()\r
+ self.SkuIdNumberSet = [num.strip() + 'U' for num in SkuIds.values()]\r
else:\r
r = SkuIdentifier.split('|') \r
self.SkuIdSet=[r[k].strip() for k in range(len(r))] \r
+ k = None\r
+ try: \r
+ self.SkuIdNumberSet = [SkuIds[k].strip() + 'U' for k in self.SkuIdSet] \r
+ except Exception:\r
+ EdkLogger.error("build", PARAMETER_INVALID,\r
+ ExtraData = "SKU-ID [%s] is not supported by the platform. [Valid SKU-ID: %s]"\r
+ % (k, " ".join(SkuIds.keys())))\r
if len(self.SkuIdSet) == 2 and 'DEFAULT' in self.SkuIdSet and SkuIdentifier != 'ALL':\r
self.SkuIdSet.remove('DEFAULT')\r
- \r
+ self.SkuIdNumberSet.remove('0U')\r
for each in self.SkuIdSet:\r
if each in SkuIds:\r
self.AvailableSkuIds[each] = SkuIds[each]\r
return self.SkuIdSet[0]\r
else:\r
return 'DEFAULT'\r
- \r
+ def __GetAvailableSkuIdNumber(self):\r
+ return self.SkuIdNumberSet\r
SystemSkuId = property(__GetSystemSkuID)\r
AvailableSkuIdSet = property(__GetAvailableSkuIds)\r
SkuUsageType = property(__SkuUsageType)\r
+ AvailableSkuIdNumSet = property(__GetAvailableSkuIdNumber)\r
+\r
+#\r
+# Pack a registry format GUID\r
+#\r
+def PackRegistryFormatGuid(Guid):\r
+ Guid = Guid.split('-')\r
+ return 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
\r
##\r
#\r