ValueNumber = 1\r
elif ValueString == 'FALSE':\r
ValueNumber = 0\r
- elif ValueString.startswith('0X'):\r
- ValueNumber = int (ValueString, 16)\r
- else:\r
- ValueNumber = int (ValueString)\r
+ ValueNumber = int (ValueString, 0)\r
if ValueNumber != 0:\r
ValueNumber = 1\r
except:\r
# Get PCD value for UINT* data type\r
#\r
try:\r
- if ValueString.startswith('0X'):\r
- ValueNumber = int (ValueString, 16)\r
- else:\r
- ValueNumber = int (ValueString)\r
+ ValueNumber = int (ValueString, 0)\r
except:\r
return PARAMETER_INVALID, "PCD Value %s is not valid dec or hex string." % (ValueString)\r
#\r
if not os.path.exists (InputFile):\r
EdkLogger.error("PatchPcdValue", FILE_NOT_FOUND, ExtraData=InputFile)\r
return 1\r
- if CommandOptions.PcdOffset == None or CommandOptions.PcdValue == None or CommandOptions.PcdTypeName == None:\r
+ if CommandOptions.PcdOffset is None or CommandOptions.PcdValue is None or CommandOptions.PcdTypeName is None:\r
EdkLogger.error("PatchPcdValue", OPTION_MISSING, ExtraData="PcdOffset or PcdValue of PcdTypeName is not specified.")\r
return 1\r
if CommandOptions.PcdTypeName.upper() not in ["BOOLEAN", "UINT8", "UINT16", "UINT32", "UINT64", "VOID*"]:\r
EdkLogger.error("PatchPcdValue", PARAMETER_INVALID, ExtraData="PCD type %s is not valid." % (CommandOptions.PcdTypeName))\r
return 1\r
- if CommandOptions.PcdTypeName.upper() == "VOID*" and CommandOptions.PcdMaxSize == None:\r
+ if CommandOptions.PcdTypeName.upper() == "VOID*" and CommandOptions.PcdMaxSize is None:\r
EdkLogger.error("PatchPcdValue", OPTION_MISSING, ExtraData="PcdMaxSize is not specified for VOID* type PCD.")\r
return 1\r
#\r