1) Add in support to traverse taken space
2) Remove unused import in DynamicTokenValue.java. 3) Support Byte Stream input for Pointer type Dynamic PCD entry in FPD file. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@616 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -1684,7 +1684,14 @@ class PcdDatabase {
|
||||
*/
|
||||
s += tab + tab + String.format("{ %s }", t.skuData.get(i).value.vpdOffset);
|
||||
} else {
|
||||
s += tab + tab + String.format("{ %s }", t.skuData.get(i).value.value);
|
||||
if (t.isByteStreamType()) {
|
||||
//
|
||||
// Byte stream type input has their own "{" "}", so we won't help to insert.
|
||||
//
|
||||
s += tab + tab + String.format(" %s ", t.skuData.get(i).value.value);
|
||||
} else {
|
||||
s += tab + tab + String.format("{ %s }", t.skuData.get(i).value.value);
|
||||
}
|
||||
}
|
||||
|
||||
if (i != t.skuData.size() - 1) {
|
||||
|
@@ -15,10 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
**/
|
||||
package org.tianocore.build.pcd.entity;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.tianocore.build.pcd.exception.EntityException;
|
||||
|
@@ -707,6 +707,23 @@ public class Token {
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean isByteStreamType () {
|
||||
String str = getDynamicDefaultValue();
|
||||
|
||||
if (str == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (datumType == Token.DATUM_TYPE.POINTER &&
|
||||
str.startsWith("{") &&
|
||||
str.endsWith("}")) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
public String getStringTypeString () {
|
||||
return getDefaultSku().value.substring(2, getDefaultSku().value.length() - 1);
|
||||
|
Reference in New Issue
Block a user