\r
import java.util.UUID;\r
import org.tianocore.ModuleTypeDef;\r
+import org.tianocore.build.autogen.CommonDefinition;\r
import org.tianocore.build.pcd.exception.EntityException;\r
\r
/**\r
///\r
/// The module type for this usage instance.\r
///\r
- public ModuleTypeDef.Enum moduleType;\r
+ public int moduleType;\r
\r
///\r
/// The value of the PCD in this usage instance. \r
UUID moduleGUID,\r
String packageName,\r
UUID packageGUID,\r
- ModuleTypeDef.Enum moduleType,\r
+ int moduleType,\r
Token.PCD_TYPE modulePcdType,\r
String arch,\r
String version,\r
@return boolean\r
*/\r
public boolean isPeiPhaseComponent() {\r
- if ((moduleType == ModuleTypeDef.PEI_CORE) ||\r
- (moduleType == ModuleTypeDef.PEIM)) {\r
+ if ((moduleType == CommonDefinition.ModuleTypePeiCore) ||\r
+ (moduleType == CommonDefinition.ModuleTypePeim)) {\r
return true;\r
}\r
return false;\r
// BugBug: May need confirmation on which type of module can\r
// make use of Dynamic(EX) PCD entry.\r
//\r
- if ((moduleType == ModuleTypeDef.DXE_DRIVER) ||\r
- (moduleType == ModuleTypeDef.DXE_RUNTIME_DRIVER) ||\r
- (moduleType == ModuleTypeDef.DXE_SAL_DRIVER) ||\r
- (moduleType == ModuleTypeDef.DXE_SMM_DRIVER) ||\r
- (moduleType == ModuleTypeDef.UEFI_DRIVER) ||\r
- (moduleType == ModuleTypeDef.UEFI_APPLICATION)\r
+ if ((moduleType == CommonDefinition.ModuleTypeDxeDriver) ||\r
+ (moduleType == CommonDefinition.ModuleTypeDxeRuntimeDriver) ||\r
+ (moduleType == CommonDefinition.ModuleTypeDxeSalDriver) ||\r
+ (moduleType == CommonDefinition.ModuleTypeDxeSmmDriver) ||\r
+ (moduleType == CommonDefinition.ModuleTypeUefiDriver) ||\r
+ (moduleType == CommonDefinition.ModuleTypeUefiApplication)\r
) {\r
return true;\r
}\r
*/\r
public void generateAutoGen(boolean isBuildUsedLibrary) \r
throws EntityException {\r
- String guidStringCName = null;\r
- boolean isByteArray = false;\r
- String printDatum = null;\r
+ String guidStringCName = null;\r
+ boolean isByteArray = false;\r
+ String printDatum = null;\r
+ String tokenNumberString = null;\r
\r
hAutogenStr = "";\r
cAutogenStr = "";\r
\r
if (this.modulePcdType == Token.PCD_TYPE.DYNAMIC_EX) {\r
- hAutogenStr += String.format("#define _PCD_TOKEN_%s 0x%016x\r\n", \r
- parentToken.cName, parentToken.dynamicExTokenNumber);\r
+ tokenNumberString = Long.toString(parentToken.dynamicExTokenNumber, 16);\r
} else {\r
- hAutogenStr += String.format("#define _PCD_TOKEN_%s 0x%016x\r\n", \r
- parentToken.cName, parentToken.tokenNumber);\r
+ tokenNumberString = Long.toString(parentToken.tokenNumber, 16);\r
}\r
\r
+ hAutogenStr += String.format("#define _PCD_TOKEN_%s 0x%s\r\n", \r
+ parentToken.cName, tokenNumberString);\r
+ \r
if (!isBuildUsedLibrary && !parentToken.isDynamicPCD) {\r
if (datum.trim().charAt(0) == '{') {\r
isByteArray = true;\r