tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added stringToInt method to handle hex integer for FFS_ATTRIB_DATA_ALIGNMENT 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1229 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jwang36 2006-08-10 06:02:12 +00:00
parent 3a5dcc063c
commit 1c47256758
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
View File

@ -500,10 +500,10 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
This function is to set ffsAligment This function is to set ffsAligment
@param ffsAligment The value of ffsAligment. @param ffsAligment The value of ffsAligment.
**/ **/
public void setFfsAttribDataAlignment(int ffsAligment) { public void setFfsAttribDataAlignment(String ffsAligment) {
this.ffsAttribDataAlignment = ffsAligment; this.ffsAttribDataAlignment = stringToInt(ffsAligment.replaceAll(" ", "").toLowerCase());
if (this.ffsAttribDataAlignment > 7) { if (this.ffsAttribDataAlignment < 0 || this.ffsAttribDataAlignment > 7) {
throw new BuildException ("FFS_ALIGMENT Scope is 0-7"); throw new BuildException ("FFS_ATTRIB_DATA_ALIGMENT must be 0-7");
} else { } else {
attributes |= (((byte)this.ffsAttribDataAlignment) << 3); attributes |= (((byte)this.ffsAttribDataAlignment) << 3);
} }
@ -948,4 +948,36 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
public void setModuleType(String moduleType) { public void setModuleType(String moduleType) {
this.moduleType = moduleType; this.moduleType = moduleType;
} }
/**
Convert a string to a integer.
@param intString The string representing a integer
@retval int The value of integer represented by the
given string; -1 is returned if the format
of the string is wrong.
**/
private int stringToInt(String intString) {
int value;
int hexPrefixPos = intString.indexOf("0x");
int radix = 10;
String intStringNoPrefix;
if (hexPrefixPos >= 0) {
radix = 16;
intStringNoPrefix = intString.substring(hexPrefixPos + 2, intString.length());
} else {
intStringNoPrefix = intString;
}
try {
value = Integer.parseInt(intStringNoPrefix, radix);
} catch (NumberFormatException e) {
log("Incorrect format of int (" + intString + "). -1 is assumed");
return -1;
}
return value;
}
} }